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

More cleanup

Browse source
This commit is contained in:
Clownacy 2019-08-25 16:49:52 +00:00
parent 6f71f2405d
commit 4bc80a288d
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/NpcAct340.cpp
View file

@ -134,6 +134,7 @@ void ActNpc340(NPCHAR *npc)
else else
npc->act_no = 230; npc->act_no = 230;
} }
break; break;
case 210: case 210:
@ -606,7 +607,7 @@ void ActNpc342(NPCHAR *npc)
npc->act_no = 10; npc->act_no = 10;
npc->count1 = 2 * (npc->direct & 0xFF); npc->count1 = 2 * (npc->direct & 0xFF);
npc->direct >>= 8; npc->direct >>= 8;
npc->count2 = 192; npc->count2 = 0xC0;
npc->damage = 14; npc->damage = 14;
// Fallthrough // Fallthrough
case 10: case 10:
@ -1504,9 +1505,6 @@ void ActNpc352(NPCHAR *npc)
case 13: case 13:
npc->surf = SURFACE_ID_LEVEL_SPRITESET_1; npc->surf = SURFACE_ID_LEVEL_SPRITESET_1;
break; break;
default:
break;
} }
switch (npc->count1) switch (npc->count1)
@ -1517,9 +1515,6 @@ void ActNpc352(NPCHAR *npc)
case 12: case 12:
npc->view.top = 0x2000; npc->view.top = 0x2000;
break; break;
default:
break;
} }
// Balrog // Balrog
@ -1531,7 +1526,7 @@ void ActNpc352(NPCHAR *npc)
} }
// Spawn King's sword // Spawn King's sword
if (!npc->count1) if (npc->count1 == 0)
SetNpChar(145, 0, 0, 0, 0, 2, npc, 0x100); SetNpChar(145, 0, 0, 0, 0, 2, npc, 0x100);
// Fallthrough // Fallthrough
case 1: case 1:
@ -1547,6 +1542,7 @@ void ActNpc352(NPCHAR *npc)
} }
npc->y += npc->ym; npc->y += npc->ym;
break; break;
} }