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

Note a 60FPS/50FPS-related inconsistency

Browse source
This commit is contained in:
Clownacy 2019-11-14 16:24:31 +00:00
parent 00478c4f3b
commit cb2b03559c
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/NpcAct200.cpp
View file

@ -475,6 +475,8 @@ void ActNpc206(NPCHAR *npc)
case 3: case 3:
switch (npc->act_wait) switch (npc->act_wait)
{ {
// Interestingly, this NPC counts down at 60 frames per second,
// while the NPC322 (Deleet), counts at 50.
case 60 * 0: case 60 * 0:
SetNpChar(207, npc->x + (16 * 0x200), npc->y + (4 * 0x200), 0, 0, 0, NULL, 0x100); SetNpChar(207, npc->x + (16 * 0x200), npc->y + (4 * 0x200), 0, 0, 0, NULL, 0x100);
break; break;

14
src/NpcAct320.cpp
View file

@ -219,27 +219,29 @@ void ActNpc322(NPCHAR *npc)
switch (npc->act_wait) switch (npc->act_wait)
{ {
case 0: // Interestingly, this NPC counts down at 50 frames per second,
// while the NPC206 (the Egg Corridor Counter Bomb), counts at 60.
case 50 * 0:
SetNpChar(207, npc->x + (4 * 0x200), npc->y, 0, 0, 0, NULL, 0x180); SetNpChar(207, npc->x + (4 * 0x200), npc->y, 0, 0, 0, NULL, 0x180);
break; break;
case 50: case 50 * 1:
SetNpChar(207, npc->x + (4 * 0x200), npc->y, 0, 0, 1, NULL, 0x180); SetNpChar(207, npc->x + (4 * 0x200), npc->y, 0, 0, 1, NULL, 0x180);
break; break;
case 100: case 50 * 2:
SetNpChar(207, npc->x + (4 * 0x200), npc->y, 0, 0, 2, NULL, 0x180); SetNpChar(207, npc->x + (4 * 0x200), npc->y, 0, 0, 2, NULL, 0x180);
break; break;
case 150: case 50 * 3:
SetNpChar(207, npc->x + (4 * 0x200), npc->y, 0, 0, 3, NULL, 0x180); SetNpChar(207, npc->x + (4 * 0x200), npc->y, 0, 0, 3, NULL, 0x180);
break; break;
case 200: case 50 * 4:
SetNpChar(207, npc->x + (4 * 0x200), npc->y, 0, 0, 4, NULL, 0x180); SetNpChar(207, npc->x + (4 * 0x200), npc->y, 0, 0, 4, NULL, 0x180);
break; break;
case 250: case 50 * 5:
npc->hit.back = 48 * 0x200; npc->hit.back = 48 * 0x200;
npc->hit.front = 48 * 0x200; npc->hit.front = 48 * 0x200;
npc->hit.top = 48 * 0x200; npc->hit.top = 48 * 0x200;