duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up NpcAct320.cpp

Browse source
This commit is contained in:
Gabriel Ravier 2019-05-16 08:21:52 +02:00
parent e5b499ee67
commit c247de7686
No known key found for this signature in database
GPG key ID: 1E75F156884F3DCE
1 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/NpcAct320.cpp
View file

@ -222,18 +222,23 @@ void ActNpc322(NPCHAR *npc)
case 0: case 0:
SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 0, 0, 0x180); SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 0, 0, 0x180);
break; break;
case 50: case 50:
SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 1, 0, 0x180); SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 1, 0, 0x180);
break; break;
case 100: case 100:
SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 2, 0, 0x180); SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 2, 0, 0x180);
break; break;
case 150: case 150:
SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 3, 0, 0x180); SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 3, 0, 0x180);
break; break;
case 200: case 200:
SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 4, 0, 0x180); SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 4, 0, 0x180);
break; break;
case 250: case 250:
npc->hit.back = 0x6000; npc->hit.back = 0x6000;
npc->hit.front = 0x6000; npc->hit.front = 0x6000;
@ -293,12 +298,15 @@ void ActNpc323(NPCHAR *npc)
case 0: case 0:
npc->xm = -0x600; npc->xm = -0x600;
break; break;
case 2: case 2:
npc->xm = 0x600; npc->xm = 0x600;
break; break;
case 1: case 1:
npc->ym = -0x600; npc->ym = -0x600;
break; break;
case 3: case 3:
npc->ym = 0x600; npc->ym = 0x600;
break; break;
@ -322,14 +330,17 @@ void ActNpc323(NPCHAR *npc)
if (npc->x <= gMC.x + 0x4000) if (npc->x <= gMC.x + 0x4000)
npc->act_no = 10; npc->act_no = 10;
break; break;
case 2: case 2:
if (npc->x >= gMC.x - 0x4000) if (npc->x >= gMC.x - 0x4000)
npc->act_no = 10; npc->act_no = 10;
break; break;
case 1: case 1:
if (npc->y <= gMC.y + 0x4000) if (npc->y <= gMC.y + 0x4000)
npc->act_no = 10; npc->act_no = 10;
break; break;
case 3: case 3:
if (npc->y >= gMC.y - 0x4000) if (npc->y >= gMC.y - 0x4000)
npc->act_no = 10; npc->act_no = 10;