From 84945aa8985660c136a7eb8ba084df16864c8b5e Mon Sep 17 00:00:00 2001 From: Clownacy Date: Tue, 19 Feb 2019 00:55:01 +0000 Subject: [PATCH] Removed some old unimplemented-function stuff that we no longer need --- src/Boss.cpp | 3 +-- src/NpChar.cpp | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/Boss.cpp b/src/Boss.cpp index 90854e23..510da2c6 100644 --- a/src/Boss.cpp +++ b/src/Boss.cpp @@ -209,8 +209,7 @@ void ActBossChar() { if (gBoss[0].cond & 0x80) { - if (gpBossFuncTbl[gBoss[0].code_char] != nullptr) - gpBossFuncTbl[gBoss[0].code_char](); + gpBossFuncTbl[gBoss[0].code_char](); for (int bos = 0; bos < BOSS_MAX; bos++) { diff --git a/src/NpChar.cpp b/src/NpChar.cpp index 8588c058..269802aa 100644 --- a/src/NpChar.cpp +++ b/src/NpChar.cpp @@ -360,8 +360,8 @@ void ActNpChar() { if (gNPC[i].cond & 0x80) { - if (gpNpcFuncTbl[gNPC[i].code_char] != nullptr) - gpNpcFuncTbl[gNPC[i].code_char](&gNPC[i]); + gpNpcFuncTbl[gNPC[i].code_char](&gNPC[i]); + if (gNPC[i].shock) --gNPC[i].shock; } @@ -404,8 +404,7 @@ void ChangeNpCharByEvent(int code_event, int code_char, int dir) } } - if (gpNpcFuncTbl[code_char] != nullptr) - gpNpcFuncTbl[code_char](&gNPC[n]); + gpNpcFuncTbl[code_char](&gNPC[n]); } } } @@ -447,8 +446,7 @@ void ChangeCheckableNpCharByEvent(int code_event, int code_char, int dir) } } - if (gpNpcFuncTbl[code_char] != nullptr) - gpNpcFuncTbl[code_char](&gNPC[n]); + gpNpcFuncTbl[code_char](&gNPC[n]); } } }