From 5c6a48b2ff362a70416a6a00fda7d06e0f276f2d Mon Sep 17 00:00:00 2001
From: Ash Wolf <ninji@wuffs.org>
Date: Sat, 1 Jul 2023 02:43:29 +0100
Subject: i am in hell

---
 src/T2DLL/GlobalFunc.cpp | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'src/T2DLL/GlobalFunc.cpp')

diff --git a/src/T2DLL/GlobalFunc.cpp b/src/T2DLL/GlobalFunc.cpp
index 754f5cd..a5f6f6f 100644
--- a/src/T2DLL/GlobalFunc.cpp
+++ b/src/T2DLL/GlobalFunc.cpp
@@ -1,21 +1,12 @@
+#define ATOI_KLUDGE
 #include "CResFile.h"
 #include "GlobalFunc.h"
 #include "T2BitImage.h"
+#include "T2DLL.h"
 #include "T2OptionPluginList.h"
 #include "T2TowerDoc.h"
 #include "T2WorldDef.h"
 
-T2SoundPlayer *Sounds;
-CT2App *gT2App;
-int gCommonColor[20];
-BOOL FFEnable;
-DWORD FFBaseForce;
-IDirectInput *FFgpdi;
-IDirectInputDevice2W *FFJoystick;
-IDirectInputEffect *FFBuild;
-IDirectInputEffect *FFStatic;
-T2TowerDoc *g_TowerDoc;
-
 char *strtokEx(char * inStr, const char * inSep, char ** ioLast) {
 #line 11
     _ASSERT(!inStr || !*ioLast);
@@ -344,7 +335,7 @@ CString LoadStringTable(HINSTANCE inModule, int inID1, int inID2) {
             }
         }
     } else {
-        str.Format("%d-%d@%s", inID1, inID2);
+        str.Format("%d-%d", inID1, inID2);
 
         BOOL isOpen = false;
         CResFile theResFile;
-- 
cgit v1.2.3