From f003626290079abfc3faab3d05e333beaff06aa5 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Mon, 28 Jan 2019 17:43:55 +0000 Subject: [PATCH] Fuck the diffing algoritm --- src/NpcAct020.cpp | 20 -------------------- src/NpcTbl.cpp | 2 -- 2 files changed, 22 deletions(-) diff --git a/src/NpcAct020.cpp b/src/NpcAct020.cpp index fd5bcbc5..4a45ea6e 100644 --- a/src/NpcAct020.cpp +++ b/src/NpcAct020.cpp @@ -168,25 +168,6 @@ void ActNpc030(NPCHAR *npc) 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 void ActNpc032(NPCHAR *npc) { @@ -242,4 +223,3 @@ void ActNpc039(NPCHAR *npc) npc->rect = rect[npc->ani_no]; } ->>>>>>> More First Cave objects (also Kazuma's shelter ones) diff --git a/src/NpcTbl.cpp b/src/NpcTbl.cpp index f97117c8..d4631d08 100644 --- a/src/NpcTbl.cpp +++ b/src/NpcTbl.cpp @@ -92,8 +92,6 @@ NPCFUNCTION gpNpcFuncTbl[361] = nullptr, nullptr, nullptr, - ActNpc032, - nullptr, nullptr, ActNpc037, nullptr,