aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimei Yin2017-07-15 17:33:56 +0200
committerSimei Yin2017-07-15 17:51:57 +0200
commit89635193468b4b2967333cd181e06e7cb61ca4f2 (patch)
tree9f6356e4acb794a7aac2eb36d57919dac555d3eb
parenta3876ee8c1bf43ad998681188f83266a85ab64b8 (diff)
downloadscummvm-rg350-89635193468b4b2967333cd181e06e7cb61ca4f2.tar.gz
scummvm-rg350-89635193468b4b2967333cd181e06e7cb61ca4f2.tar.bz2
scummvm-rg350-89635193468b4b2967333cd181e06e7cb61ca4f2.zip
SLUDGE: Clean unused extern variables
-rw-r--r--engines/sludge/builtin.cpp2
-rw-r--r--engines/sludge/loadsave.cpp2
-rw-r--r--engines/sludge/main_loop.cpp4
-rw-r--r--engines/sludge/objtypes.cpp1
-rw-r--r--engines/sludge/people.cpp2
-rw-r--r--engines/sludge/sludger.cpp5
-rw-r--r--engines/sludge/zbuffer.cpp1
7 files changed, 0 insertions, 17 deletions
diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index dbf9dfc57b..0d295afda1 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -68,10 +68,8 @@ extern eventHandlers *currentEvents;
extern variableStack *noStack;
extern statusStuff *nowStatus;
extern screenRegion *overRegion;
-extern HWND hMainWindow;
extern uint sceneWidth, sceneHeight;
extern int numBIFNames, numUserFunc;
-extern char builtInFunctionNames[][25];
extern Common::String *allUserFunc;
extern Common::String *allBIFNames;
diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp
index 0757067af2..6a653b9eef 100644
--- a/engines/sludge/loadsave.cpp
+++ b/engines/sludge/loadsave.cpp
@@ -64,12 +64,10 @@ extern personaAnimation *mouseCursorAnim; // In cursor.cpp
extern int mouseCursorFrameNum; // " " "
extern int loadedFontNum, fontHeight; // In fonttext.cpp
extern uint fontTableSize; //
-extern int numFontColours; // " " "
extern UTF8Converter fontOrder; // " " "
extern FILETIME fileTime; // In sludger.cpp
extern int speechMode; // " " "
extern int lightMapNumber; // In backdrop.cpp
-extern uint sceneWidth, sceneHeight; // " " "
extern int cameraX, cameraY; // " " "
extern float cameraZoom;
extern byte brightnessLevel; // " " "
diff --git a/engines/sludge/main_loop.cpp b/engines/sludge/main_loop.cpp
index 1f8a44e81c..d2dcd8e975 100644
--- a/engines/sludge/main_loop.cpp
+++ b/engines/sludge/main_loop.cpp
@@ -49,8 +49,6 @@
namespace Sludge {
-extern bool runningFullscreen;
-
#ifndef MAX_PATH
#define MAX_PATH 1024 // maximum size of a path name
#endif
@@ -60,11 +58,9 @@ HWND hMainWindow = NULL;
int realWinWidth = 640, realWinHeight = 480;
extern float cameraZoom;
-extern int desiredfps;
extern int specialSettings;
extern inputType input;
extern variableStack *noStack;
-extern Graphics::Surface backdropSurface;
Graphics::Surface renderSurface;
int dialogValue = 0;
diff --git a/engines/sludge/objtypes.cpp b/engines/sludge/objtypes.cpp
index f975167ec9..8b7f258c63 100644
--- a/engines/sludge/objtypes.cpp
+++ b/engines/sludge/objtypes.cpp
@@ -31,7 +31,6 @@
namespace Sludge {
objectType *allObjectTypes = NULL;
-extern char *outputDir;
#define DEBUG_COMBINATIONS 0
diff --git a/engines/sludge/people.cpp b/engines/sludge/people.cpp
index afc34cb792..7d15086b29 100644
--- a/engines/sludge/people.cpp
+++ b/engines/sludge/people.cpp
@@ -50,12 +50,10 @@ extern variableStack *noStack;
extern int ssgVersion;
-extern int cameraX, cameraY;
screenRegion personRegion;
extern screenRegion *lastRegion;
extern flor *currentFloor;
-extern inputType input;
onScreenPerson *allPeople = NULL;
int16 scaleHorizon = 75;
int16 scaleDivide = 150;
diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp
index 41d2dd8cc4..ff1e1f83ab 100644
--- a/engines/sludge/sludger.cpp
+++ b/engines/sludge/sludger.cpp
@@ -53,12 +53,9 @@
namespace Sludge {
extern personaAnimation *mouseCursorAnim;
-extern spritePalette pastePalette;
extern int dialogValue;
-extern uint sceneWidth, sceneHeight;
extern variable *launchResult;
-extern bool reallyWantToQuit;
extern Graphics::Surface renderSurface;
int numBIFNames = 0;
@@ -87,10 +84,8 @@ byte brightnessLevel = 255;
eventHandlers mainHandlers;
eventHandlers *currentEvents = &mainHandlers;
-extern HWND hMainWindow;
extern screenRegion *overRegion;
extern speechStruct *speech;
-extern statusStuff *nowStatus;
extern loadedFunction *saverFunc;
loadedFunction *allRunningFunctions = NULL;
diff --git a/engines/sludge/zbuffer.cpp b/engines/sludge/zbuffer.cpp
index d9e66b82c6..e3b305632b 100644
--- a/engines/sludge/zbuffer.cpp
+++ b/engines/sludge/zbuffer.cpp
@@ -38,7 +38,6 @@ int zBufferToSet = -1;
zBufferData zBuffer;
extern uint sceneWidth, sceneHeight;
extern Graphics::Surface backdropSurface;
-extern Graphics::Surface renderSurface;
void killZBuffer() {
if (zBuffer.sprites) {