shithub: cstory

Info  •  Files  •  Log  •  Branches

Fuck the diffing algoritm

--- a/src/NpcAct020.cpp

+++ b/src/NpcAct020.cpp

@@ -172,26 +172,7 @@

 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

-void ActNpc032(NPCHAR *npc)

-{

-	RECT rect[2];

-

 	rect[0] = {32, 96, 48, 112};

 	rect[1] = {48, 96, 64, 112};

@@ -242,4 +223,3 @@

 	npc->rect = rect[npc->ani_no];

 }

->>>>>>> More First Cave objects (also Kazuma's shelter ones)

--- a/src/NpcTbl.cpp

+++ b/src/NpcTbl.cpp

@@ -92,8 +92,6 @@

 	nullptr,

 	nullptr,

 	nullptr,

-	ActNpc032,

-	nullptr,

 	nullptr,

 	ActNpc037,

 	nullptr,