From 43a9be0ad0edf0d4510f8c56c70e8f0c2fc5e0a7 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 21 Sep 2020 22:34:06 +0200 Subject: [PATCH] - removed Blood's loadboard replacement hook. It never calls engineLoadBoard but always its own map loading function directly. --- source/blood/src/replace.cpp | 1 - source/build/include/build.h | 1 - source/build/src/engine.cpp | 4 ---- 3 files changed, 6 deletions(-) diff --git a/source/blood/src/replace.cpp b/source/blood/src/replace.cpp index 19bea6069..2589d7cd3 100644 --- a/source/blood/src/replace.cpp +++ b/source/blood/src/replace.cpp @@ -88,7 +88,6 @@ void HookReplaceFunctions(void) deletesprite_replace = qdeletesprite; changespritesect_replace = qchangespritesect; changespritestat_replace = qchangespritestat; - loadboard_replace = qloadboard; } END_BLD_NS diff --git a/source/build/include/build.h b/source/build/include/build.h index 546364b9a..3f1e6692a 100644 --- a/source/build/include/build.h +++ b/source/build/include/build.h @@ -1044,7 +1044,6 @@ extern int32_t(*insertsprite_replace)(int16_t sectnum, int16_t statnum); extern int32_t(*deletesprite_replace)(int16_t spritenum); extern int32_t(*changespritesect_replace)(int16_t spritenum, int16_t newsectnum); extern int32_t(*changespritestat_replace)(int16_t spritenum, int16_t newstatnum); -extern int32_t(*loadboard_replace)(const char *filename, char flags, vec3_t *dapos, int16_t *daang, int16_t *dacursectnum); #ifdef USE_OPENGL extern void(*PolymostProcessVoxels_Callback)(void); #endif diff --git a/source/build/src/engine.cpp b/source/build/src/engine.cpp index 3af581f29..cf298bca0 100644 --- a/source/build/src/engine.cpp +++ b/source/build/src/engine.cpp @@ -2080,8 +2080,6 @@ static void check_sprite(int32_t i) #include "md4.h" -int32_t(*loadboard_replace)(const char *filename, char flags, vec3_t *dapos, int16_t *daang, int16_t *dacursectnum) = NULL; - // flags: 1, 2: former parameter "fromwhere" // 4: don't call polymer_loadboard // 8: don't autoexec .cfg @@ -2093,8 +2091,6 @@ int32_t(*loadboard_replace)(const char *filename, char flags, vec3_t *dapos, int int32_t engineLoadBoard(const char *filename, char flags, vec3_t *dapos, int16_t *daang, int16_t *dacursectnum) { inputState.ClearAllInput(); - if (loadboard_replace) - return loadboard_replace(filename, flags, dapos, daang, dacursectnum); int32_t i; int16_t numsprites; const char myflags = flags&(~3);