diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp index ab8fbdb6a..66afe5ea4 100644 --- a/source/blood/src/blood.cpp +++ b/source/blood/src/blood.cpp @@ -1135,7 +1135,6 @@ int GameInterface::app_main() #endif //gSysRes.Init(pUserRFF ? pUserRFF : "BLOOD.RFF"); //gGuiRes.Init("GUI.RFF"); - //gSoundRes.Init(pUserSoundRFF ? pUserSoundRFF : "SOUNDS.RFF"); HookReplaceFunctions(); diff --git a/source/blood/src/sound.cpp b/source/blood/src/sound.cpp index 26bbfc141..22583644c 100644 --- a/source/blood/src/sound.cpp +++ b/source/blood/src/sound.cpp @@ -37,8 +37,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. BEGIN_BLD_NS -Resource& gSoundRes = fileSystem; - int soundRates[13] = { 11025, 11025, diff --git a/source/blood/src/sound.h b/source/blood/src/sound.h index 917896bc7..c5aa22d1a 100644 --- a/source/blood/src/sound.h +++ b/source/blood/src/sound.h @@ -54,6 +54,4 @@ void sndProcess(void); void sndTerm(void); void sndInit(void); -extern Resource &gSoundRes; - END_BLD_NS diff --git a/source/build/include/common.h b/source/build/include/common.h index 669660d74..2a787f26e 100644 --- a/source/build/include/common.h +++ b/source/build/include/common.h @@ -66,8 +66,6 @@ static inline void realloc_copy(char **fn, const char *buf) int32_t getatoken(scriptfile *sf, const tokenlist *tl, int32_t ntokens); -int32_t G_CheckCmdSwitch(int32_t argc, char const * const * argv, const char *str); - int32_t maybe_append_ext(char *wbuf, int32_t wbufsiz, const char *fn, const char *ext); // Approximations to 2D and 3D Euclidean distances. Initial EDuke32 SVN import says diff --git a/source/build/src/common.cpp b/source/build/src/common.cpp index 643b6476c..f7698b2cc 100644 --- a/source/build/src/common.cpp +++ b/source/build/src/common.cpp @@ -57,20 +57,6 @@ int32_t getatoken(scriptfile *sf, const tokenlist *tl, int32_t ntokens) ////////// -int32_t G_CheckCmdSwitch(int32_t argc, char const * const * argv, const char *str) -{ - int32_t i; - for (i=0; i