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

Fuck the diffing algoritm

Browse source
This commit is contained in:
Clownacy 2019-01-28 17:43:55 +00:00
parent 946d4c16eb
commit f003626290
2 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/NpcAct020.cpp
View file

@ -168,25 +168,6 @@ void ActNpc030(NPCHAR *npc)
npc->rect = rc[npc->ani_no]; npc->rect = rc[npc->ani_no];
} }
//Life capsule
void ActNpc032(NPCHAR *npc)
{
RECT rect[2];
rect[0] = {32, 96, 48, 112};
rect[1] = {48, 96, 64, 112};
if (++npc->ani_wait > 2)
{
npc->ani_wait = 0;
++npc->ani_no;
}
if (npc->ani_no > 1)
npc->ani_no = 0;
npc->rect = rect[npc->ani_no];
}
//Life capsule //Life capsule
void ActNpc032(NPCHAR *npc) void ActNpc032(NPCHAR *npc)
{ {
@ -242,4 +223,3 @@ void ActNpc039(NPCHAR *npc)
npc->rect = rect[npc->ani_no]; npc->rect = rect[npc->ani_no];
} }
>>>>>>> More First Cave objects (also Kazuma's shelter ones)

2
src/NpcTbl.cpp
View file

@ -92,8 +92,6 @@ NPCFUNCTION gpNpcFuncTbl[361] =
nullptr, nullptr,
nullptr, nullptr,
nullptr, nullptr,
ActNpc032,
nullptr,
nullptr, nullptr,
ActNpc037, ActNpc037,
nullptr, nullptr,