Cleaned up NpcAct280.cpp

This commit is contained in:
Gabriel Ravier 2019-05-16 08:11:17 +02:00
parent 1e6ee2d6ba
commit f1048b21aa
No known key found for this signature in database
GPG key ID: 1E75F156884F3DCE

View file

@ -456,12 +456,15 @@ void ActNpc283(NPCHAR *npc)
case 0: case 0:
direct = 0xD8; direct = 0xD8;
break; break;
case 1: case 1:
direct = 0xEC; direct = 0xEC;
break; break;
case 2: case 2:
direct = 0x14; direct = 0x14;
break; break;
case 3: case 3:
direct = 0x28; direct = 0x28;
break; break;
@ -477,12 +480,15 @@ void ActNpc283(NPCHAR *npc)
case 0: case 0:
direct = 0x58; direct = 0x58;
break; break;
case 1: case 1:
direct = 0x6C; direct = 0x6C;
break; break;
case 2: case 2:
direct = 0x94; direct = 0x94;
break; break;
case 3: case 3:
direct = 0xA8; direct = 0xA8;
break; break;
@ -505,12 +511,15 @@ void ActNpc283(NPCHAR *npc)
case 0: case 0:
direct = 0xD8; direct = 0xD8;
break; break;
case 1: case 1:
direct = 0xEC; direct = 0xEC;
break; break;
case 2: case 2:
direct = 0x14; direct = 0x14;
break; break;
case 3: case 3:
direct = 0x28; direct = 0x28;
break; break;
@ -526,12 +535,15 @@ void ActNpc283(NPCHAR *npc)
case 0: case 0:
direct = 0x58; direct = 0x58;
break; break;
case 1: case 1:
direct = 0x6C; direct = 0x6C;
break; break;
case 2: case 2:
direct = 0x94; direct = 0x94;
break; break;
case 3: case 3:
direct = 0xA8; direct = 0xA8;
break; break;
@ -735,9 +747,11 @@ void ActNpc284(NPCHAR *npc)
case 3: case 3:
npc->act_no = 34; npc->act_no = 34;
break; break;
case 0: case 0:
npc->act_no = 32; npc->act_no = 32;
break; break;
case 2: case 2:
npc->act_no = 32; npc->act_no = 32;
break; break;
@ -1488,36 +1502,43 @@ void ActNpc295(NPCHAR *npc)
npc->view.back = 0xD000; npc->view.back = 0xD000;
npc->view.front = 0xD000; npc->view.front = 0xD000;
break; break;
case 1: case 1:
npc->ym = -0x800; npc->ym = -0x800;
npc->view.back = 0x7000; npc->view.back = 0x7000;
npc->view.front = 0x7000; npc->view.front = 0x7000;
break; break;
case 2: case 2:
npc->ym = -0x400; npc->ym = -0x400;
npc->view.back = 0x4000; npc->view.back = 0x4000;
npc->view.front = 0x4000; npc->view.front = 0x4000;
break; break;
case 3: case 3:
npc->ym = -0x200; npc->ym = -0x200;
npc->view.back = 0x2800; npc->view.back = 0x2800;
npc->view.front = 0x2800; npc->view.front = 0x2800;
break; break;
case 4: case 4:
npc->xm = -0x400; npc->xm = -0x400;
npc->view.back = 0xD000; npc->view.back = 0xD000;
npc->view.front = 0xD000; npc->view.front = 0xD000;
break; break;
case 5: case 5:
npc->xm = -0x200; npc->xm = -0x200;
npc->view.back = 0x7000; npc->view.back = 0x7000;
npc->view.front = 0x7000; npc->view.front = 0x7000;
break; break;
case 6: case 6:
npc->xm = -0x100; npc->xm = -0x100;
npc->view.back = 0x4000; npc->view.back = 0x4000;
npc->view.front = 0x4000; npc->view.front = 0x4000;
break; break;
case 7: case 7:
npc->xm = -0x80; npc->xm = -0x80;
npc->view.back = 0x2800; npc->view.back = 0x2800;
@ -1560,12 +1581,15 @@ void ActNpc296(NPCHAR *npc)
case 0: case 0:
pri = 0x180; pri = 0x180;
break; break;
case 1: case 1:
pri = 0x80; pri = 0x80;
break; break;
case 2: case 2:
pri = 0x40; pri = 0x40;
break; break;
case 3: case 3:
pri = 0x00; pri = 0x00;
break; break;
@ -1582,12 +1606,15 @@ void ActNpc296(NPCHAR *npc)
case 0: case 0:
pri = 0x80; pri = 0x80;
break; break;
case 1: case 1:
pri = 0x55; pri = 0x55;
break; break;
case 2: case 2:
pri = 0x40; pri = 0x40;
break; break;
case 3: case 3:
pri = 0x00; pri = 0x00;
break; break;