[Scummvm-git-logs] scummvm master -> 28e4e4670759f964898aae451868d7187a81eec8
sev-
sev at scummvm.org
Thu May 6 23:30:12 UTC 2021
This automated email contains information about 9 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
519b212f95 SLUDGE: Improved script decompilation
2270799dac SLUDGE: Dump images
becfea5dbc SLUDGE: Changed naming format for dump files
9d6761a8ad SLUDGE: Dump more resources
73c9875529 SLUDGE: Wrap status bar into a class
bbf03426e1 SLUDGE: JANITORIAL: Fix code formatting
e3da6f47b5 SLUDGE: Remove unused files and redundant header
5c15a99fb8 SLUDGE: Reduced header dependecy. No nested includes
28e4e46707 SLUDGE: Reduce header dependencies
Commit: 519b212f955a1d52a4f83e1feb94a5b696f2e326
https://github.com/scummvm/scummvm/commit/519b212f955a1d52a4f83e1feb94a5b696f2e326
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-07T01:29:52+02:00
Commit Message:
SLUDGE: Improved script decompilation
Changed paths:
engines/sludge/builtin.cpp
engines/sludge/builtin.h
engines/sludge/fileset.cpp
engines/sludge/function.cpp
engines/sludge/functionlist.h
diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index 88f58d1b12..e674038b34 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -93,6 +93,7 @@ extern LoadedFunction *saverFunc;
typedef BuiltReturn (*builtInSludgeFunc)(int numParams, LoadedFunction *fun);
struct builtInFunctionData {
+ const char *name;
builtInSludgeFunc func;
int paramNum;
};
@@ -2575,4 +2576,11 @@ BuiltReturn callBuiltIn(int whichFunc, int numParams, LoadedFunction *fun) {
return BR_ERROR;
}
+const char *getBuiltInName(int num) {
+ if (num > NUM_FUNCS)
+ error("getBuiltInName: incorrect builtin number. %d > %d", num, NUM_FUNCS);
+
+ return builtInFunctionArray[num].name;
+}
+
} // End of namespace Sludge
diff --git a/engines/sludge/builtin.h b/engines/sludge/builtin.h
index b7fa8b86ef..3a091f11e1 100644
--- a/engines/sludge/builtin.h
+++ b/engines/sludge/builtin.h
@@ -40,6 +40,7 @@ enum BuiltReturn {
bool failSecurityCheck(const Common::String &fn);
BuiltReturn callBuiltIn(int whichFunc, int numParams, LoadedFunction *fun);
+const char *getBuiltInName(int num);
} // End of namespace Sludge
diff --git a/engines/sludge/fileset.cpp b/engines/sludge/fileset.cpp
index 4a02d60bf2..c75b683d0d 100644
--- a/engines/sludge/fileset.cpp
+++ b/engines/sludge/fileset.cpp
@@ -193,10 +193,7 @@ Common::String ResourceManager::convertString(const Common::String &s) {
}
Common::String ResourceManager::getNumberedString(int value) {
- if (_sliceBusy) {
- fatal("Can't read from data file", "I'm already reading something");
- return NULL;
- }
+ uint32 pos = _bigDataFile->pos();
_bigDataFile->seek((value << 2) + _startOfTextIndex, 0);
value = _bigDataFile->readUint32LE();
@@ -209,6 +206,9 @@ Common::String ResourceManager::getNumberedString(int value) {
s = convertString(s);
}
+ if (_sliceBusy)
+ _bigDataFile->seek(pos);
+
return s;
}
diff --git a/engines/sludge/function.cpp b/engines/sludge/function.cpp
index ae18d42399..862239f554 100644
--- a/engines/sludge/function.cpp
+++ b/engines/sludge/function.cpp
@@ -164,6 +164,22 @@ void unfreezeSubs() {
}
}
+Common::String getCommandParameter(int com, int param) {
+ switch(com) {
+ case SLU_LOAD_BUILT:
+ return getBuiltInName(param);
+
+ case SLU_SET_GLOBAL:
+ return Common::String::format("global%d", param);
+
+ case SLU_LOAD_STRING:
+ return Common::String::format("\"%s\"", g_sludge->_resMan->getNumberedString(param).c_str());
+
+ default:
+ return Common::String::format("%d", param);
+ }
+}
+
bool continueFunction(LoadedFunction *fun) {
bool keepLooping = true;
bool advanceNow;
@@ -177,9 +193,9 @@ bool continueFunction(LoadedFunction *fun) {
while (keepLooping) {
advanceNow = true;
- debugC(1, kSludgeDebugStackMachine, "Executing command line %i : ", fun->runThisLine);
param = fun->compiledLines[fun->runThisLine].param;
com = fun->compiledLines[fun->runThisLine].theCommand;
+ debugC(1, kSludgeDebugStackMachine, "Executing command line %i : %s(%s)", fun->runThisLine, sludgeText[com], getCommandParameter(com, param).c_str());
if (numBIFNames) {
setFatalInfo((fun->originalNumber < numUserFunc) ? allUserFunc[fun->originalNumber] : "Unknown user function", (com < numSludgeCommands) ? sludgeText[com] : ERROR_UNKNOWN_MCODE);
@@ -638,10 +654,12 @@ bool loadFunctionCode(LoadedFunction *newFunc) {
return false;
for (numLinesRead = 0; numLinesRead < numLines; numLinesRead++) {
- newFunc->compiledLines[numLinesRead].theCommand = (SludgeCommand)readStream->readByte();
- newFunc->compiledLines[numLinesRead].param = readStream->readUint16BE();
- debugC(3, kSludgeDebugDataLoad, "command line %i: %i", numLinesRead,
- newFunc->compiledLines[numLinesRead].theCommand);
+ byte com = readStream->readByte();
+ uint16 param = readStream->readUint16BE();
+ newFunc->compiledLines[numLinesRead].theCommand = (SludgeCommand)com;
+ newFunc->compiledLines[numLinesRead].param = param;
+ debugC(3, kSludgeDebugDataLoad, "command line %i: %s(%s)", numLinesRead,
+ sludgeText[com], getCommandParameter(com, param).c_str());
}
g_sludge->_resMan->finishAccess();
diff --git a/engines/sludge/functionlist.h b/engines/sludge/functionlist.h
index c7858a2d03..3644101fda 100644
--- a/engines/sludge/functionlist.h
+++ b/engines/sludge/functionlist.h
@@ -29,7 +29,7 @@
namespace Sludge {
-#define FUNC(special,name,paramNum) {builtIn_ ## name, paramNum},
+#define FUNC(special,name,paramNum) {#name, builtIn_ ## name, paramNum},
static builtInFunctionData builtInFunctionArray[] = {
FUNC(true, say, -1)
FUNC(true, skipSpeech, 0)
Commit: 2270799dacb14c0c4746f55dbb04857c6740997a
https://github.com/scummvm/scummvm/commit/2270799dacb14c0c4746f55dbb04857c6740997a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-07T01:29:52+02:00
Commit Message:
SLUDGE: Dump images
Changed paths:
engines/sludge/backdrop.cpp
engines/sludge/fileset.cpp
engines/sludge/fileset.h
engines/sludge/graphics.h
engines/sludge/imgloader.cpp
engines/sludge/imgloader.h
engines/sludge/sludger.cpp
engines/sludge/sprites.cpp
engines/sludge/zbuffer.cpp
diff --git a/engines/sludge/backdrop.cpp b/engines/sludge/backdrop.cpp
index b7671da1b9..f76caf0364 100644
--- a/engines/sludge/backdrop.cpp
+++ b/engines/sludge/backdrop.cpp
@@ -74,7 +74,7 @@ bool Parallax::add(uint16 v, uint16 fracX, uint16 fracY) {
_parallaxLayers.push_back(nP);
- if (!ImgLoader::loadImage(g_sludge->_resMan->getData(), &nP->surface, 0))
+ if (!ImgLoader::loadImage(v, "parallax", g_sludge->_resMan->getData(), &nP->surface, 0))
return false;
nP->fileNum = v;
@@ -196,7 +196,7 @@ bool GraphicsManager::snapshot() {
}
bool GraphicsManager::restoreSnapshot(Common::SeekableReadStream *stream) {
- if (!(ImgLoader::loadImage(stream, &_snapshotSurface))) {
+ if (!(ImgLoader::loadImage(-1, NULL, stream, &_snapshotSurface))) {
return false;
}
return true;
@@ -256,7 +256,7 @@ void GraphicsManager::loadBackDrop(int fileNum, int x, int y) {
return;
}
- if (!loadHSI(g_sludge->_resMan->getData(), x, y, false)) {
+ if (!loadHSI(fileNum, g_sludge->_resMan->getData(), x, y, false)) {
Common::String mess = Common::String::format("Can't paste overlay image outside scene dimensions\n\nX = %i\nY = %i\nWidth = %i\nHeight = %i", x, y, _sceneWidth, _sceneHeight);
fatal(mess);
}
@@ -278,7 +278,7 @@ void GraphicsManager::mixBackDrop(int fileNum, int x, int y) {
return;
}
- if (!mixHSI(g_sludge->_resMan->getData(), x, y)) {
+ if (!mixHSI(fileNum, g_sludge->_resMan->getData(), x, y)) {
fatal("Can't paste overlay image outside screen dimensions");
}
@@ -381,7 +381,7 @@ bool GraphicsManager::loadLightMap(int v) {
Graphics::TransparentSurface tmp;
- if (!ImgLoader::loadImage(g_sludge->_resMan->getData(), &tmp))
+ if (!ImgLoader::loadImage(v, "lightmap", g_sludge->_resMan->getData(), &tmp))
return false;
if (tmp.w != _sceneWidth || tmp.h != _sceneHeight) {
@@ -400,17 +400,6 @@ bool GraphicsManager::loadLightMap(int v) {
g_sludge->_resMan->finishAccess();
setResourceForFatal(-1);
- // Debug code to output light map image
-#if 0
- Common::DumpFile *outFile = new Common::DumpFile();
- Common::String outName = Common::String::format("lightmap_%i.png", v);
- outFile->open(outName);
- Image::writePNG(*outFile, _lightMap);
- outFile->finalize();
- outFile->close();
- delete outFile;
-#endif
-
return true;
}
@@ -440,7 +429,7 @@ bool GraphicsManager::loadLightMap(int ssgVersion, Common::SeekableReadStream *s
return true;
}
-bool GraphicsManager::loadHSI(Common::SeekableReadStream *stream, int x, int y, bool reserve) {
+bool GraphicsManager::loadHSI(int num, Common::SeekableReadStream *stream, int x, int y, bool reserve) {
debugC(1, kSludgeDebugGraphics, "Load HSI");
if (reserve) {
killAllBackDrop(); // kill all
@@ -448,7 +437,7 @@ bool GraphicsManager::loadHSI(Common::SeekableReadStream *stream, int x, int y,
Graphics::Surface tmp;
- if (!ImgLoader::loadImage(stream, &tmp, (int)reserve))
+ if (!ImgLoader::loadImage(num, "hsi", stream, &tmp, (int)reserve))
return false;
uint realPicWidth = tmp.w;
@@ -480,10 +469,10 @@ bool GraphicsManager::loadHSI(Common::SeekableReadStream *stream, int x, int y,
return true;
}
-bool GraphicsManager::mixHSI(Common::SeekableReadStream *stream, int x, int y) {
+bool GraphicsManager::mixHSI(int num, Common::SeekableReadStream *stream, int x, int y) {
debugC(1, kSludgeDebugGraphics, "Load mixHSI");
Graphics::Surface mixSurface;
- if (!ImgLoader::loadImage(stream, &mixSurface, 0))
+ if (!ImgLoader::loadImage(num, "mixhsi", stream, &mixSurface, 0))
return false;
uint realPicWidth = mixSurface.w;
@@ -526,7 +515,7 @@ void GraphicsManager::loadBackdrop(int ssgVersion, Common::SeekableReadStream *s
_brightnessLevel = stream->readByte();
- loadHSI(stream, 0, 0, true);
+ loadHSI(-1, stream, 0, 0, true);
}
bool GraphicsManager::getRGBIntoStack(uint x, uint y, StackHandler *sH) {
diff --git a/engines/sludge/fileset.cpp b/engines/sludge/fileset.cpp
index c75b683d0d..d73f3ad6e0 100644
--- a/engines/sludge/fileset.cpp
+++ b/engines/sludge/fileset.cpp
@@ -23,6 +23,7 @@
#include "common/file.h"
#include "common/debug.h"
#include "common/ustr.h"
+#include "common/config-manager.h"
#include "sludge/allfiles.h"
#include "sludge/moreio.h"
@@ -221,6 +222,30 @@ void ResourceManager::finishAccess() {
_sliceBusy = false;
}
+void ResourceManager::dumpFile(int num, const char *pattern) {
+ if (!ConfMan.getBool("dump_scripts"))
+ return;
+
+ Common::DumpFile dumpFile;
+ dumpFile.open(Common::String("dumps/") + Common::String::format(pattern, num));
+ uint32 pos = _bigDataFile->pos();
+
+ _bigDataFile->seek(_startOfDataIndex + (num << 2), 0);
+ _bigDataFile->seek(_bigDataFile->readUint32LE(), 1);
+
+ uint fsize = _bigDataFile->readUint32LE();
+
+ byte *data = (byte *)malloc(fsize);
+
+ _bigDataFile->read(data, fsize);
+ dumpFile.write(data, fsize);
+ dumpFile.close();
+
+ free(data);
+
+ _bigDataFile->seek(pos);
+}
+
void ResourceManager::readResourceNames(Common::SeekableReadStream *readStream) {
int numResourceNames = readStream->readUint16BE();
debugC(2, kSludgeDebugDataLoad, "numResourceNames %i", numResourceNames);
diff --git a/engines/sludge/fileset.h b/engines/sludge/fileset.h
index fb6a696f47..36afbf0f49 100644
--- a/engines/sludge/fileset.h
+++ b/engines/sludge/fileset.h
@@ -53,6 +53,8 @@ public:
const Common::String resourceNameFromNum(int i);
bool hasResourceNames() { return !_allResourceNames.empty(); }
+ void dumpFile(int num, const char *pattern);
+
private:
bool _sliceBusy;
Common::File *_bigDataFile;
diff --git a/engines/sludge/graphics.h b/engines/sludge/graphics.h
index 8bc47cdab4..0409a0efec 100644
--- a/engines/sludge/graphics.h
+++ b/engines/sludge/graphics.h
@@ -84,8 +84,8 @@ public:
void blankAllScreen();
void darkScreen();
void saveHSI(Common::WriteStream *stream);
- bool loadHSI(Common::SeekableReadStream *stream, int, int, bool);
- bool mixHSI(Common::SeekableReadStream *stream, int x = 0, int y = 0);
+ bool loadHSI(int num, Common::SeekableReadStream *stream, int, int, bool);
+ bool mixHSI(int num, Common::SeekableReadStream *stream, int x = 0, int y = 0);
void drawLine(uint, uint, uint, uint);
void drawHorizontalLine(uint, uint, uint);
void drawVerticalLine(uint, uint, uint);
diff --git a/engines/sludge/imgloader.cpp b/engines/sludge/imgloader.cpp
index c909ad5b62..e8c023accb 100644
--- a/engines/sludge/imgloader.cpp
+++ b/engines/sludge/imgloader.cpp
@@ -20,6 +20,7 @@
*
*/
+#include "common/config-manager.h"
#include "common/debug.h"
#include "common/stream.h"
#include "image/png.h"
@@ -32,14 +33,45 @@
namespace Sludge {
-bool ImgLoader::loadImage(Common::SeekableReadStream *stream, Graphics::Surface *dest, int reserve) {
+bool ImgLoader::loadImage(int num, const char *fname, Common::SeekableReadStream *stream, Graphics::Surface *dest, int reserve) {
debugC(3, kSludgeDebugGraphics, "Loading image at position: %i", stream->pos());
+
+ bool dumpPng = false;
+
int32 start_ptr = stream->pos();
if (!loadPNGImage(stream, dest)) {
stream->seek(start_ptr);
if (!loadHSIImage(stream, dest, reserve)) {
return false;
+ } else {
+ if (num != -1) {
+ g_sludge->_resMan->dumpFile(num, Common::String::format("%s%%d.slx", fname).c_str());
+ dumpPng = true;
+ }
}
+ } else {
+ if (num != -1)
+ g_sludge->_resMan->dumpFile(num, Common::String::format("%s%%d.png", fname).c_str());
+ }
+
+ if (!ConfMan.getBool("dump_scripts"))
+ return true;
+
+ if (dumpPng || (fname && num == -1)) {
+ // Debug code to output light map image
+ Common::DumpFile *outFile = new Common::DumpFile();
+ Common::String outName;
+
+ if (dumpPng)
+ outName = Common::String::format("dumps/%s%d.png", fname, num);
+ else
+ outName = Common::String::format("dumps/%s.png", fname);
+
+ outFile->open(outName);
+ Image::writePNG(*outFile, *dest);
+ outFile->finalize();
+ outFile->close();
+ delete outFile;
}
return true;
}
diff --git a/engines/sludge/imgloader.h b/engines/sludge/imgloader.h
index e4a09e0d36..ade0fb49de 100644
--- a/engines/sludge/imgloader.h
+++ b/engines/sludge/imgloader.h
@@ -32,7 +32,7 @@ protected:
ImgLoader() {}
public:
- static bool loadImage(Common::SeekableReadStream *stream, Graphics::Surface *dest, int reserve = -1);
+ static bool loadImage(int num, const char *fname, Common::SeekableReadStream *stream, Graphics::Surface *dest, int reserve = -1);
static bool loadPNGImage(Common::SeekableReadStream *stream, Graphics::Surface *dest, bool checkSig = true);
static bool loadHSIImage(Common::SeekableReadStream *stream, Graphics::Surface *dest, int reserve = -1);
};
diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp
index 4a88b51f70..8a56f9ebc7 100644
--- a/engines/sludge/sludger.cpp
+++ b/engines/sludge/sludger.cpp
@@ -254,7 +254,7 @@ bool initSludge(const Common::String &filename) {
// read game icon
Graphics::Surface gameIcon;
- if (!ImgLoader::loadImage(fp, &gameIcon, false))
+ if (!ImgLoader::loadImage(-1, "icon", fp, &gameIcon, false))
return false;
}
@@ -265,7 +265,7 @@ bool initSludge(const Common::String &filename) {
// read game logo
Graphics::Surface gameLogo;
- if (!ImgLoader::loadImage(fp, &gameLogo))
+ if (!ImgLoader::loadImage(-1, "logo", fp, &gameLogo))
return false;
}
diff --git a/engines/sludge/sprites.cpp b/engines/sludge/sprites.cpp
index 921d86ca95..e11652e74c 100644
--- a/engines/sludge/sprites.cpp
+++ b/engines/sludge/sprites.cpp
@@ -99,6 +99,8 @@ bool GraphicsManager::loadSpriteBank(int fileNum, SpriteBank &loadhere, bool isF
if (!g_sludge->_resMan->openFileFromNum(fileNum))
return fatal("Can't open sprite bank / font");
+ g_sludge->_resMan->dumpFile(fileNum, "bank%d.duc");
+
loadhere.isFont = isFont;
Common::SeekableReadStream *readStream = g_sludge->_resMan->getData();
diff --git a/engines/sludge/zbuffer.cpp b/engines/sludge/zbuffer.cpp
index ad73004a1c..7417a57c04 100644
--- a/engines/sludge/zbuffer.cpp
+++ b/engines/sludge/zbuffer.cpp
@@ -21,7 +21,6 @@
*/
#include "common/debug.h"
-#include "common/config-manager.h"
#include "graphics/pixelformat.h"
#include "graphics/transparent_surface.h"
@@ -91,16 +90,7 @@ bool GraphicsManager::setZBuffer(int num) {
Common::SeekableReadStream *readStream = g_sludge->_resMan->getData();
- if (ConfMan.getBool("dump_scripts")) {
- Common::DumpFile dumpFile;
- dumpFile.open(Common::String::format("dumps/zbuffer%d.zbu", num));
- uint32 pos = readStream->pos();
- byte *data = (byte *)malloc(fsize);
- readStream->read(data, fsize);
- dumpFile.write(data, fsize);
- dumpFile.close();
- readStream->seek(pos);
- }
+ g_sludge->_resMan->dumpFile(num, "zbuffer%d.zbu");
if (readStream->readByte() != 'S')
return fatal("Not a Z-buffer file");
Commit: becfea5dbc41e8742241361f163f99ecec377e28
https://github.com/scummvm/scummvm/commit/becfea5dbc41e8742241361f163f99ecec377e28
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-07T01:29:52+02:00
Commit Message:
SLUDGE: Changed naming format for dump files
Changed paths:
engines/sludge/imgloader.cpp
engines/sludge/sprites.cpp
engines/sludge/zbuffer.cpp
diff --git a/engines/sludge/imgloader.cpp b/engines/sludge/imgloader.cpp
index e8c023accb..54ff041f6e 100644
--- a/engines/sludge/imgloader.cpp
+++ b/engines/sludge/imgloader.cpp
@@ -45,13 +45,13 @@ bool ImgLoader::loadImage(int num, const char *fname, Common::SeekableReadStream
return false;
} else {
if (num != -1) {
- g_sludge->_resMan->dumpFile(num, Common::String::format("%s%%d.slx", fname).c_str());
+ g_sludge->_resMan->dumpFile(num, Common::String::format("%s%%04d.slx", fname).c_str());
dumpPng = true;
}
}
} else {
if (num != -1)
- g_sludge->_resMan->dumpFile(num, Common::String::format("%s%%d.png", fname).c_str());
+ g_sludge->_resMan->dumpFile(num, Common::String::format("%s%%04d.png", fname).c_str());
}
if (!ConfMan.getBool("dump_scripts"))
@@ -63,7 +63,7 @@ bool ImgLoader::loadImage(int num, const char *fname, Common::SeekableReadStream
Common::String outName;
if (dumpPng)
- outName = Common::String::format("dumps/%s%d.png", fname, num);
+ outName = Common::String::format("dumps/%s%04d.png", fname, num);
else
outName = Common::String::format("dumps/%s.png", fname);
diff --git a/engines/sludge/sprites.cpp b/engines/sludge/sprites.cpp
index e11652e74c..7c8529d388 100644
--- a/engines/sludge/sprites.cpp
+++ b/engines/sludge/sprites.cpp
@@ -99,7 +99,7 @@ bool GraphicsManager::loadSpriteBank(int fileNum, SpriteBank &loadhere, bool isF
if (!g_sludge->_resMan->openFileFromNum(fileNum))
return fatal("Can't open sprite bank / font");
- g_sludge->_resMan->dumpFile(fileNum, "bank%d.duc");
+ g_sludge->_resMan->dumpFile(fileNum, "bank%04d.duc");
loadhere.isFont = isFont;
diff --git a/engines/sludge/zbuffer.cpp b/engines/sludge/zbuffer.cpp
index 7417a57c04..6fa66edd6f 100644
--- a/engines/sludge/zbuffer.cpp
+++ b/engines/sludge/zbuffer.cpp
@@ -90,7 +90,7 @@ bool GraphicsManager::setZBuffer(int num) {
Common::SeekableReadStream *readStream = g_sludge->_resMan->getData();
- g_sludge->_resMan->dumpFile(num, "zbuffer%d.zbu");
+ g_sludge->_resMan->dumpFile(num, "zbuffer%04d.zbu");
if (readStream->readByte() != 'S')
return fatal("Not a Z-buffer file");
Commit: 9d6761a8adb191a703525f5d4e6c5c50a86d06e4
https://github.com/scummvm/scummvm/commit/9d6761a8adb191a703525f5d4e6c5c50a86d06e4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-07T01:29:52+02:00
Commit Message:
SLUDGE: Dump more resources
Changed paths:
engines/sludge/floor.cpp
engines/sludge/sound.cpp
diff --git a/engines/sludge/floor.cpp b/engines/sludge/floor.cpp
index eb961e9efa..a65fab67e8 100644
--- a/engines/sludge/floor.cpp
+++ b/engines/sludge/floor.cpp
@@ -145,6 +145,8 @@ bool FloorManager::setFloor(int fileNum) {
if (!g_sludge->_resMan->openFileFromNum(fileNum))
return false;
+ g_sludge->_resMan->dumpFile(fileNum, "floor%04d.flo");
+
// Find out how many polygons there are and reserve memory
_currentFloor->originalNum = fileNum;
diff --git a/engines/sludge/sound.cpp b/engines/sludge/sound.cpp
index 25b239c191..2231ce584b 100644
--- a/engines/sludge/sound.cpp
+++ b/engines/sludge/sound.cpp
@@ -220,24 +220,12 @@ bool SoundManager::playMOD(int f, int a, int fromTrack) {
return false;
}
+ g_sludge->_resMan->dumpFile(f, "music%04d.xm");
+
// make audio stream
Common::SeekableReadStream *readStream = g_sludge->_resMan->getData();
Common::SeekableReadStream *memImage = readStream->readStream(length);
-// debug output
-#if 0
- Common::DumpFile *dump = new Common::DumpFile();
- Common::String name = Common::String::format("mod_sound_%i", f);
- dump->open(name);
- byte *soundData = new byte[length];
- memImage->read(soundData, length);
- dump->write(soundData, length);
- dump->finalize();
- delete []soundData;
- delete dump;
- memImage->seek(0, SEEK_SET);
-#endif
-
if (memImage->size() != (int)length || readStream->err()) {
return fatal("Sound reading failed");
}
@@ -321,6 +309,8 @@ int SoundManager::makeSoundAudioStream(int f, Audio::AudioStream *&audiostream,
if (!length)
return -1;
+ g_sludge->_resMan->dumpFile(f, "sound%04d.ogg");
+
Common::SeekableReadStream *readStream = g_sludge->_resMan->getData();
uint curr_ptr = readStream->pos();
Audio::RewindableAudioStream *stream = Audio::makeWAVStream(readStream->readStream(length), DisposeAfterUse::NO);
Commit: 73c9875529547e035043b144cbac3748cfba022a
https://github.com/scummvm/scummvm/commit/73c9875529547e035043b144cbac3748cfba022a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-07T01:29:52+02:00
Commit Message:
SLUDGE: Wrap status bar into a class
This lets us get rid of the global constructors
Changed paths:
engines/sludge/backdrop.cpp
engines/sludge/builtin.cpp
engines/sludge/freeze.cpp
engines/sludge/loadsave.cpp
engines/sludge/sludge.cpp
engines/sludge/sludge.h
engines/sludge/sludger.cpp
engines/sludge/statusba.cpp
engines/sludge/statusba.h
diff --git a/engines/sludge/backdrop.cpp b/engines/sludge/backdrop.cpp
index f76caf0364..ec69fb9549 100644
--- a/engines/sludge/backdrop.cpp
+++ b/engines/sludge/backdrop.cpp
@@ -186,7 +186,7 @@ bool GraphicsManager::snapshot() {
// draw snapshot to rendersurface
displayBase();
_vm->_speechMan->display();
- drawStatusBar();
+ g_sludge->_statusBar->draw();
// copy backdrop to snapshot
_snapshotSurface.copyFrom(_renderSurface);
diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index e674038b34..664a43828e 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -59,7 +59,6 @@ Variable *launchResult = NULL;
extern bool allowAnyFilename;
extern VariableStack *noStack;
-extern StatusStuff *nowStatus;
extern int numBIFNames, numUserFunc;
extern Common::String *allUserFunc;
@@ -203,7 +202,7 @@ builtIn(getMouseScreenY) {
builtIn(getStatusText) {
UNUSEDALL
- fun->reg.makeTextVar(statusBarText());
+ fun->reg.makeTextVar(g_sludge->_statusBar->statusBarText());
return BR_CONTINUE;
}
@@ -723,7 +722,7 @@ builtIn(setStatusColour) {
if (!getRGBParams(red, green, blue, fun))
return BR_ERROR;
- statusBarColour((byte)red, (byte)green, (byte)blue);
+ g_sludge->_statusBar->statusBarColour((byte)red, (byte)green, (byte)blue);
return BR_CONTINUE;
}
@@ -734,7 +733,7 @@ builtIn(setLitStatusColour) {
if (!getRGBParams(red, green, blue, fun))
return BR_ERROR;
- statusBarLitColour((byte)red, (byte)green, (byte)blue);
+ g_sludge->_statusBar->statusBarLitColour((byte)red, (byte)green, (byte)blue);
return BR_CONTINUE;
}
@@ -1722,19 +1721,19 @@ builtIn(jumpCharacter) {
builtIn(clearStatus) {
UNUSEDALL
- clearStatusBar();
+ g_sludge->_statusBar->clear();
return BR_CONTINUE;
}
builtIn(removeLastStatus) {
UNUSEDALL
- killLastStatus();
+ g_sludge->_statusBar->killLastStatus();
return BR_CONTINUE;
}
builtIn(addStatus) {
UNUSEDALL
- addStatusBar();
+ g_sludge->_statusBar->addStatusBar();
return BR_CONTINUE;
}
@@ -1742,7 +1741,7 @@ builtIn(statusText) {
UNUSEDALL
Common::String newText = fun->stack->thisVar.getTextFromAnyVar();
trimStack(fun->stack);
- setStatusBar(newText);
+ g_sludge->_statusBar->set(newText);
return BR_CONTINUE;
}
@@ -1752,7 +1751,7 @@ builtIn(lightStatus) {
if (!fun->stack->thisVar.getValueType(val, SVT_INT))
return BR_ERROR;
trimStack(fun->stack);
- setLitStatus(val);
+ g_sludge->_statusBar->setLitStatus(val);
return BR_CONTINUE;
}
@@ -1765,7 +1764,7 @@ builtIn(positionStatus) {
if (!fun->stack->thisVar.getValueType(x, SVT_INT))
return BR_ERROR;
trimStack(fun->stack);
- positionStatus(x, y);
+ g_sludge->_statusBar->positionStatus(x, y);
return BR_CONTINUE;
}
@@ -1775,7 +1774,7 @@ builtIn(alignStatus) {
if (!fun->stack->thisVar.getValueType(val, SVT_INT))
return BR_ERROR;
trimStack(fun->stack);
- nowStatus->alignStatus = (int16)val;
+ g_sludge->_statusBar->setAlignStatus(val);
return BR_CONTINUE;
}
diff --git a/engines/sludge/freeze.cpp b/engines/sludge/freeze.cpp
index 9f8c85e828..ecd5d1a8fd 100644
--- a/engines/sludge/freeze.cpp
+++ b/engines/sludge/freeze.cpp
@@ -88,7 +88,7 @@ bool GraphicsManager::freeze() {
StatusStuff *newStatusStuff = new StatusStuff;
if (!checkNew(newStatusStuff))
return false;
- newFreezer->frozenStatus = copyStatusBarStuff(newStatusStuff);
+ newFreezer->frozenStatus = _vm->_statusBar->copyStatusBarStuff(newStatusStuff);
_vm->_regionMan->freeze(newFreezer);
_vm->_cursorMan->freeze(newFreezer);
@@ -155,7 +155,7 @@ void GraphicsManager::unfreeze(bool killImage) {
killParallax();
_parallaxStuff = _frozenStuff->parallaxStuff;
_vm->_cursorMan->resotre(_frozenStuff);
- restoreBarStuff(_frozenStuff->frozenStatus);
+ _vm->_statusBar->restoreBarStuff(_frozenStuff->frozenStatus);
_vm->_evtMan->restore(_frozenStuff);
_vm->_speechMan->restore(_frozenStuff);
diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp
index 684e565525..5f30e727c2 100644
--- a/engines/sludge/loadsave.cpp
+++ b/engines/sludge/loadsave.cpp
@@ -142,7 +142,7 @@ bool saveGame(const Common::String &fname) {
g_sludge->_gfxMan->saveLightMap(fp);
g_sludge->_speechMan->save(fp);
- saveStatusBars(fp);
+ g_sludge->_statusBar->saveStatusBars(fp);
g_sludge->_soundMan->saveSounds(fp);
fp->writeUint16BE(CustomSaveHelper::_saveEncoding);
@@ -274,7 +274,7 @@ bool loadGame(const Common::String &fname) {
}
g_sludge->_speechMan->load(fp);
- loadStatusBars(fp);
+ g_sludge->_statusBar->loadStatusBars(fp);
g_sludge->_soundMan->loadSounds(fp);
CustomSaveHelper::_saveEncoding = fp->readUint16BE();
diff --git a/engines/sludge/sludge.cpp b/engines/sludge/sludge.cpp
index 942c710642..ca52bf1703 100644
--- a/engines/sludge/sludge.cpp
+++ b/engines/sludge/sludge.cpp
@@ -37,6 +37,7 @@
#include "sludge/sludge.h"
#include "sludge/sound.h"
#include "sludge/speech.h"
+#include "sludge/statusba.h"
namespace Sludge {
@@ -87,6 +88,7 @@ SludgeEngine::SludgeEngine(OSystem *syst, const SludgeGameDescription *gameDesc)
_speechMan = new SpeechManager(this);
_regionMan = new RegionManager(this);
_floorMan = new FloorManager(this);
+ _statusBar = new StatusBarManager(this);
}
SludgeEngine::~SludgeEngine() {
@@ -131,6 +133,7 @@ SludgeEngine::~SludgeEngine() {
_floorMan = nullptr;
delete _fatalMan;
_fatalMan = nullptr;
+ delete _statusBar;
}
Common::Error SludgeEngine::run() {
@@ -147,4 +150,3 @@ Common::Error SludgeEngine::run() {
}
} // End of namespace Sludge
-
diff --git a/engines/sludge/sludge.h b/engines/sludge/sludge.h
index 257bd3a8a4..061e963c5a 100644
--- a/engines/sludge/sludge.h
+++ b/engines/sludge/sludge.h
@@ -48,6 +48,7 @@ class RegionManager;
class SoundManager;
class SpeechManager;
class TextManager;
+class StatusBarManager;
class SludgeConsole;
@@ -93,6 +94,7 @@ public:
PeopleManager *_peopleMan;
FloorManager *_floorMan;
FatalMsgManager *_fatalMan;
+ StatusBarManager *_statusBar;
SludgeEngine(OSystem *syst, const SludgeGameDescription *gameDesc);
~SludgeEngine() override;
diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp
index 8a56f9ebc7..0148522f13 100644
--- a/engines/sludge/sludger.cpp
+++ b/engines/sludge/sludger.cpp
@@ -131,7 +131,7 @@ void initSludge() {
g_sludge->_floorMan->init();
g_sludge->_objMan->init();
g_sludge->_speechMan->init();
- initStatusBar();
+ g_sludge->_statusBar->init();
g_sludge->_evtMan->init();
g_sludge->_txtMan->init();
g_sludge->_cursorMan->init();
@@ -284,7 +284,7 @@ bool initSludge(const Common::String &filename) {
Common::String dataFolder = encodeFilename(dataFol);
}
- positionStatus(10, winHeight - 15);
+ g_sludge->_statusBar->positionStatus(10, winHeight - 15);
return true;
}
@@ -300,7 +300,7 @@ void displayBase() {
void sludgeDisplay() {
displayBase();
g_sludge->_speechMan->display();
- drawStatusBar();
+ g_sludge->_statusBar->draw();
g_sludge->_cursorMan->displayCursor();
g_sludge->_gfxMan->display();
}
diff --git a/engines/sludge/statusba.cpp b/engines/sludge/statusba.cpp
index fc0f065ea9..d7777f7fe9 100644
--- a/engines/sludge/statusba.cpp
+++ b/engines/sludge/statusba.cpp
@@ -34,162 +34,161 @@
namespace Sludge {
-SpritePalette verbLinePalette;
-SpritePalette litVerbLinePalette;
+StatusBarManager::StatusBarManager(SludgeEngine *sludge) {
+ _nowStatus = &_mainStatus;
+ _sludge = sludge;
+}
-StatusStuff mainStatus;
-StatusStuff *nowStatus = & mainStatus;
+void StatusBarManager::init() {
+ _mainStatus.firstStatusBar = NULL;
+ _mainStatus.alignStatus = IN_THE_CENTRE;
+ _mainStatus.litStatus = -1;
+ _mainStatus.statusX = 10;
+ _mainStatus.statusY = g_system->getHeight() - 15;
+ statusBarColour(255, 255, 255);
+ statusBarLitColour(255, 255, 128);
+}
-void setLitStatus(int i) {
- nowStatus->litStatus = i;
+void StatusBarManager::setLitStatus(int i) {
+ _nowStatus->litStatus = i;
}
-void killLastStatus() {
- if (nowStatus->firstStatusBar) {
- StatusBar *kill = nowStatus->firstStatusBar;
- nowStatus->firstStatusBar = kill->next;
+void StatusBarManager::killLastStatus() {
+ if (_nowStatus->firstStatusBar) {
+ StatusBar *kill = _nowStatus->firstStatusBar;
+ _nowStatus->firstStatusBar = kill->next;
delete kill;
}
}
-void clearStatusBar() {
- StatusBar *stat = nowStatus->firstStatusBar;
+void StatusBarManager::clear() {
+ StatusBar *stat = _nowStatus->firstStatusBar;
StatusBar *kill;
- nowStatus->litStatus = -1;
+ _nowStatus->litStatus = -1;
while (stat) {
kill = stat;
stat = stat->next;
delete kill;
}
- nowStatus->firstStatusBar = NULL;
+ _nowStatus->firstStatusBar = NULL;
}
-void addStatusBar() {
+void StatusBarManager::addStatusBar() {
StatusBar *newStat = new StatusBar;
if (checkNew(newStat)) {
- newStat->next = nowStatus->firstStatusBar;
+ newStat->next = _nowStatus->firstStatusBar;
newStat->text.clear();
- nowStatus->firstStatusBar = newStat;
+ _nowStatus->firstStatusBar = newStat;
}
}
-void setStatusBar(Common::String &txt) {
- if (nowStatus->firstStatusBar) {
- nowStatus->firstStatusBar->text.clear();
- nowStatus->firstStatusBar->text = txt;
+void StatusBarManager::set(Common::String &txt) {
+ if (_nowStatus->firstStatusBar) {
+ _nowStatus->firstStatusBar->text.clear();
+ _nowStatus->firstStatusBar->text = txt;
}
}
-void positionStatus(int x, int y) {
- nowStatus->statusX = x;
- nowStatus->statusY = y;
+void StatusBarManager::positionStatus(int x, int y) {
+ _nowStatus->statusX = x;
+ _nowStatus->statusY = y;
}
-void drawStatusBar() {
- float cameraZoom = g_sludge->_gfxMan->getCamZoom();
- int y = nowStatus->statusY, n = 0;
- StatusBar *stat = nowStatus->firstStatusBar;
+void StatusBarManager::draw() {
+ float cameraZoom = _sludge->_gfxMan->getCamZoom();
+ int y = _nowStatus->statusY, n = 0;
+ StatusBar *stat = _nowStatus->firstStatusBar;
while (stat) {
- switch (nowStatus->alignStatus) {
+ switch (_nowStatus->alignStatus) {
case IN_THE_CENTRE:
- g_sludge->_txtMan->pasteString(stat->text,
- ((g_system->getWidth() - g_sludge->_txtMan->stringWidth(stat->text)) >> 1) / cameraZoom, y / cameraZoom,
- (n++ == nowStatus->litStatus) ? litVerbLinePalette : verbLinePalette);
+ _sludge->_txtMan->pasteString(stat->text,
+ ((g_system->getWidth() - _sludge->_txtMan->stringWidth(stat->text)) >> 1) / cameraZoom, y / cameraZoom,
+ (n++ == _nowStatus->litStatus) ? _litVerbLinePalette : _verbLinePalette);
break;
case 1001:
- g_sludge->_txtMan->pasteString(stat->text,
- (g_system->getWidth() - g_sludge->_txtMan->stringWidth(stat->text)) - nowStatus->statusX / cameraZoom, y / cameraZoom,
- (n ++ == nowStatus->litStatus) ? litVerbLinePalette : verbLinePalette);
+ _sludge->_txtMan->pasteString(stat->text,
+ (g_system->getWidth() - _sludge->_txtMan->stringWidth(stat->text)) - _nowStatus->statusX / cameraZoom, y / cameraZoom,
+ (n ++ == _nowStatus->litStatus) ? _litVerbLinePalette : _verbLinePalette);
break;
default:
- g_sludge->_txtMan->pasteString(stat->text,
- nowStatus->statusX / cameraZoom, y / cameraZoom,
- (n ++ == nowStatus->litStatus) ? litVerbLinePalette : verbLinePalette);
+ _sludge->_txtMan->pasteString(stat->text,
+ _nowStatus->statusX / cameraZoom, y / cameraZoom,
+ (n ++ == _nowStatus->litStatus) ? _litVerbLinePalette : _verbLinePalette);
}
stat = stat->next;
- y -= g_sludge->_txtMan->getFontHeight();
+ y -= _sludge->_txtMan->getFontHeight();
}
}
-void statusBarColour(byte r, byte g, byte b) {
- verbLinePalette.setColor(r, g, b);
- nowStatus->statusR = r;
- nowStatus->statusG = g;
- nowStatus->statusB = b;
+void StatusBarManager::statusBarColour(byte r, byte g, byte b) {
+ _verbLinePalette.setColor(r, g, b);
+ _nowStatus->statusR = r;
+ _nowStatus->statusG = g;
+ _nowStatus->statusB = b;
}
-void statusBarLitColour(byte r, byte g, byte b) {
- litVerbLinePalette.setColor(r, g, b);
- nowStatus->statusLR = r;
- nowStatus->statusLG = g;
- nowStatus->statusLB = b;
+void StatusBarManager::statusBarLitColour(byte r, byte g, byte b) {
+ _litVerbLinePalette.setColor(r, g, b);
+ _nowStatus->statusLR = r;
+ _nowStatus->statusLG = g;
+ _nowStatus->statusLB = b;
}
-StatusStuff *copyStatusBarStuff(StatusStuff *here) {
+StatusStuff *StatusBarManager::copyStatusBarStuff(StatusStuff *here) {
// Things we want to keep
- here->statusLR = nowStatus->statusLR;
- here->statusLG = nowStatus->statusLG;
- here->statusLB = nowStatus->statusLB;
- here->statusR = nowStatus->statusR;
- here->statusG = nowStatus->statusG;
- here->statusB = nowStatus->statusB;
- here->alignStatus = nowStatus->alignStatus;
- here->statusX = nowStatus->statusX;
- here->statusY = nowStatus->statusY;
+ here->statusLR = _nowStatus->statusLR;
+ here->statusLG = _nowStatus->statusLG;
+ here->statusLB = _nowStatus->statusLB;
+ here->statusR = _nowStatus->statusR;
+ here->statusG = _nowStatus->statusG;
+ here->statusB = _nowStatus->statusB;
+ here->alignStatus = _nowStatus->alignStatus;
+ here->statusX = _nowStatus->statusX;
+ here->statusY = _nowStatus->statusY;
// Things we want to clear
here->litStatus = -1;
here->firstStatusBar = NULL;
- StatusStuff *old = nowStatus;
- nowStatus = here;
+ StatusStuff *old = _nowStatus;
+ _nowStatus = here;
return old;
}
-void restoreBarStuff(StatusStuff *here) {
- delete nowStatus;
- verbLinePalette.setColor((byte)here->statusR, (byte)here->statusG, (byte)here->statusB);
- litVerbLinePalette.setColor((byte)here->statusLR, (byte)here->statusLG, (byte)here->statusLB);
- nowStatus = here;
+void StatusBarManager::restoreBarStuff(StatusStuff *here) {
+ delete _nowStatus;
+ _verbLinePalette.setColor((byte)here->statusR, (byte)here->statusG, (byte)here->statusB);
+ _litVerbLinePalette.setColor((byte)here->statusLR, (byte)here->statusLG, (byte)here->statusLB);
+ _nowStatus = here;
}
-void initStatusBar() {
- mainStatus.firstStatusBar = NULL;
- mainStatus.alignStatus = IN_THE_CENTRE;
- mainStatus.litStatus = -1;
- mainStatus.statusX = 10;
- mainStatus.statusY = g_system->getHeight() - 15;
- statusBarColour(255, 255, 255);
- statusBarLitColour(255, 255, 128);
-}
-
-const Common::String statusBarText() {
- if (nowStatus->firstStatusBar) {
- return nowStatus->firstStatusBar->text;
+const Common::String StatusBarManager::statusBarText() {
+ if (_nowStatus->firstStatusBar) {
+ return _nowStatus->firstStatusBar->text;
} else {
return "";
}
}
-void saveStatusBars(Common::WriteStream *stream) {
- StatusBar *viewLine = nowStatus->firstStatusBar;
+void StatusBarManager::saveStatusBars(Common::WriteStream *stream) {
+ StatusBar *viewLine = _nowStatus->firstStatusBar;
- stream->writeUint16BE(nowStatus->alignStatus);
- stream->writeSint16LE(nowStatus->litStatus);
- stream->writeUint16BE(nowStatus->statusX);
- stream->writeUint16BE(nowStatus->statusY);
+ stream->writeUint16BE(_nowStatus->alignStatus);
+ stream->writeSint16LE(_nowStatus->litStatus);
+ stream->writeUint16BE(_nowStatus->statusX);
+ stream->writeUint16BE(_nowStatus->statusY);
- stream->writeByte(nowStatus->statusR);
- stream->writeByte(nowStatus->statusG);
- stream->writeByte(nowStatus->statusB);
- stream->writeByte(nowStatus->statusLR);
- stream->writeByte(nowStatus->statusLG);
- stream->writeByte(nowStatus->statusLB);
+ stream->writeByte(_nowStatus->statusR);
+ stream->writeByte(_nowStatus->statusG);
+ stream->writeByte(_nowStatus->statusB);
+ stream->writeByte(_nowStatus->statusLR);
+ stream->writeByte(_nowStatus->statusLG);
+ stream->writeByte(_nowStatus->statusLB);
// Write what's being said
while (viewLine) {
@@ -200,29 +199,30 @@ void saveStatusBars(Common::WriteStream *stream) {
stream->writeByte(0);
}
-bool loadStatusBars(Common::SeekableReadStream *stream) {
- clearStatusBar();
+bool StatusBarManager::loadStatusBars(Common::SeekableReadStream *stream) {
+ clear();
- nowStatus->alignStatus = stream->readUint16BE();
- nowStatus->litStatus = stream->readSint16LE();
- nowStatus->statusX = stream->readUint16BE();
- nowStatus->statusY = stream->readUint16BE();
+ _nowStatus->alignStatus = stream->readUint16BE();
+ _nowStatus->litStatus = stream->readSint16LE();
+ _nowStatus->statusX = stream->readUint16BE();
+ _nowStatus->statusY = stream->readUint16BE();
- nowStatus->statusR = stream->readByte();
- nowStatus->statusG = stream->readByte();
- nowStatus->statusB = stream->readByte();
- nowStatus->statusLR = stream->readByte();
- nowStatus->statusLG = stream->readByte();
- nowStatus->statusLB = stream->readByte();
+ _nowStatus->statusR = stream->readByte();
+ _nowStatus->statusG = stream->readByte();
+ _nowStatus->statusB = stream->readByte();
+ _nowStatus->statusLR = stream->readByte();
+ _nowStatus->statusLG = stream->readByte();
+ _nowStatus->statusLB = stream->readByte();
- verbLinePalette.setColor((byte)nowStatus->statusR, (byte)nowStatus->statusG, (byte)nowStatus->statusB);
- litVerbLinePalette.setColor((byte)nowStatus->statusLR, (byte)nowStatus->statusLG, (byte)nowStatus->statusLB);
+ _verbLinePalette.setColor((byte)_nowStatus->statusR, (byte)_nowStatus->statusG, (byte)_nowStatus->statusB);
+ _litVerbLinePalette.setColor((byte)_nowStatus->statusLR, (byte)_nowStatus->statusLG, (byte)_nowStatus->statusLB);
// Read what's being said
- StatusBar **viewLine = & (nowStatus->firstStatusBar);
+ StatusBar **viewLine = &(_nowStatus->firstStatusBar);
StatusBar *newOne;
while (stream->readByte()) {
newOne = new StatusBar;
- if (! checkNew(newOne)) return false;
+ if (!checkNew(newOne))
+ return false;
newOne->text = readString(stream);
newOne->next = NULL;
(*viewLine) = newOne;
diff --git a/engines/sludge/statusba.h b/engines/sludge/statusba.h
index 2f98f366f0..9c18194ee7 100644
--- a/engines/sludge/statusba.h
+++ b/engines/sludge/statusba.h
@@ -40,26 +40,41 @@ struct StatusStuff {
int statusLR, statusLG, statusLB;
};
-void initStatusBar();
+class StatusBarManager {
+public:
+ StatusBarManager(SludgeEngine *sludge);
-void setStatusBar(Common::String &txt);
-void clearStatusBar();
-void addStatusBar();
-void killLastStatus();
-void statusBarColour(byte r, byte g, byte b);
-void statusBarLitColour(byte r, byte g, byte b);
-void setLitStatus(int i);
-const Common::String statusBarText();
-void positionStatus(int, int);
-void drawStatusBar();
+ void init();
+ void set(Common::String &txt);
+ void clear();
+ void addStatusBar();
+ void killLastStatus();
+ void statusBarColour(byte r, byte g, byte b);
+ void statusBarLitColour(byte r, byte g, byte b);
+ void setLitStatus(int i);
+ const Common::String statusBarText();
+ void positionStatus(int, int);
+ void draw();
-// Load and save
-bool loadStatusBars(Common::SeekableReadStream *stream);
-void saveStatusBars(Common::WriteStream *stream);
+ // Load and save
+ bool loadStatusBars(Common::SeekableReadStream *stream);
+ void saveStatusBars(Common::WriteStream *stream);
-// For freezing
-void restoreBarStuff(StatusStuff *here);
-StatusStuff *copyStatusBarStuff(StatusStuff *here);
+ // For freezing
+ void restoreBarStuff(StatusStuff *here);
+ StatusStuff *copyStatusBarStuff(StatusStuff *here);
+
+ void setAlignStatus(uint16 val) { _nowStatus->alignStatus = val; }
+
+private:
+ SpritePalette _verbLinePalette;
+ SpritePalette _litVerbLinePalette;
+
+ StatusStuff _mainStatus;
+ StatusStuff *_nowStatus;
+
+ SludgeEngine *_sludge;
+};
} // End of namespace Sludge
Commit: bbf03426e149746d49286ba0532427eb5d5c9b75
https://github.com/scummvm/scummvm/commit/bbf03426e149746d49286ba0532427eb5d5c9b75
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-07T01:29:52+02:00
Commit Message:
SLUDGE: JANITORIAL: Fix code formatting
Changed paths:
engines/sludge/builtin.cpp
engines/sludge/event.cpp
engines/sludge/fileset.cpp
engines/sludge/moreio.cpp
engines/sludge/people.cpp
engines/sludge/region.cpp
engines/sludge/savedata.cpp
engines/sludge/thumbnail.cpp
engines/sludge/transition.cpp
engines/sludge/variable.cpp
diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index 664a43828e..5c8411f2e9 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -70,19 +70,19 @@ bool failSecurityCheck(const Common::String &fn) {
for (uint i = 0; i < fn.size(); ++i) {
switch (fn[i]) {
- case ':':
- case '\\':
- case '/':
- case '*':
- case '?':
- case '"':
- case '<':
- case '>':
- case '|':
- fatal("Filenames may not contain the following characters: \n\n\\ / : \" < > | ? *\n\nConsequently, the following filename is not allowed:", fn);
- return true;
- default:
- break;
+ case ':':
+ case '\\':
+ case '/':
+ case '*':
+ case '?':
+ case '"':
+ case '<':
+ case '>':
+ case '|':
+ fatal("Filenames may not contain the following characters: \n\n\\ / : \" < > | ? *\n\nConsequently, the following filename is not allowed:", fn);
+ return true;
+ default:
+ break;
}
}
return false;
@@ -108,26 +108,26 @@ static BuiltReturn sayCore(int numParams, LoadedFunction *fun, bool sayIt) {
killSpeechTimers();
switch (numParams) {
- case 3:
- if (!fun->stack->thisVar.getValueType(fileNum, SVT_FILE))
- return BR_ERROR;
- trimStack(fun->stack);
- // fall through
+ case 3:
+ if (!fun->stack->thisVar.getValueType(fileNum, SVT_FILE))
+ return BR_ERROR;
+ trimStack(fun->stack);
+ // fall through
- case 2:
- newText = fun->stack->thisVar.getTextFromAnyVar();
- trimStack(fun->stack);
- if (!fun->stack->thisVar.getValueType(objT, SVT_OBJTYPE))
- return BR_ERROR;
- trimStack(fun->stack);
- p = g_sludge->_speechMan->wrapSpeech(newText, objT, fileNum, sayIt);
- fun->timeLeft = p;
- //debugOut ("BUILTIN: sayCore: %s (%i)\n", newText, p);
- fun->isSpeech = true;
- return BR_KEEP_AND_PAUSE;
+ case 2:
+ newText = fun->stack->thisVar.getTextFromAnyVar();
+ trimStack(fun->stack);
+ if (!fun->stack->thisVar.getValueType(objT, SVT_OBJTYPE))
+ return BR_ERROR;
+ trimStack(fun->stack);
+ p = g_sludge->_speechMan->wrapSpeech(newText, objT, fileNum, sayIt);
+ fun->timeLeft = p;
+ //debugOut ("BUILTIN: sayCore: %s (%i)\n", newText, p);
+ fun->isSpeech = true;
+ return BR_KEEP_AND_PAUSE;
- default:
- break;
+ default:
+ break;
}
fatal("Function should have either 2 or 3 parameters");
@@ -525,20 +525,20 @@ builtIn(newStack) {
builtIn(stackSize) {
UNUSEDALL
switch (fun->stack->thisVar.varType) {
- case SVT_STACK:
- // Return value
- fun->reg.setVariable(SVT_INT, fun->stack->thisVar.varData.theStack->getStackSize());
- trimStack(fun->stack);
- return BR_CONTINUE;
+ case SVT_STACK:
+ // Return value
+ fun->reg.setVariable(SVT_INT, fun->stack->thisVar.varData.theStack->getStackSize());
+ trimStack(fun->stack);
+ return BR_CONTINUE;
- case SVT_FASTARRAY:
- // Return value
- fun->reg.setVariable(SVT_INT, fun->stack->thisVar.varData.fastArray->size);
- trimStack(fun->stack);
- return BR_CONTINUE;
+ case SVT_FASTARRAY:
+ // Return value
+ fun->reg.setVariable(SVT_INT, fun->stack->thisVar.varData.fastArray->size);
+ trimStack(fun->stack);
+ return BR_CONTINUE;
- default:
- break;
+ default:
+ break;
}
fatal("Parameter isn't a stack or a fast array.");
return BR_ERROR;
@@ -880,7 +880,8 @@ builtIn(launch) {
Common::String newText = encodeFilename(newTextA);
trimStack(fun->stack);
- if (newTextA[0] == 'h' && newTextA[1] == 't' && newTextA[2] == 't' && newTextA[3] == 'p' && (newTextA[4] == ':' || (newTextA[4] == 's' && newTextA[5] == ':'))) {
+ if (newTextA[0] == 'h' && newTextA[1] == 't' && newTextA[2] == 't' && newTextA[3] == 'p' &&
+ (newTextA[4] == ':' || (newTextA[4] == 's' && newTextA[5] == ':'))) {
// IT'S A WEBSITE!
g_sludge->launchMe.clear();
@@ -1221,31 +1222,31 @@ builtIn(setZBuffer) {
builtIn(setLightMap) {
UNUSEDALL
switch (numParams) {
- case 2:
- if (!fun->stack->thisVar.getValueType(g_sludge->_gfxMan->_lightMapMode, SVT_INT))
+ case 2:
+ if (!fun->stack->thisVar.getValueType(g_sludge->_gfxMan->_lightMapMode, SVT_INT))
+ return BR_ERROR;
+ trimStack(fun->stack);
+ g_sludge->_gfxMan->_lightMapMode %= LIGHTMAPMODE_NUM;
+ // fall through
+
+ case 1:
+ if (fun->stack->thisVar.varType == SVT_FILE) {
+ int v;
+ fun->stack->thisVar.getValueType(v, SVT_FILE);
+ trimStack(fun->stack);
+ if (!g_sludge->_gfxMan->loadLightMap(v))
return BR_ERROR;
+ fun->reg.setVariable(SVT_INT, 1);
+ } else {
trimStack(fun->stack);
- g_sludge->_gfxMan->_lightMapMode %= LIGHTMAPMODE_NUM;
- // fall through
-
- case 1:
- if (fun->stack->thisVar.varType == SVT_FILE) {
- int v;
- fun->stack->thisVar.getValueType(v, SVT_FILE);
- trimStack(fun->stack);
- if (!g_sludge->_gfxMan->loadLightMap(v))
- return BR_ERROR;
- fun->reg.setVariable(SVT_INT, 1);
- } else {
- trimStack(fun->stack);
- g_sludge->_gfxMan->killLightMap();
- fun->reg.setVariable(SVT_INT, 0);
- }
- break;
+ g_sludge->_gfxMan->killLightMap();
+ fun->reg.setVariable(SVT_INT, 0);
+ }
+ break;
- default:
- fatal("Function should have either 2 or 3 parameters");
- return BR_ERROR;
+ default:
+ fatal("Function should have either 2 or 3 parameters");
+ return BR_ERROR;
}
return BR_CONTINUE;
}
@@ -1647,60 +1648,60 @@ builtIn(removeCharacter) {
static BuiltReturn moveChr(int numParams, LoadedFunction *fun, bool force, bool immediate) {
switch (numParams) {
- case 3: {
- int x, y, objectNumber;
+ case 3: {
+ int x, y, objectNumber;
- if (!fun->stack->thisVar.getValueType(y, SVT_INT))
- return BR_ERROR;
- trimStack(fun->stack);
- if (!fun->stack->thisVar.getValueType(x, SVT_INT))
- return BR_ERROR;
- trimStack(fun->stack);
- if (!fun->stack->thisVar.getValueType(objectNumber, SVT_OBJTYPE))
- return BR_ERROR;
- trimStack(fun->stack);
+ if (!fun->stack->thisVar.getValueType(y, SVT_INT))
+ return BR_ERROR;
+ trimStack(fun->stack);
+ if (!fun->stack->thisVar.getValueType(x, SVT_INT))
+ return BR_ERROR;
+ trimStack(fun->stack);
+ if (!fun->stack->thisVar.getValueType(objectNumber, SVT_OBJTYPE))
+ return BR_ERROR;
+ trimStack(fun->stack);
- if (force) {
- if (g_sludge->_peopleMan->forceWalkingPerson(x, y, objectNumber, fun, -1))
- return BR_PAUSE;
- } else if (immediate) {
- g_sludge->_peopleMan->jumpPerson(x, y, objectNumber);
- } else {
- if (g_sludge->_peopleMan->makeWalkingPerson(x, y, objectNumber, fun, -1))
- return BR_PAUSE;
- }
- return BR_CONTINUE;
+ if (force) {
+ if (g_sludge->_peopleMan->forceWalkingPerson(x, y, objectNumber, fun, -1))
+ return BR_PAUSE;
+ } else if (immediate) {
+ g_sludge->_peopleMan->jumpPerson(x, y, objectNumber);
+ } else {
+ if (g_sludge->_peopleMan->makeWalkingPerson(x, y, objectNumber, fun, -1))
+ return BR_PAUSE;
}
+ return BR_CONTINUE;
+ }
- case 2: {
- int toObj, objectNumber;
- ScreenRegion*reggie;
-
- if (!fun->stack->thisVar.getValueType(toObj, SVT_OBJTYPE))
- return BR_ERROR;
- trimStack(fun->stack);
- if (!fun->stack->thisVar.getValueType(objectNumber, SVT_OBJTYPE))
- return BR_ERROR;
- trimStack(fun->stack);
- reggie = g_sludge->_regionMan->getRegionForObject(toObj);
- if (reggie == NULL)
- return BR_CONTINUE;
+ case 2: {
+ int toObj, objectNumber;
+ ScreenRegion*reggie;
- if (force) {
- if (g_sludge->_peopleMan->forceWalkingPerson(reggie->sX, reggie->sY, objectNumber, fun, reggie->di))
- return BR_PAUSE;
- } else if (immediate) {
- g_sludge->_peopleMan->jumpPerson(reggie->sX, reggie->sY, objectNumber);
- } else {
- if (g_sludge->_peopleMan->makeWalkingPerson(reggie->sX, reggie->sY, objectNumber, fun, reggie->di))
- return BR_PAUSE;
- }
+ if (!fun->stack->thisVar.getValueType(toObj, SVT_OBJTYPE))
+ return BR_ERROR;
+ trimStack(fun->stack);
+ if (!fun->stack->thisVar.getValueType(objectNumber, SVT_OBJTYPE))
+ return BR_ERROR;
+ trimStack(fun->stack);
+ reggie = g_sludge->_regionMan->getRegionForObject(toObj);
+ if (reggie == NULL)
return BR_CONTINUE;
+
+ if (force) {
+ if (g_sludge->_peopleMan->forceWalkingPerson(reggie->sX, reggie->sY, objectNumber, fun, reggie->di))
+ return BR_PAUSE;
+ } else if (immediate) {
+ g_sludge->_peopleMan->jumpPerson(reggie->sX, reggie->sY, objectNumber);
+ } else {
+ if (g_sludge->_peopleMan->makeWalkingPerson(reggie->sX, reggie->sY, objectNumber, fun, reggie->di))
+ return BR_PAUSE;
}
+ return BR_CONTINUE;
+ }
- default:
- fatal("Built-in function must have either 2 or 3 parameters.");
- return BR_ERROR;
+ default:
+ fatal("Built-in function must have either 2 or 3 parameters.");
+ return BR_ERROR;
}
}
@@ -1780,19 +1781,19 @@ builtIn(alignStatus) {
static bool getFuncNumForCallback(int numParams, LoadedFunction *fun, int &functionNum) {
switch (numParams) {
- case 0:
- functionNum = 0;
- break;
-
- case 1:
- if (!fun->stack->thisVar.getValueType(functionNum, SVT_FUNC))
- return false;
- trimStack(fun->stack);
- break;
+ case 0:
+ functionNum = 0;
+ break;
- default:
- fatal("Too many parameters.");
+ case 1:
+ if (!fun->stack->thisVar.getValueType(functionNum, SVT_FUNC))
return false;
+ trimStack(fun->stack);
+ break;
+
+ default:
+ fatal("Too many parameters.");
+ return false;
}
return true;
}
@@ -2332,22 +2333,22 @@ builtIn(getPixelColour) {
builtIn(makeFastArray) {
UNUSEDALL
switch (fun->stack->thisVar.varType) {
- case SVT_STACK: {
- bool success = fun->reg.makeFastArrayFromStack(fun->stack->thisVar.varData.theStack);
- trimStack(fun->stack);
- return success ? BR_CONTINUE : BR_ERROR;
- }
- break;
+ case SVT_STACK: {
+ bool success = fun->reg.makeFastArrayFromStack(fun->stack->thisVar.varData.theStack);
+ trimStack(fun->stack);
+ return success ? BR_CONTINUE : BR_ERROR;
+ }
+ break;
- case SVT_INT: {
- int i = fun->stack->thisVar.varData.intValue;
- trimStack(fun->stack);
- return fun->reg.makeFastArraySize(i) ? BR_CONTINUE : BR_ERROR;
- }
- break;
+ case SVT_INT: {
+ int i = fun->stack->thisVar.varData.intValue;
+ trimStack(fun->stack);
+ return fun->reg.makeFastArraySize(i) ? BR_CONTINUE : BR_ERROR;
+ }
+ break;
- default:
- break;
+ default:
+ break;
}
fatal("Parameter must be a number or a stack.");
return BR_ERROR;
diff --git a/engines/sludge/event.cpp b/engines/sludge/event.cpp
index 098720b4c6..a167bd5ead 100644
--- a/engines/sludge/event.cpp
+++ b/engines/sludge/event.cpp
@@ -78,72 +78,71 @@ void EventManager::checkInput() {
while (g_system->getEventManager()->pollEvent(event)) {
switch (event.type) {
#if 0
- case SDL_VIDEORESIZE:
+ case SDL_VIDEORESIZE:
realWinWidth = event.resize.w;
realWinHeight = event.resize.h;
setGraphicsWindow(false, true, true);
break;
#endif
- case Common::EVENT_MOUSEMOVE:
- _input.justMoved = true;
- _input.mouseX = event.mouse.x * cameraZoom;
- _input.mouseY = event.mouse.y * cameraZoom;
- break;
+ case Common::EVENT_MOUSEMOVE:
+ _input.justMoved = true;
+ _input.mouseX = event.mouse.x * cameraZoom;
+ _input.mouseY = event.mouse.y * cameraZoom;
+ break;
- case Common::EVENT_LBUTTONDOWN:
- _input.leftClick = true;
- _input.mouseX = event.mouse.x * cameraZoom;
- _input.mouseY = event.mouse.y * cameraZoom;
+ case Common::EVENT_LBUTTONDOWN:
+ _input.leftClick = true;
+ _input.mouseX = event.mouse.x * cameraZoom;
+ _input.mouseY = event.mouse.y * cameraZoom;
#if 0
- if (SDL_GetModState() & KMOD_CTRL) {
- input.rightClick = true;
- fakeRightclick = true;
- } else {
- input.leftClick = true;
- fakeRightclick = false;
- }
+ if (SDL_GetModState() & KMOD_CTRL) {
+ input.rightClick = true;
+ fakeRightclick = true;
+ } else {
+ input.leftClick = true;
+ fakeRightclick = false;
+ }
#endif
- break;
-
- case Common::EVENT_RBUTTONDOWN:
- _input.rightClick = true;
- _input.mouseX = event.mouse.x * cameraZoom;
- _input.mouseY = event.mouse.y * cameraZoom;
- break;
+ break;
- case Common::EVENT_LBUTTONUP:
- _input.leftRelease = true;
- _input.mouseX = event.mouse.x * cameraZoom;
- _input.mouseY = event.mouse.y * cameraZoom;
- break;
+ case Common::EVENT_RBUTTONDOWN:
+ _input.rightClick = true;
+ _input.mouseX = event.mouse.x * cameraZoom;
+ _input.mouseY = event.mouse.y * cameraZoom;
+ break;
- case Common::EVENT_RBUTTONUP:
- _input.rightRelease = true;
- _input.mouseX = event.mouse.x * cameraZoom;
- _input.mouseY = event.mouse.y * cameraZoom;
- break;
+ case Common::EVENT_LBUTTONUP:
+ _input.leftRelease = true;
+ _input.mouseX = event.mouse.x * cameraZoom;
+ _input.mouseY = event.mouse.y * cameraZoom;
+ break;
- case Common::EVENT_KEYDOWN:
- switch (event.kbd.keycode) {
-
- case Common::KEYCODE_BACKSPACE:
- // fall through
- case Common::KEYCODE_DELETE:
- _input.keyPressed = Common::KEYCODE_DELETE;
- break;
- default:
- _input.keyPressed = event.kbd.keycode;
- break;
- }
- break;
+ case Common::EVENT_RBUTTONUP:
+ _input.rightRelease = true;
+ _input.mouseX = event.mouse.x * cameraZoom;
+ _input.mouseY = event.mouse.y * cameraZoom;
+ break;
- case Common::EVENT_QUIT:
- _weAreDoneSoQuit = 1;
- // TODO: if _reallyWantToQuit, popup a message box to confirm
+ case Common::EVENT_KEYDOWN:
+ switch (event.kbd.keycode) {
+ case Common::KEYCODE_BACKSPACE:
+ // fall through
+ case Common::KEYCODE_DELETE:
+ _input.keyPressed = Common::KEYCODE_DELETE;
break;
-
default:
+ _input.keyPressed = event.kbd.keycode;
break;
+ }
+ break;
+
+ case Common::EVENT_QUIT:
+ _weAreDoneSoQuit = 1;
+ // TODO: if _reallyWantToQuit, popup a message box to confirm
+ break;
+
+ default:
+ break;
}
}
}
@@ -210,110 +209,110 @@ bool EventManager::handleInput() {
if (_input.keyPressed && _currentEvents->func[kSpace]) {
Common::String tempString = "";
switch (_input.keyPressed) {
- case 127:
- tempString = "BACKSPACE";
- break;
- case 9:
- tempString = "TAB";
- break;
- case 13:
- tempString = "ENTER";
- break;
- case 27:
- tempString = "ESCAPE";
- break;
- /*
- case 1112: tempString = copyString ("ALT+F1"); break;
- case 1113: tempString = copyString ("ALT+F2"); break;
- case 1114: tempString = copyString ("ALT+F3"); break;
- case 1115: tempString = copyString ("ALT+F4"); break;
- case 1116: tempString = copyString ("ALT+F5"); break;
- case 1117: tempString = copyString ("ALT+F6"); break;
- case 1118: tempString = copyString ("ALT+F7"); break;
- case 1119: tempString = copyString ("ALT+F8"); break;
- case 1120: tempString = copyString ("ALT+F9"); break;
- case 1121: tempString = copyString ("ALT+F10"); break;
- case 1122: tempString = copyString ("ALT+F11"); break;
- case 1123: tempString = copyString ("ALT+F12"); break;
-
- case 2019: tempString = copyString ("PAUSE"); break;
- */
- case 63276:
- tempString = "PAGE UP";
- break;
- case 63277:
- tempString = "PAGE DOWN";
- break;
- case 63275:
- tempString = "END";
- break;
- case 63273:
- tempString = "HOME";
- break;
- case 63234:
- tempString = "LEFT";
- break;
- case 63232:
- tempString = "UP";
- break;
- case 63235:
- tempString = "RIGHT";
- break;
- case 63233:
- tempString = "DOWN";
- break;
- /*
- case 2045: tempString = copyString ("INSERT"); break;
- case 2046: tempString = copyString ("DELETE"); break;
- */
- case 63236:
- tempString = "F1";
- break;
- case 63237:
- tempString = "F2";
- break;
- case 63238:
- tempString = "F3";
- break;
- case 63239:
- tempString = "F4";
- break;
- case 63240:
- tempString = "F5";
- break;
- case 63241:
- tempString = "F6";
- break;
- case 63242:
- tempString = "F7";
- break;
- case 63243:
- tempString = "F8";
- break;
- case 63244:
- tempString = "F9";
- break;
- case 63245:
- tempString = "F10";
- break;
- case 63246:
- tempString = "F11";
- break;
- case 63247:
- tempString = "F12";
- break;
+ case 127:
+ tempString = "BACKSPACE";
+ break;
+ case 9:
+ tempString = "TAB";
+ break;
+ case 13:
+ tempString = "ENTER";
+ break;
+ case 27:
+ tempString = "ESCAPE";
+ break;
+ /*
+ case 1112: tempString = copyString ("ALT+F1"); break;
+ case 1113: tempString = copyString ("ALT+F2"); break;
+ case 1114: tempString = copyString ("ALT+F3"); break;
+ case 1115: tempString = copyString ("ALT+F4"); break;
+ case 1116: tempString = copyString ("ALT+F5"); break;
+ case 1117: tempString = copyString ("ALT+F6"); break;
+ case 1118: tempString = copyString ("ALT+F7"); break;
+ case 1119: tempString = copyString ("ALT+F8"); break;
+ case 1120: tempString = copyString ("ALT+F9"); break;
+ case 1121: tempString = copyString ("ALT+F10"); break;
+ case 1122: tempString = copyString ("ALT+F11"); break;
+ case 1123: tempString = copyString ("ALT+F12"); break;
+
+ case 2019: tempString = copyString ("PAUSE"); break;
+ */
+ case 63276:
+ tempString = "PAGE UP";
+ break;
+ case 63277:
+ tempString = "PAGE DOWN";
+ break;
+ case 63275:
+ tempString = "END";
+ break;
+ case 63273:
+ tempString = "HOME";
+ break;
+ case 63234:
+ tempString = "LEFT";
+ break;
+ case 63232:
+ tempString = "UP";
+ break;
+ case 63235:
+ tempString = "RIGHT";
+ break;
+ case 63233:
+ tempString = "DOWN";
+ break;
+ /*
+ case 2045: tempString = copyString ("INSERT"); break;
+ case 2046: tempString = copyString ("DELETE"); break;
+ */
+ case 63236:
+ tempString = "F1";
+ break;
+ case 63237:
+ tempString = "F2";
+ break;
+ case 63238:
+ tempString = "F3";
+ break;
+ case 63239:
+ tempString = "F4";
+ break;
+ case 63240:
+ tempString = "F5";
+ break;
+ case 63241:
+ tempString = "F6";
+ break;
+ case 63242:
+ tempString = "F7";
+ break;
+ case 63243:
+ tempString = "F8";
+ break;
+ case 63244:
+ tempString = "F9";
+ break;
+ case 63245:
+ tempString = "F10";
+ break;
+ case 63246:
+ tempString = "F11";
+ break;
+ case 63247:
+ tempString = "F12";
+ break;
- default:
- if (_input.keyPressed >= 256) {
- char tmp[7] = "ABCDEF";
- sprintf(tmp, "%i", _input.keyPressed);
- tempString = tmp;
- //}
- } else {
- char tmp[2] = " ";
- tmp[0] = _input.keyPressed;
- tempString = tmp;
- }
+ default:
+ if (_input.keyPressed >= 256) {
+ char tmp[7] = "ABCDEF";
+ sprintf(tmp, "%i", _input.keyPressed);
+ tempString = tmp;
+ //}
+ } else {
+ char tmp[2] = " ";
+ tmp[0] = _input.keyPressed;
+ tempString = tmp;
+ }
}
if (!tempString.empty()) {
diff --git a/engines/sludge/fileset.cpp b/engines/sludge/fileset.cpp
index d73f3ad6e0..3b32f79a0d 100644
--- a/engines/sludge/fileset.cpp
+++ b/engines/sludge/fileset.cpp
@@ -95,30 +95,30 @@ uint ResourceManager::openFileFromNum(int num) {
}
uint32 ResourceManager::_cp1250ToUTF32[128] = {
- /* 0x80 */
- 0x20ac, 0xfffd, 0x201a, 0xfffd, 0x201e, 0x2026, 0x2020, 0x2021,
- 0xfffd, 0x2030, 0x0160, 0x2039, 0x015a, 0x0164, 0x017d, 0x0179,
- /* 0x90 */
- 0xfffd, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014,
- 0xfffd, 0x2122, 0x0161, 0x203a, 0x015b, 0x0165, 0x017e, 0x017a,
- /* 0xa0 */
- 0x00a0, 0x02c7, 0x02d8, 0x0141, 0x00a4, 0x0104, 0x00a6, 0x00a7,
- 0x00a8, 0x00a9, 0x015e, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x017b,
- /* 0xb0 */
- 0x00b0, 0x00b1, 0x02db, 0x0142, 0x00b4, 0x00b5, 0x00b6, 0x00b7,
- 0x00b8, 0x0105, 0x015f, 0x00bb, 0x013d, 0x02dd, 0x013e, 0x017c,
- /* 0xc0 */
- 0x0154, 0x00c1, 0x00c2, 0x0102, 0x00c4, 0x0139, 0x0106, 0x00c7,
- 0x010c, 0x00c9, 0x0118, 0x00cb, 0x011a, 0x00cd, 0x00ce, 0x010e,
- /* 0xd0 */
- 0x0110, 0x0143, 0x0147, 0x00d3, 0x00d4, 0x0150, 0x00d6, 0x00d7,
- 0x0158, 0x016e, 0x00da, 0x0170, 0x00dc, 0x00dd, 0x0162, 0x00df,
- /* 0xe0 */
- 0x0155, 0x00e1, 0x00e2, 0x0103, 0x00e4, 0x013a, 0x0107, 0x00e7,
- 0x010d, 0x00e9, 0x0119, 0x00eb, 0x011b, 0x00ed, 0x00ee, 0x010f,
- /* 0xf0 */
- 0x0111, 0x0144, 0x0148, 0x00f3, 0x00f4, 0x0151, 0x00f6, 0x00f7,
- 0x0159, 0x016f, 0x00fa, 0x0171, 0x00fc, 0x00fd, 0x0163, 0x02d9,
+ /* 0x80 */
+ 0x20ac, 0xfffd, 0x201a, 0xfffd, 0x201e, 0x2026, 0x2020, 0x2021,
+ 0xfffd, 0x2030, 0x0160, 0x2039, 0x015a, 0x0164, 0x017d, 0x0179,
+ /* 0x90 */
+ 0xfffd, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014,
+ 0xfffd, 0x2122, 0x0161, 0x203a, 0x015b, 0x0165, 0x017e, 0x017a,
+ /* 0xa0 */
+ 0x00a0, 0x02c7, 0x02d8, 0x0141, 0x00a4, 0x0104, 0x00a6, 0x00a7,
+ 0x00a8, 0x00a9, 0x015e, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x017b,
+ /* 0xb0 */
+ 0x00b0, 0x00b1, 0x02db, 0x0142, 0x00b4, 0x00b5, 0x00b6, 0x00b7,
+ 0x00b8, 0x0105, 0x015f, 0x00bb, 0x013d, 0x02dd, 0x013e, 0x017c,
+ /* 0xc0 */
+ 0x0154, 0x00c1, 0x00c2, 0x0102, 0x00c4, 0x0139, 0x0106, 0x00c7,
+ 0x010c, 0x00c9, 0x0118, 0x00cb, 0x011a, 0x00cd, 0x00ce, 0x010e,
+ /* 0xd0 */
+ 0x0110, 0x0143, 0x0147, 0x00d3, 0x00d4, 0x0150, 0x00d6, 0x00d7,
+ 0x0158, 0x016e, 0x00da, 0x0170, 0x00dc, 0x00dd, 0x0162, 0x00df,
+ /* 0xe0 */
+ 0x0155, 0x00e1, 0x00e2, 0x0103, 0x00e4, 0x013a, 0x0107, 0x00e7,
+ 0x010d, 0x00e9, 0x0119, 0x00eb, 0x011b, 0x00ed, 0x00ee, 0x010f,
+ /* 0xf0 */
+ 0x0111, 0x0144, 0x0148, 0x00f3, 0x00f4, 0x0151, 0x00f6, 0x00f7,
+ 0x0159, 0x016f, 0x00fa, 0x0171, 0x00fc, 0x00fd, 0x0163, 0x02d9,
};
// Converts a string from ISO8859-2 or CP1250 to UTF8.
diff --git a/engines/sludge/moreio.cpp b/engines/sludge/moreio.cpp
index ee9ab8e0f0..e20d16e3f4 100644
--- a/engines/sludge/moreio.cpp
+++ b/engines/sludge/moreio.cpp
@@ -56,50 +56,50 @@ Common::String encodeFilename(const Common::String &nameIn) {
if (allowAnyFilename) {
for (uint i = 0; i < nameIn.size(); ++i) {
switch (nameIn[i]) {
- case '<':
- newName += '_';
- newName += 'L';
- break;
- case '>':
- newName += '_';
- newName += 'G';
- break;
- case '|':
- newName += '_';
- newName += 'P';
- break;
- case '_':
- newName += '_';
- newName += 'U';
- break;
- case '\"':
- newName += '_';
- newName += 'S';
- break;
- case '\\':
- newName += '_';
- newName += 'B';
- break;
- case '/':
- newName += '_';
- newName += 'F';
- break;
- case ':':
- newName += '_';
- newName += 'C';
- break;
- case '*':
- newName += '_';
- newName += 'A';
- break;
- case '?':
- newName += '_';
- newName += 'Q';
- break;
+ case '<':
+ newName += '_';
+ newName += 'L';
+ break;
+ case '>':
+ newName += '_';
+ newName += 'G';
+ break;
+ case '|':
+ newName += '_';
+ newName += 'P';
+ break;
+ case '_':
+ newName += '_';
+ newName += 'U';
+ break;
+ case '\"':
+ newName += '_';
+ newName += 'S';
+ break;
+ case '\\':
+ newName += '_';
+ newName += 'B';
+ break;
+ case '/':
+ newName += '_';
+ newName += 'F';
+ break;
+ case ':':
+ newName += '_';
+ newName += 'C';
+ break;
+ case '*':
+ newName += '_';
+ newName += 'A';
+ break;
+ case '?':
+ newName += '_';
+ newName += 'Q';
+ break;
- default:
- newName += nameIn[i];
- break;
+ default:
+ newName += nameIn[i];
+ break;
}
}
} else {
@@ -120,40 +120,40 @@ Common::String decodeFilename(const Common::String &nameIn) {
if (nameIn[i] == '_') {
++i;
switch (nameIn[i]) {
- case 'L':
- newName += '<';
- break;
- case 'G':
- newName += '>';
- break;
- case 'P':
- newName += '|';
- break;
- case 'U':
- newName += '_';
- break;
- case 'S':
- newName += '\"';
- break;
- case 'B':
- newName += '\\';
- break;
- case 'F':
- newName += '/';
- break;
- case 'C':
- newName += ':';
- break;
- case 'A':
- newName += '*';
- break;
- case 'Q':
- newName += '?';
- break;
- default:
- newName += '_';
- --i;
- break;
+ case 'L':
+ newName += '<';
+ break;
+ case 'G':
+ newName += '>';
+ break;
+ case 'P':
+ newName += '|';
+ break;
+ case 'U':
+ newName += '_';
+ break;
+ case 'S':
+ newName += '\"';
+ break;
+ case 'B':
+ newName += '\\';
+ break;
+ case 'F':
+ newName += '/';
+ break;
+ case 'C':
+ newName += ':';
+ break;
+ case 'A':
+ newName += '*';
+ break;
+ case 'Q':
+ newName += '?';
+ break;
+ default:
+ newName += '_';
+ --i;
+ break;
}
} else {
newName += nameIn[i];
diff --git a/engines/sludge/people.cpp b/engines/sludge/people.cpp
index c5f9c9dacc..eecf702378 100644
--- a/engines/sludge/people.cpp
+++ b/engines/sludge/people.cpp
@@ -341,108 +341,107 @@ enum drawModes {
void PeopleManager::setMyDrawMode(OnScreenPerson *moveMe, int h) {
switch (h) {
- case drawModeTransparent3:
- moveMe->r = moveMe->g = moveMe->b = 0;
- moveMe->colourmix = 0;
- moveMe->transparency = 64;
- break;
- case drawModeTransparent2:
- moveMe->r = moveMe->g = moveMe->b = 0;
- moveMe->colourmix = 0;
- moveMe->transparency = 128;
- break;
- case drawModeTransparent1:
- moveMe->r = moveMe->g = moveMe->b = 0;
- moveMe->colourmix = 0;
- moveMe->transparency = 192;
- break;
- case drawModeInvisible:
- moveMe->r = moveMe->g = moveMe->b = 0;
- moveMe->colourmix = 0;
- moveMe->transparency = 254;
- break;
- case drawModeDark1:
- moveMe->r = moveMe->g = moveMe->b = 0;
- moveMe->colourmix = 192;
- moveMe->transparency = 0;
- break;
- case drawModeDark2:
- moveMe->r = moveMe->g = moveMe->b = 0;
- moveMe->colourmix = 128;
- moveMe->transparency = 0;
- break;
- case drawModeDark3:
- moveMe->r = moveMe->g = moveMe->b = 0;
- moveMe->colourmix = 64;
- moveMe->transparency = 0;
- break;
- case drawModeBlack:
- moveMe->r = moveMe->g = moveMe->b = 0;
- moveMe->colourmix = 255;
- moveMe->transparency = 0;
- break;
- case drawModeShadow1:
- moveMe->r = moveMe->g = moveMe->b = 0;
- moveMe->colourmix = 255;
- moveMe->transparency = 64;
- break;
- case drawModeShadow2:
- moveMe->r = moveMe->g = moveMe->b = 0;
- moveMe->colourmix = 255;
- moveMe->transparency = 128;
- break;
- case drawModeShadow3:
- moveMe->r = moveMe->g = moveMe->b = 0;
- moveMe->colourmix = 255;
- moveMe->transparency = 192;
- break;
- case drawModeFoggy3:
- moveMe->r = moveMe->g = moveMe->b = 128;
- moveMe->colourmix = 192;
- moveMe->transparency = 0;
- break;
- case drawModeFoggy2:
- moveMe->r = moveMe->g = moveMe->b = 128;
- moveMe->colourmix = 128;
- moveMe->transparency = 0;
- break;
- case drawModeFoggy1:
- moveMe->r = moveMe->g = moveMe->b = 128;
- moveMe->colourmix = 64;
- moveMe->transparency = 0;
- break;
- case drawModeFoggy4:
- moveMe->r = moveMe->g = moveMe->b = 128;
- moveMe->colourmix = 255;
- moveMe->transparency = 0;
- break;
- case drawModeGlow3:
- moveMe->r = moveMe->g = moveMe->b = 255;
- moveMe->colourmix = 192;
- moveMe->transparency = 0;
- break;
- case drawModeGlow2:
- moveMe->r = moveMe->g = moveMe->b = 255;
- moveMe->colourmix = 128;
- moveMe->transparency = 0;
- break;
- case drawModeGlow1:
- moveMe->r = moveMe->g = moveMe->b = 255;
- moveMe->colourmix = 64;
- moveMe->transparency = 0;
- break;
- case drawModeGlow4:
- moveMe->r = moveMe->g = moveMe->b = 255;
- moveMe->colourmix = 255;
- moveMe->transparency = 0;
- break;
- default:
- moveMe->r = moveMe->g = moveMe->b = 0;
- moveMe->colourmix = 0;
- moveMe->transparency = 0;
- break;
+ case drawModeTransparent3:
+ moveMe->r = moveMe->g = moveMe->b = 0;
+ moveMe->colourmix = 0;
+ moveMe->transparency = 64;
+ break;
+ case drawModeTransparent2:
+ moveMe->r = moveMe->g = moveMe->b = 0;
+ moveMe->colourmix = 0;
+ moveMe->transparency = 128;
+ break;
+ case drawModeTransparent1:
+ moveMe->r = moveMe->g = moveMe->b = 0;
+ moveMe->colourmix = 0;
+ moveMe->transparency = 192;
+ break;
+ case drawModeInvisible:
+ moveMe->r = moveMe->g = moveMe->b = 0;
+ moveMe->colourmix = 0;
+ moveMe->transparency = 254;
+ break;
+ case drawModeDark1:
+ moveMe->r = moveMe->g = moveMe->b = 0;
+ moveMe->colourmix = 192;
+ moveMe->transparency = 0;
+ break;
+ case drawModeDark2:
+ moveMe->r = moveMe->g = moveMe->b = 0;
+ moveMe->colourmix = 128;
+ moveMe->transparency = 0;
+ break;
+ case drawModeDark3:
+ moveMe->r = moveMe->g = moveMe->b = 0;
+ moveMe->colourmix = 64;
+ moveMe->transparency = 0;
+ break;
+ case drawModeBlack:
+ moveMe->r = moveMe->g = moveMe->b = 0;
+ moveMe->colourmix = 255;
+ moveMe->transparency = 0;
+ break;
+ case drawModeShadow1:
+ moveMe->r = moveMe->g = moveMe->b = 0;
+ moveMe->colourmix = 255;
+ moveMe->transparency = 64;
+ break;
+ case drawModeShadow2:
+ moveMe->r = moveMe->g = moveMe->b = 0;
+ moveMe->colourmix = 255;
+ moveMe->transparency = 128;
+ break;
+ case drawModeShadow3:
+ moveMe->r = moveMe->g = moveMe->b = 0;
+ moveMe->colourmix = 255;
+ moveMe->transparency = 192;
+ break;
+ case drawModeFoggy3:
+ moveMe->r = moveMe->g = moveMe->b = 128;
+ moveMe->colourmix = 192;
+ moveMe->transparency = 0;
+ break;
+ case drawModeFoggy2:
+ moveMe->r = moveMe->g = moveMe->b = 128;
+ moveMe->colourmix = 128;
+ moveMe->transparency = 0;
+ break;
+ case drawModeFoggy1:
+ moveMe->r = moveMe->g = moveMe->b = 128;
+ moveMe->colourmix = 64;
+ moveMe->transparency = 0;
+ break;
+ case drawModeFoggy4:
+ moveMe->r = moveMe->g = moveMe->b = 128;
+ moveMe->colourmix = 255;
+ moveMe->transparency = 0;
+ break;
+ case drawModeGlow3:
+ moveMe->r = moveMe->g = moveMe->b = 255;
+ moveMe->colourmix = 192;
+ moveMe->transparency = 0;
+ break;
+ case drawModeGlow2:
+ moveMe->r = moveMe->g = moveMe->b = 255;
+ moveMe->colourmix = 128;
+ moveMe->transparency = 0;
+ break;
+ case drawModeGlow1:
+ moveMe->r = moveMe->g = moveMe->b = 255;
+ moveMe->colourmix = 64;
+ moveMe->transparency = 0;
+ break;
+ case drawModeGlow4:
+ moveMe->r = moveMe->g = moveMe->b = 255;
+ moveMe->colourmix = 255;
+ moveMe->transparency = 0;
+ break;
+ default:
+ moveMe->r = moveMe->g = moveMe->b = 0;
+ moveMe->colourmix = 0;
+ moveMe->transparency = 0;
+ break;
}
-
}
void PeopleManager::setDrawMode(int h, int ob) {
diff --git a/engines/sludge/region.cpp b/engines/sludge/region.cpp
index 062b3551dc..bc8217c911 100644
--- a/engines/sludge/region.cpp
+++ b/engines/sludge/region.cpp
@@ -33,8 +33,7 @@
namespace Sludge {
-RegionManager::RegionManager(SludgeEngine *vm)
-{
+RegionManager::RegionManager(SludgeEngine *vm) {
_vm = vm;
_allScreenRegions = new ScreenRegionList;
_allScreenRegions->clear();
diff --git a/engines/sludge/savedata.cpp b/engines/sludge/savedata.cpp
index 59d91f3634..7f6d3f4ac0 100644
--- a/engines/sludge/savedata.cpp
+++ b/engines/sludge/savedata.cpp
@@ -131,24 +131,24 @@ bool CustomSaveHelper::fileToStack(const Common::String &filename, StackHandler
if (fp->eos())
break;
switch (i) {
- case 0: {
- Common::String g = readStringEncoded(fp);
- stringVar.makeTextVar(g);
- }
- break;
+ case 0: {
+ Common::String g = readStringEncoded(fp);
+ stringVar.makeTextVar(g);
+ }
+ break;
- case 1:
- stringVar.setVariable(SVT_INT, fp->readUint32LE());
- break;
+ case 1:
+ stringVar.setVariable(SVT_INT, fp->readUint32LE());
+ break;
- case 2:
- stringVar.setVariable(SVT_INT, fp->readByte());
- break;
+ case 2:
+ stringVar.setVariable(SVT_INT, fp->readByte());
+ break;
- default:
- fatal(LOAD_ERROR "Corrupt custom data file:", filename);
- delete fp;
- return false;
+ default:
+ fatal(LOAD_ERROR "Corrupt custom data file:", filename);
+ delete fp;
+ return false;
}
} else {
char *line = readTextPlain(fp);
@@ -196,26 +196,26 @@ bool CustomSaveHelper::stackToFile(const Common::String &filename, const Variabl
while (hereWeAre) {
if (_saveEncoding) {
switch (hereWeAre -> thisVar.varType) {
- case SVT_STRING:
- fp->writeByte(_encode1);
- writeStringEncoded(hereWeAre -> thisVar.varData.theString, fp);
- break;
-
- case SVT_INT:
- // Small enough to be stored as a char
- if (hereWeAre -> thisVar.varData.intValue >= 0 && hereWeAre -> thisVar.varData.intValue < 256) {
- fp->writeByte(2 ^ _encode1);
- fp->writeByte(hereWeAre -> thisVar.varData.intValue);
- } else {
- fp->writeByte(1 ^ _encode1);
- fp->writeUint32LE(hereWeAre -> thisVar.varData.intValue);
- }
- break;
-
- default:
- fatal("Can't create an encoded custom data file containing anything other than numbers and strings", filename);
- delete fp;
- return false;
+ case SVT_STRING:
+ fp->writeByte(_encode1);
+ writeStringEncoded(hereWeAre -> thisVar.varData.theString, fp);
+ break;
+
+ case SVT_INT:
+ // Small enough to be stored as a char
+ if (hereWeAre -> thisVar.varData.intValue >= 0 && hereWeAre -> thisVar.varData.intValue < 256) {
+ fp->writeByte(2 ^ _encode1);
+ fp->writeByte(hereWeAre -> thisVar.varData.intValue);
+ } else {
+ fp->writeByte(1 ^ _encode1);
+ fp->writeUint32LE(hereWeAre -> thisVar.varData.intValue);
+ }
+ break;
+
+ default:
+ fatal("Can't create an encoded custom data file containing anything other than numbers and strings", filename);
+ delete fp;
+ return false;
}
} else {
Common::String makeSureItsText = hereWeAre->thisVar.getTextFromAnyVar();
diff --git a/engines/sludge/thumbnail.cpp b/engines/sludge/thumbnail.cpp
index c6bce5af0c..6bb2542cd0 100644
--- a/engines/sludge/thumbnail.cpp
+++ b/engines/sludge/thumbnail.cpp
@@ -35,8 +35,7 @@
namespace Sludge {
-bool GraphicsManager::setThumbnailSize(int thumbWidth, int thumbHeight)
-{
+bool GraphicsManager::setThumbnailSize(int thumbWidth, int thumbHeight) {
if (checkSizeValide(thumbWidth, thumbHeight))
{
_thumbWidth = thumbWidth;
@@ -47,7 +46,6 @@ bool GraphicsManager::setThumbnailSize(int thumbWidth, int thumbHeight)
}
bool GraphicsManager::saveThumbnail(Common::WriteStream *stream) {
-
stream->writeUint32LE(_thumbWidth);
stream->writeUint32LE(_thumbHeight);
diff --git a/engines/sludge/transition.cpp b/engines/sludge/transition.cpp
index 0e6d28b315..08a65969f1 100644
--- a/engines/sludge/transition.cpp
+++ b/engines/sludge/transition.cpp
@@ -29,8 +29,7 @@ namespace Sludge {
extern float snapTexW, snapTexH;
-void GraphicsManager::setBrightnessLevel(int brightnessLevel)
-{
+void GraphicsManager::setBrightnessLevel(int brightnessLevel) {
if (brightnessLevel < 0)
_brightnessLevel = 0;
else if (brightnessLevel > 255)
@@ -382,29 +381,29 @@ void transitionBlinds() {
void GraphicsManager::fixBrightness() {
switch (_fadeMode) {
- case 0:
- transitionFader();
- break;
- case 1:
- resetRandW();
- // Fall through!
- case 2:
- transitionDisolve();
- break;
- case 3:
- transitionTV();
- break;
- case 4:
- transitionBlinds();
- break;
- case 5:
- transitionCrossFader();
- break;
- case 6:
- transitionSnapshotBox();
- break;
- default:
- break;
+ case 0:
+ transitionFader();
+ break;
+ case 1:
+ resetRandW();
+ // Fall through!
+ case 2:
+ transitionDisolve();
+ break;
+ case 3:
+ transitionTV();
+ break;
+ case 4:
+ transitionBlinds();
+ break;
+ case 5:
+ transitionCrossFader();
+ break;
+ case 6:
+ transitionSnapshotBox();
+ break;
+ default:
+ break;
}
}
diff --git a/engines/sludge/variable.cpp b/engines/sludge/variable.cpp
index e1335301dd..801acf6e9a 100644
--- a/engines/sludge/variable.cpp
+++ b/engines/sludge/variable.cpp
@@ -40,39 +40,39 @@ const char *typeName[] = { "undefined", "number", "user function", "string",
void Variable::unlinkVar() {
switch (varType) {
- case SVT_STRING:
- delete []varData.theString;
- varData.theString = NULL;
- break;
-
- case SVT_STACK:
- varData.theStack->timesUsed--;
- if (varData.theStack->timesUsed <= 0) {
- while (varData.theStack->first)
- trimStack(varData.theStack->first);
- delete varData.theStack;
- varData.theStack = NULL;
- }
- break;
-
- case SVT_FASTARRAY:
- varData.fastArray->timesUsed--;
- if (varData.theStack->timesUsed <= 0) {
- delete varData.fastArray->fastVariables;
- delete[] varData.fastArray;
- varData.fastArray = NULL;
- }
- break;
+ case SVT_STRING:
+ delete []varData.theString;
+ varData.theString = NULL;
+ break;
+
+ case SVT_STACK:
+ varData.theStack->timesUsed--;
+ if (varData.theStack->timesUsed <= 0) {
+ while (varData.theStack->first)
+ trimStack(varData.theStack->first);
+ delete varData.theStack;
+ varData.theStack = NULL;
+ }
+ break;
+
+ case SVT_FASTARRAY:
+ varData.fastArray->timesUsed--;
+ if (varData.theStack->timesUsed <= 0) {
+ delete varData.fastArray->fastVariables;
+ delete[] varData.fastArray;
+ varData.fastArray = NULL;
+ }
+ break;
- case SVT_ANIM:
- if (varData.animHandler) {
- delete varData.animHandler;
- varData.animHandler = nullptr;
- }
- break;
+ case SVT_ANIM:
+ if (varData.animHandler) {
+ delete varData.animHandler;
+ varData.animHandler = nullptr;
+ }
+ break;
- default:
- break;
+ default:
+ break;
}
}
@@ -109,26 +109,26 @@ Persona *Variable::getCostumeFromVar() {
Persona *p = NULL;
switch (varType) {
- case SVT_ANIM:
- p = new Persona;
- if (!checkNew(p))
- return NULL;
- p->numDirections = 1;
- p->animation = new PersonaAnimation *[3];
- if (!checkNew(p->animation))
- return NULL;
+ case SVT_ANIM:
+ p = new Persona;
+ if (!checkNew(p))
+ return NULL;
+ p->numDirections = 1;
+ p->animation = new PersonaAnimation *[3];
+ if (!checkNew(p->animation))
+ return NULL;
- for (int iii = 0; iii < 3; iii++)
- p->animation[iii] = new PersonaAnimation(varData.animHandler);
+ for (int iii = 0; iii < 3; iii++)
+ p->animation[iii] = new PersonaAnimation(varData.animHandler);
- break;
+ break;
- case SVT_COSTUME:
- return varData.costumeHandler;
- break;
+ case SVT_COSTUME:
+ return varData.costumeHandler;
+ break;
- default:
- fatal("Expecting an animation variable; found Variable of type", typeName[varType]);
+ default:
+ fatal("Expecting an animation variable; found Variable of type", typeName[varType]);
}
return p;
@@ -207,28 +207,28 @@ int Variable::compareVars(const Variable &other) const {
int re = 0;
if (other.varType == varType) {
switch (other.varType) {
- case SVT_NULL:
- re = 1;
- break;
+ case SVT_NULL:
+ re = 1;
+ break;
- case SVT_COSTUME:
- re = (other.varData.costumeHandler == varData.costumeHandler);
- break;
+ case SVT_COSTUME:
+ re = (other.varData.costumeHandler == varData.costumeHandler);
+ break;
- case SVT_ANIM:
- re = (other.varData.animHandler == varData.animHandler);
- break;
+ case SVT_ANIM:
+ re = (other.varData.animHandler == varData.animHandler);
+ break;
- case SVT_STRING:
- re = (strcmp(other.varData.theString, varData.theString) == 0);
- break;
+ case SVT_STRING:
+ re = (strcmp(other.varData.theString, varData.theString) == 0);
+ break;
- case SVT_STACK:
- re = (other.varData.theStack == varData.theStack);
- break;
+ case SVT_STACK:
+ re = (other.varData.theStack == varData.theStack);
+ break;
- default:
- re = (other.varData.intValue == varData.intValue);
+ default:
+ re = (other.varData.intValue == varData.intValue);
}
}
return re;
@@ -251,58 +251,58 @@ bool Variable::loadStringToVar(int value) {
Common::String Variable::getTextFromAnyVar() const {
switch (varType) {
- case SVT_STRING:
- return varData.theString;
-
- case SVT_FASTARRAY: {
- Common::String builder = "FAST:";
- Common::String builder2 = "";
- Common::String grabText = "";
-
- for (int i = 0; i < varData.fastArray->size; i++) {
- builder2 = builder + " ";
- grabText = varData.fastArray->fastVariables[i].getTextFromAnyVar();
- builder.clear();
- builder = builder2 + grabText;
- }
- return builder;
+ case SVT_STRING:
+ return varData.theString;
+
+ case SVT_FASTARRAY: {
+ Common::String builder = "FAST:";
+ Common::String builder2 = "";
+ Common::String grabText = "";
+
+ for (int i = 0; i < varData.fastArray->size; i++) {
+ builder2 = builder + " ";
+ grabText = varData.fastArray->fastVariables[i].getTextFromAnyVar();
+ builder.clear();
+ builder = builder2 + grabText;
}
+ return builder;
+ }
- case SVT_STACK: {
- Common::String builder = "ARRAY:";
- Common::String builder2 = "";
- Common::String grabText = "";
-
- VariableStack *stacky = varData.theStack->first;
-
- while (stacky) {
- builder2 = builder + " ";
- grabText = stacky->thisVar.getTextFromAnyVar();
- builder.clear();
- builder = builder2 + grabText;
- stacky = stacky->next;
- }
- return builder;
- }
+ case SVT_STACK: {
+ Common::String builder = "ARRAY:";
+ Common::String builder2 = "";
+ Common::String grabText = "";
- case SVT_INT: {
- Common::String buff = Common::String::format("%i", varData.intValue);
- return buff;
- }
+ VariableStack *stacky = varData.theStack->first;
- case SVT_FILE: {
- return g_sludge->_resMan->resourceNameFromNum(varData.intValue);
+ while (stacky) {
+ builder2 = builder + " ";
+ grabText = stacky->thisVar.getTextFromAnyVar();
+ builder.clear();
+ builder = builder2 + grabText;
+ stacky = stacky->next;
}
+ return builder;
+ }
- case SVT_OBJTYPE: {
- ObjectType *thisType = g_sludge->_objMan->findObjectType(varData.intValue);
- if (thisType)
- return thisType->screenName;
- break;
- }
+ case SVT_INT: {
+ Common::String buff = Common::String::format("%i", varData.intValue);
+ return buff;
+ }
- default:
- break;
+ case SVT_FILE: {
+ return g_sludge->_resMan->resourceNameFromNum(varData.intValue);
+ }
+
+ case SVT_OBJTYPE: {
+ ObjectType *thisType = g_sludge->_objMan->findObjectType(varData.intValue);
+ if (thisType)
+ return thisType->screenName;
+ break;
+ }
+
+ default:
+ break;
}
return typeName[varType];
@@ -310,23 +310,23 @@ Common::String Variable::getTextFromAnyVar() const {
bool Variable::getBoolean() const {
switch (varType) {
- case SVT_NULL:
- return false;
+ case SVT_NULL:
+ return false;
- case SVT_INT:
- return (bool)(varData.intValue != 0);
+ case SVT_INT:
+ return (bool)(varData.intValue != 0);
- case SVT_STACK:
- return (bool)(varData.theStack->first != NULL);
+ case SVT_STACK:
+ return (bool)(varData.theStack->first != NULL);
- case SVT_STRING:
- return (bool)(varData.theString[0] != 0);
+ case SVT_STRING:
+ return (bool)(varData.theString[0] != 0);
- case SVT_FASTARRAY:
- return (bool)(varData.fastArray->size != 0);
+ case SVT_FASTARRAY:
+ return (bool)(varData.fastArray->size != 0);
- default:
- break;
+ default:
+ break;
}
return true;
}
@@ -334,41 +334,41 @@ bool Variable::getBoolean() const {
bool Variable::copyMain(const Variable &from) {
varType = from.varType;
switch (varType) {
- case SVT_INT:
- case SVT_FUNC:
- case SVT_BUILT:
- case SVT_FILE:
- case SVT_OBJTYPE:
- varData.intValue = from.varData.intValue;
- return true;
-
- case SVT_FASTARRAY:
- varData.fastArray = from.varData.fastArray;
- varData.fastArray->timesUsed++;
- return true;
-
- case SVT_STRING:
- varData.theString = createCString(from.varData.theString);
- return varData.theString ? true : false;
-
- case SVT_STACK:
- varData.theStack = from.varData.theStack;
- varData.theStack->timesUsed++;
- return true;
-
- case SVT_COSTUME:
- varData.costumeHandler = from.varData.costumeHandler;
- return true;
-
- case SVT_ANIM:
- varData.animHandler = new PersonaAnimation(from.varData.animHandler);
- return true;
-
- case SVT_NULL:
- return true;
-
- default:
- break;
+ case SVT_INT:
+ case SVT_FUNC:
+ case SVT_BUILT:
+ case SVT_FILE:
+ case SVT_OBJTYPE:
+ varData.intValue = from.varData.intValue;
+ return true;
+
+ case SVT_FASTARRAY:
+ varData.fastArray = from.varData.fastArray;
+ varData.fastArray->timesUsed++;
+ return true;
+
+ case SVT_STRING:
+ varData.theString = createCString(from.varData.theString);
+ return varData.theString ? true : false;
+
+ case SVT_STACK:
+ varData.theStack = from.varData.theStack;
+ varData.theStack->timesUsed++;
+ return true;
+
+ case SVT_COSTUME:
+ varData.costumeHandler = from.varData.costumeHandler;
+ return true;
+
+ case SVT_ANIM:
+ varData.animHandler = new PersonaAnimation(from.varData.animHandler);
+ return true;
+
+ case SVT_NULL:
+ return true;
+
+ default:
+ break;
}
fatal("Unknown value type");
return false;
@@ -657,34 +657,34 @@ StackHandler *loadStackRef(Common::SeekableReadStream *stream) {
bool Variable::save(Common::WriteStream *stream) {
stream->writeByte(varType);
switch (varType) {
- case SVT_INT:
- case SVT_FUNC:
- case SVT_BUILT:
- case SVT_FILE:
- case SVT_OBJTYPE:
- stream->writeUint32LE(varData.intValue);
- return true;
-
- case SVT_STRING:
- writeString(varData.theString, stream);
- return true;
-
- case SVT_STACK:
- return saveStackRef(varData.theStack, stream);
-
- case SVT_COSTUME:
- varData.costumeHandler->save(stream);
- return false;
+ case SVT_INT:
+ case SVT_FUNC:
+ case SVT_BUILT:
+ case SVT_FILE:
+ case SVT_OBJTYPE:
+ stream->writeUint32LE(varData.intValue);
+ return true;
+
+ case SVT_STRING:
+ writeString(varData.theString, stream);
+ return true;
+
+ case SVT_STACK:
+ return saveStackRef(varData.theStack, stream);
+
+ case SVT_COSTUME:
+ varData.costumeHandler->save(stream);
+ return false;
- case SVT_ANIM:
- varData.animHandler->save(stream);
- return false;
+ case SVT_ANIM:
+ varData.animHandler->save(stream);
+ return false;
- case SVT_NULL:
- return false;
+ case SVT_NULL:
+ return false;
- default:
- fatal("Can't save variables of this type:", (varType < SVT_NUM_TYPES - 1) ? typeName[varType] : "bad ID");
+ default:
+ fatal("Can't save variables of this type:", (varType < SVT_NUM_TYPES - 1) ? typeName[varType] : "bad ID");
}
return true;
}
@@ -692,38 +692,38 @@ bool Variable::save(Common::WriteStream *stream) {
bool Variable::load(Common::SeekableReadStream *stream) {
varType = (VariableType)stream->readByte();
switch (varType) {
- case SVT_INT:
- case SVT_FUNC:
- case SVT_BUILT:
- case SVT_FILE:
- case SVT_OBJTYPE:
- varData.intValue = stream->readUint32LE();
- return true;
-
- case SVT_STRING:
- varData.theString = createCString(readString(stream));
- return true;
-
- case SVT_STACK:
- varData.theStack = loadStackRef(stream);
- return true;
-
- case SVT_COSTUME:
- varData.costumeHandler = new Persona;
- if (!checkNew(varData.costumeHandler))
- return false;
- varData.costumeHandler->load(stream);
- return true;
+ case SVT_INT:
+ case SVT_FUNC:
+ case SVT_BUILT:
+ case SVT_FILE:
+ case SVT_OBJTYPE:
+ varData.intValue = stream->readUint32LE();
+ return true;
+
+ case SVT_STRING:
+ varData.theString = createCString(readString(stream));
+ return true;
+
+ case SVT_STACK:
+ varData.theStack = loadStackRef(stream);
+ return true;
+
+ case SVT_COSTUME:
+ varData.costumeHandler = new Persona;
+ if (!checkNew(varData.costumeHandler))
+ return false;
+ varData.costumeHandler->load(stream);
+ return true;
- case SVT_ANIM:
- varData.animHandler = new PersonaAnimation;
- if (!checkNew(varData.animHandler))
- return false;
- varData.animHandler->load(stream);
- return true;
+ case SVT_ANIM:
+ varData.animHandler = new PersonaAnimation;
+ if (!checkNew(varData.animHandler))
+ return false;
+ varData.animHandler->load(stream);
+ return true;
- default:
- break;
+ default:
+ break;
}
return true;
}
Commit: e3da6f47b55735953c8c2fafabf6061199f15857
https://github.com/scummvm/scummvm/commit/e3da6f47b55735953c8c2fafabf6061199f15857
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-07T01:29:52+02:00
Commit Message:
SLUDGE: Remove unused files and redundant header
Changed paths:
R engines/sludge/allfiles.h
R engines/sludge/console.cpp
R engines/sludge/console.h
engines/sludge/backdrop.cpp
engines/sludge/bg_effects.cpp
engines/sludge/builtin.cpp
engines/sludge/builtin.h
engines/sludge/cursors.cpp
engines/sludge/event.cpp
engines/sludge/fileset.cpp
engines/sludge/floor.cpp
engines/sludge/floor.h
engines/sludge/fonttext.cpp
engines/sludge/fonttext.h
engines/sludge/freeze.cpp
engines/sludge/function.h
engines/sludge/graphics.cpp
engines/sludge/imgloader.cpp
engines/sludge/language.cpp
engines/sludge/language.h
engines/sludge/loadsave.cpp
engines/sludge/main_loop.cpp
engines/sludge/module.mk
engines/sludge/moreio.cpp
engines/sludge/newfatal.cpp
engines/sludge/objtypes.cpp
engines/sludge/people.cpp
engines/sludge/people.h
engines/sludge/region.cpp
engines/sludge/savedata.cpp
engines/sludge/sludge.cpp
engines/sludge/sludge.h
engines/sludge/sludger.cpp
engines/sludge/sludger.h
engines/sludge/sound.cpp
engines/sludge/speech.cpp
engines/sludge/sprbanks.cpp
engines/sludge/sprites.cpp
engines/sludge/statusba.cpp
engines/sludge/thumbnail.cpp
engines/sludge/timing.cpp
engines/sludge/transition.cpp
engines/sludge/variable.cpp
engines/sludge/variable.h
engines/sludge/zbuffer.cpp
diff --git a/engines/sludge/allfiles.h b/engines/sludge/allfiles.h
deleted file mode 100644
index 8d67f558ef..0000000000
--- a/engines/sludge/allfiles.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SLUDGE_ALLFILES_H
-#define SLUDGE_ALLFILES_H
-
-#include "common/system.h"
-
-//#define debuggy2 int
-#define IN_THE_CENTRE 65535
-
-#endif
diff --git a/engines/sludge/backdrop.cpp b/engines/sludge/backdrop.cpp
index ec69fb9549..e6974c0823 100644
--- a/engines/sludge/backdrop.cpp
+++ b/engines/sludge/backdrop.cpp
@@ -27,7 +27,6 @@
#include "graphics/transparent_surface.h"
#include "graphics/palette.h"
-#include "sludge/allfiles.h"
#include "sludge/backdrop.h"
#include "sludge/event.h"
#include "sludge/fileset.h"
diff --git a/engines/sludge/bg_effects.cpp b/engines/sludge/bg_effects.cpp
index 9f7c2bd6e6..b4d07a0ad2 100644
--- a/engines/sludge/bg_effects.cpp
+++ b/engines/sludge/bg_effects.cpp
@@ -23,7 +23,6 @@
#include "common/debug.h"
#include "common/file.h"
-#include "sludge/allfiles.h"
#include "sludge/backdrop.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index 5c8411f2e9..2f4d1c655c 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -23,8 +23,8 @@
#include "common/config-manager.h"
#include "common/savefile.h"
+#include "common/system.h"
-#include "sludge/allfiles.h"
#include "sludge/backdrop.h"
#include "sludge/bg_effects.h"
#include "sludge/builtin.h"
diff --git a/engines/sludge/builtin.h b/engines/sludge/builtin.h
index 3a091f11e1..afbbfcdb0d 100644
--- a/engines/sludge/builtin.h
+++ b/engines/sludge/builtin.h
@@ -23,7 +23,7 @@
#ifndef SLUDGE_BUILTIN_H
#define SLUDGE_BUILTIN_H
-#include "sludge/allfiles.h"
+#include "common/str.h"
namespace Sludge {
diff --git a/engines/sludge/console.cpp b/engines/sludge/console.cpp
deleted file mode 100644
index d47f04c15a..0000000000
--- a/engines/sludge/console.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "sludge/console.h"
-
-namespace Sludge {
-
-SludgeConsole::SludgeConsole(SludgeEngine *vm) :
- GUI::Debugger() {
- _vm = vm;
-}
-
-SludgeConsole::~SludgeConsole() {
-}
-
-} // End of namespace Sludge
diff --git a/engines/sludge/console.h b/engines/sludge/console.h
deleted file mode 100644
index 87f2b89f30..0000000000
--- a/engines/sludge/console.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef SLUDGE_CONSOLE_H
-#define SLUDGE_CONSOLE_H
-
-#include "gui/debugger.h"
-
-namespace Sludge {
-
-class SludgeEngine;
-
-// Example console class
-class SludgeConsole: public GUI::Debugger {
-public:
- SludgeConsole(SludgeEngine *vm);
- ~SludgeConsole(void) override;
-
-private:
- SludgeEngine *_vm;
-};
-
-} // End of namespace Sludge
-
-#endif /* SLUDGE_CONSOLE_H */
diff --git a/engines/sludge/cursors.cpp b/engines/sludge/cursors.cpp
index 0ec46e2f17..d0962f462e 100644
--- a/engines/sludge/cursors.cpp
+++ b/engines/sludge/cursors.cpp
@@ -20,7 +20,8 @@
*
*/
-#include "sludge/allfiles.h"
+#include "common/system.h"
+
#include "sludge/cursors.h"
#include "sludge/event.h"
#include "sludge/freeze.h"
diff --git a/engines/sludge/event.cpp b/engines/sludge/event.cpp
index a167bd5ead..731f5deb0d 100644
--- a/engines/sludge/event.cpp
+++ b/engines/sludge/event.cpp
@@ -22,6 +22,7 @@
#include "common/events.h"
#include "common/keyboard.h"
+#include "common/system.h"
#include "sludge/event.h"
#include "sludge/freeze.h"
diff --git a/engines/sludge/fileset.cpp b/engines/sludge/fileset.cpp
index 3b32f79a0d..cea07d6bcc 100644
--- a/engines/sludge/fileset.cpp
+++ b/engines/sludge/fileset.cpp
@@ -25,7 +25,6 @@
#include "common/ustr.h"
#include "common/config-manager.h"
-#include "sludge/allfiles.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/sludge.h"
diff --git a/engines/sludge/floor.cpp b/engines/sludge/floor.cpp
index a65fab67e8..bacfd847a8 100644
--- a/engines/sludge/floor.cpp
+++ b/engines/sludge/floor.cpp
@@ -22,7 +22,6 @@
#include "graphics/surface.h"
-#include "sludge/allfiles.h"
#include "sludge/fileset.h"
#include "sludge/floor.h"
#include "sludge/graphics.h"
diff --git a/engines/sludge/floor.h b/engines/sludge/floor.h
index 22c8b12f30..09eb462a09 100644
--- a/engines/sludge/floor.h
+++ b/engines/sludge/floor.h
@@ -24,6 +24,11 @@
#include "common/rect.h"
+namespace Common {
+class SeekableReadStream;
+class WriteStream;
+}
+
namespace Sludge {
class SludgeEngine;
diff --git a/engines/sludge/fonttext.cpp b/engines/sludge/fonttext.cpp
index 33ac2aa03d..99c6006f36 100644
--- a/engines/sludge/fonttext.cpp
+++ b/engines/sludge/fonttext.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "sludge/allfiles.h"
#include "sludge/fonttext.h"
#include "sludge/graphics.h"
#include "sludge/moreio.h"
diff --git a/engines/sludge/fonttext.h b/engines/sludge/fonttext.h
index 260dd3248c..748322846d 100644
--- a/engines/sludge/fonttext.h
+++ b/engines/sludge/fonttext.h
@@ -27,6 +27,11 @@
#include "sludge/sprites.h"
+namespace Common {
+class SeekableReadStream;
+class WriteStream;
+}
+
namespace Sludge {
struct SpriteBank;
diff --git a/engines/sludge/freeze.cpp b/engines/sludge/freeze.cpp
index ecd5d1a8fd..071604b872 100644
--- a/engines/sludge/freeze.cpp
+++ b/engines/sludge/freeze.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "sludge/allfiles.h"
#include "sludge/backdrop.h"
#include "sludge/cursors.h"
#include "sludge/event.h"
diff --git a/engines/sludge/function.h b/engines/sludge/function.h
index 005760a960..fd5dcc3ea3 100644
--- a/engines/sludge/function.h
+++ b/engines/sludge/function.h
@@ -22,7 +22,6 @@
#ifndef SLUDGE_FUNCTION_H
#define SLUDGE_FUNCTION_H
-#include "sludge/allfiles.h"
#include "sludge/csludge.h"
#include "sludge/variable.h"
diff --git a/engines/sludge/graphics.cpp b/engines/sludge/graphics.cpp
index 72301b3475..564ae8631e 100644
--- a/engines/sludge/graphics.cpp
+++ b/engines/sludge/graphics.cpp
@@ -20,6 +20,8 @@
*
*/
+#include "common/system.h"
+
#include "engines/util.h"
#include "sludge/backdrop.h"
diff --git a/engines/sludge/imgloader.cpp b/engines/sludge/imgloader.cpp
index 54ff041f6e..e28bc9cbca 100644
--- a/engines/sludge/imgloader.cpp
+++ b/engines/sludge/imgloader.cpp
@@ -26,7 +26,6 @@
#include "image/png.h"
#include "graphics/surface.h"
-#include "sludge/allfiles.h"
#include "sludge/hsi.h"
#include "sludge/imgloader.h"
#include "sludge/sludge.h"
diff --git a/engines/sludge/language.cpp b/engines/sludge/language.cpp
index f2cde99a9c..91df2d8d54 100644
--- a/engines/sludge/language.cpp
+++ b/engines/sludge/language.cpp
@@ -22,7 +22,6 @@
#include "common/debug.h"
-#include "sludge/allfiles.h"
#include "sludge/fileset.h"
#include "sludge/language.h"
#include "sludge/moreio.h"
diff --git a/engines/sludge/language.h b/engines/sludge/language.h
index 26b57ad76e..fe73d71eb8 100644
--- a/engines/sludge/language.h
+++ b/engines/sludge/language.h
@@ -24,8 +24,6 @@
#include "common/file.h"
-#include "sludge/allfiles.h"
-
namespace Sludge {
class LanguageManager {
diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp
index 5f30e727c2..d80b70e78b 100644
--- a/engines/sludge/loadsave.cpp
+++ b/engines/sludge/loadsave.cpp
@@ -20,9 +20,10 @@
*
*/
+#include "common/system.h"
+
#include "common/savefile.h"
-#include "sludge/allfiles.h"
#include "sludge/backdrop.h"
#include "sludge/bg_effects.h"
#include "sludge/cursors.h"
diff --git a/engines/sludge/main_loop.cpp b/engines/sludge/main_loop.cpp
index 8f6e1f9cfb..e295c628a5 100644
--- a/engines/sludge/main_loop.cpp
+++ b/engines/sludge/main_loop.cpp
@@ -24,7 +24,6 @@
#include "graphics/surface.h"
-#include "sludge/allfiles.h"
#include "sludge/backdrop.h"
#include "sludge/event.h"
#include "sludge/floor.h"
diff --git a/engines/sludge/module.mk b/engines/sludge/module.mk
index 1580a036bc..ccea36adbe 100644
--- a/engines/sludge/module.mk
+++ b/engines/sludge/module.mk
@@ -4,7 +4,6 @@ MODULE_OBJS := \
backdrop.o \
bg_effects.o \
builtin.o \
- console.o \
cursors.o \
event.o \
fileset.o \
diff --git a/engines/sludge/moreio.cpp b/engines/sludge/moreio.cpp
index e20d16e3f4..ba153c9f4e 100644
--- a/engines/sludge/moreio.cpp
+++ b/engines/sludge/moreio.cpp
@@ -23,7 +23,6 @@
#include "common/debug.h"
#include "common/file.h"
-#include "sludge/allfiles.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/sludge.h"
diff --git a/engines/sludge/newfatal.cpp b/engines/sludge/newfatal.cpp
index a5069ae306..2c23075985 100644
--- a/engines/sludge/newfatal.cpp
+++ b/engines/sludge/newfatal.cpp
@@ -22,7 +22,6 @@
#include "common/debug.h"
-#include "sludge/allfiles.h"
#include "sludge/errors.h"
#include "sludge/fileset.h"
#include "sludge/newfatal.h"
diff --git a/engines/sludge/objtypes.cpp b/engines/sludge/objtypes.cpp
index 12d4318884..dced40159e 100644
--- a/engines/sludge/objtypes.cpp
+++ b/engines/sludge/objtypes.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "sludge/allfiles.h"
#include "sludge/fileset.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
diff --git a/engines/sludge/people.cpp b/engines/sludge/people.cpp
index eecf702378..1e552016c5 100644
--- a/engines/sludge/people.cpp
+++ b/engines/sludge/people.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "sludge/allfiles.h"
#include "sludge/floor.h"
#include "sludge/function.h"
#include "sludge/graphics.h"
diff --git a/engines/sludge/people.h b/engines/sludge/people.h
index db22d19ad1..2f76f227d1 100644
--- a/engines/sludge/people.h
+++ b/engines/sludge/people.h
@@ -22,6 +22,7 @@
#ifndef SLUDGE_PEOPLE_H
#define SLUDGE_PEOPLE_H
+#include "common/list.h"
#include "sludge/variable.h"
namespace Sludge {
diff --git a/engines/sludge/region.cpp b/engines/sludge/region.cpp
index bc8217c911..49d5a97aa1 100644
--- a/engines/sludge/region.cpp
+++ b/engines/sludge/region.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "sludge/allfiles.h"
#include "sludge/backdrop.h"
#include "sludge/event.h"
#include "sludge/graphics.h"
diff --git a/engines/sludge/savedata.cpp b/engines/sludge/savedata.cpp
index 7f6d3f4ac0..fe73c2cce1 100644
--- a/engines/sludge/savedata.cpp
+++ b/engines/sludge/savedata.cpp
@@ -21,8 +21,8 @@
*/
#include "common/savefile.h"
+#include "common/system.h"
-#include "sludge/allfiles.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/savedata.h"
diff --git a/engines/sludge/sludge.cpp b/engines/sludge/sludge.cpp
index ca52bf1703..1c177e97ef 100644
--- a/engines/sludge/sludge.cpp
+++ b/engines/sludge/sludge.cpp
@@ -140,9 +140,6 @@ Common::Error SludgeEngine::run() {
// set global variable
g_sludge = this;
- // create console
- setDebugger(new SludgeConsole(this));
-
// debug log
main_loop(getGameFile());
diff --git a/engines/sludge/sludge.h b/engines/sludge/sludge.h
index 061e963c5a..852894903f 100644
--- a/engines/sludge/sludge.h
+++ b/engines/sludge/sludge.h
@@ -28,7 +28,6 @@
#include "graphics/pixelformat.h"
#include "gui/debugger.h"
-#include "sludge/console.h"
#include "sludge/fileset.h"
#include "sludge/language.h"
#include "sludge/objtypes.h"
@@ -50,10 +49,10 @@ class SpeechManager;
class TextManager;
class StatusBarManager;
-class SludgeConsole;
-
struct SludgeGameDescription;
+#define IN_THE_CENTRE 65535
+
// debug channels
enum {
kSludgeDebugFatal = 1 << 0,
diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp
index 0148522f13..29d7b3cb4e 100644
--- a/engines/sludge/sludger.cpp
+++ b/engines/sludge/sludger.cpp
@@ -23,7 +23,6 @@
#include "common/config-manager.h"
#include "common/debug.h"
-#include "sludge/allfiles.h"
#include "sludge/backdrop.h"
#include "sludge/builtin.h"
#include "sludge/cursors.h"
diff --git a/engines/sludge/sludger.h b/engines/sludge/sludger.h
index 8efdfa62f2..ca27c53cee 100644
--- a/engines/sludge/sludger.h
+++ b/engines/sludge/sludger.h
@@ -22,8 +22,6 @@
#ifndef SLUDGER_H
#define SLUDGER_H
-#include "sludge/allfiles.h"
-
namespace Sludge {
typedef struct _FILETIME {
diff --git a/engines/sludge/sound.cpp b/engines/sludge/sound.cpp
index 2231ce584b..afd78a2baa 100644
--- a/engines/sludge/sound.cpp
+++ b/engines/sludge/sound.cpp
@@ -30,7 +30,6 @@
#include "audio/decoders/vorbis.h"
#include "audio/mods/mod_xm_s3m.h"
-#include "sludge/allfiles.h"
#include "sludge/fileset.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
diff --git a/engines/sludge/speech.cpp b/engines/sludge/speech.cpp
index 9c02eda5a6..3ab7e76991 100644
--- a/engines/sludge/speech.cpp
+++ b/engines/sludge/speech.cpp
@@ -20,7 +20,8 @@
*
*/
-#include "sludge/allfiles.h"
+#include "common/system.h"
+
#include "sludge/backdrop.h"
#include "sludge/fonttext.h"
#include "sludge/freeze.h"
diff --git a/engines/sludge/sprbanks.cpp b/engines/sludge/sprbanks.cpp
index c566f650c0..276e9e1d85 100644
--- a/engines/sludge/sprbanks.cpp
+++ b/engines/sludge/sprbanks.cpp
@@ -22,7 +22,6 @@
#include "common/textconsole.h"
-#include "sludge/allfiles.h"
#include "sludge/graphics.h"
#include "sludge/newfatal.h"
#include "sludge/sludge.h"
diff --git a/engines/sludge/sprites.cpp b/engines/sludge/sprites.cpp
index 7c8529d388..a2f506ea65 100644
--- a/engines/sludge/sprites.cpp
+++ b/engines/sludge/sprites.cpp
@@ -24,7 +24,6 @@
#include "graphics/surface.h"
#include "graphics/transparent_surface.h"
-#include "sludge/allfiles.h"
#include "sludge/backdrop.h"
#include "sludge/event.h"
#include "sludge/fileset.h"
diff --git a/engines/sludge/statusba.cpp b/engines/sludge/statusba.cpp
index d7777f7fe9..38e91261e5 100644
--- a/engines/sludge/statusba.cpp
+++ b/engines/sludge/statusba.cpp
@@ -21,8 +21,8 @@
*/
#include "common/file.h"
+#include "common/system.h"
-#include "sludge/allfiles.h"
#include "sludge/backdrop.h"
#include "sludge/fonttext.h"
#include "sludge/graphics.h"
diff --git a/engines/sludge/thumbnail.cpp b/engines/sludge/thumbnail.cpp
index 6bb2542cd0..f3dbc0f9be 100644
--- a/engines/sludge/thumbnail.cpp
+++ b/engines/sludge/thumbnail.cpp
@@ -21,9 +21,10 @@
*/
#include "common/savefile.h"
+#include "common/system.h"
+
#include "image/png.h"
-#include "sludge/allfiles.h"
#include "sludge/backdrop.h"
#include "sludge/errors.h"
#include "sludge/graphics.h"
diff --git a/engines/sludge/timing.cpp b/engines/sludge/timing.cpp
index c291f57a6b..74849dc53a 100644
--- a/engines/sludge/timing.cpp
+++ b/engines/sludge/timing.cpp
@@ -20,7 +20,8 @@
*
*/
-#include "sludge/allfiles.h"
+#include "common/system.h"
+
#include "sludge/timing.h"
namespace Sludge {
diff --git a/engines/sludge/transition.cpp b/engines/sludge/transition.cpp
index 08a65969f1..376d52f2b5 100644
--- a/engines/sludge/transition.cpp
+++ b/engines/sludge/transition.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "sludge/allfiles.h"
#include "sludge/backdrop.h"
#include "sludge/graphics.h"
#include "sludge/newfatal.h"
diff --git a/engines/sludge/variable.cpp b/engines/sludge/variable.cpp
index 801acf6e9a..3f5e41a8f8 100644
--- a/engines/sludge/variable.cpp
+++ b/engines/sludge/variable.cpp
@@ -22,8 +22,8 @@
#include "common/debug.h"
#include "common/savefile.h"
+#include "common/system.h"
-#include "sludge/allfiles.h"
#include "sludge/fileset.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
diff --git a/engines/sludge/variable.h b/engines/sludge/variable.h
index 1ae2acacc7..7d8a27a0c6 100644
--- a/engines/sludge/variable.h
+++ b/engines/sludge/variable.h
@@ -22,6 +22,11 @@
#ifndef SLUDGE_VARIABLE_H
#define SLUDGE_VARIABLE_H
+namespace Common {
+class SeekableReadStream;
+class WriteStream;
+}
+
namespace Sludge {
struct Persona;
@@ -149,4 +154,3 @@ void clearStackLib();
} // End of namespace Sludge
#endif
-
diff --git a/engines/sludge/zbuffer.cpp b/engines/sludge/zbuffer.cpp
index 6fa66edd6f..ce971f50b6 100644
--- a/engines/sludge/zbuffer.cpp
+++ b/engines/sludge/zbuffer.cpp
@@ -24,7 +24,6 @@
#include "graphics/pixelformat.h"
#include "graphics/transparent_surface.h"
-#include "sludge/allfiles.h"
#include "sludge/fileset.h"
#include "sludge/graphics.h"
#include "sludge/moreio.h"
Commit: 5c15a99fb89a5fa5c1570025c41d9bbe5bcb20f8
https://github.com/scummvm/scummvm/commit/5c15a99fb89a5fa5c1570025c41d9bbe5bcb20f8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-07T01:29:53+02:00
Commit Message:
SLUDGE: Reduced header dependecy. No nested includes
Changed paths:
engines/sludge/backdrop.h
engines/sludge/bg_effects.cpp
engines/sludge/bg_effects.h
engines/sludge/builtin.cpp
engines/sludge/event.cpp
engines/sludge/event.h
engines/sludge/fileset.cpp
engines/sludge/floor.h
engines/sludge/fonttext.cpp
engines/sludge/function.cpp
engines/sludge/graphics.h
engines/sludge/hsi.h
engines/sludge/imgloader.cpp
engines/sludge/loadsave.cpp
engines/sludge/main_loop.cpp
engines/sludge/newfatal.h
engines/sludge/people.cpp
engines/sludge/people.h
engines/sludge/region.cpp
engines/sludge/region.h
engines/sludge/sludge.cpp
engines/sludge/sludge.h
engines/sludge/sludger.cpp
engines/sludge/sludger.h
engines/sludge/sound.cpp
engines/sludge/sound.h
engines/sludge/statusba.h
engines/sludge/zbuffer.h
diff --git a/engines/sludge/backdrop.h b/engines/sludge/backdrop.h
index d97f71e9f6..027707a42c 100644
--- a/engines/sludge/backdrop.h
+++ b/engines/sludge/backdrop.h
@@ -23,11 +23,12 @@
#ifndef SLUDGE_BACKDROP_H
#define SLUDGE_BACKDROP_H
-#include "common/stream.h"
-
#include "graphics/surface.h"
-#include "sludge/variable.h"
+namespace Common {
+class SeekableReadStream;
+class WriteStream;
+}
namespace Sludge {
diff --git a/engines/sludge/bg_effects.cpp b/engines/sludge/bg_effects.cpp
index b4d07a0ad2..4c9bc99825 100644
--- a/engines/sludge/bg_effects.cpp
+++ b/engines/sludge/bg_effects.cpp
@@ -26,6 +26,7 @@
#include "sludge/backdrop.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
+#include "sludge/variable.h"
namespace Sludge {
diff --git a/engines/sludge/bg_effects.h b/engines/sludge/bg_effects.h
index f1d312e8df..e62565d9d8 100644
--- a/engines/sludge/bg_effects.h
+++ b/engines/sludge/bg_effects.h
@@ -23,10 +23,10 @@
#ifndef SLUDGE_BG_EFFECTS_H
#define SLUDGE_BG_EFFECTS_H
-#include "common/file.h"
-
namespace Sludge {
+struct VariableStack;
+
bool blurScreen();
void blur_saveSettings(Common::WriteStream *stream);
void blur_loadSettings(Common::SeekableReadStream *stream);
diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index 2f4d1c655c..93b45cfa41 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -22,6 +22,7 @@
#define SYMBIAN_USE_SYSTEM_REMOVE
#include "common/config-manager.h"
+#include "common/random.h"
#include "common/savefile.h"
#include "common/system.h"
@@ -51,6 +52,7 @@
#include "sludge/sprites.h"
#include "sludge/statusba.h"
#include "sludge/sludge.h"
+#include "sludge/timing.h"
#include "sludge/zbuffer.h"
namespace Sludge {
@@ -2408,7 +2410,7 @@ builtIn(_rem_launchWith) {
builtIn(getFramesPerSecond) {
UNUSEDALL
- fun->reg.setVariable(SVT_INT, g_sludge->_timer.getLastFps());
+ fun->reg.setVariable(SVT_INT, g_sludge->_timer->getLastFps());
return BR_CONTINUE;
}
diff --git a/engines/sludge/event.cpp b/engines/sludge/event.cpp
index 731f5deb0d..3901bedea2 100644
--- a/engines/sludge/event.cpp
+++ b/engines/sludge/event.cpp
@@ -29,6 +29,7 @@
#include "sludge/function.h"
#include "sludge/graphics.h"
#include "sludge/newfatal.h"
+#include "sludge/objtypes.h"
#include "sludge/region.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
diff --git a/engines/sludge/event.h b/engines/sludge/event.h
index c07f7b87ad..77304f2cda 100644
--- a/engines/sludge/event.h
+++ b/engines/sludge/event.h
@@ -23,8 +23,6 @@
#ifndef SLUDGE_EVENT_H
#define SLUDGE_EVENT_H
-#include "common/stream.h"
-
namespace Sludge {
struct FrozenStuffStruct;
diff --git a/engines/sludge/fileset.cpp b/engines/sludge/fileset.cpp
index cea07d6bcc..21acf7d176 100644
--- a/engines/sludge/fileset.cpp
+++ b/engines/sludge/fileset.cpp
@@ -25,6 +25,7 @@
#include "common/ustr.h"
#include "common/config-manager.h"
+#include "sludge/fileset.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/sludge.h"
diff --git a/engines/sludge/floor.h b/engines/sludge/floor.h
index 09eb462a09..2cafba6379 100644
--- a/engines/sludge/floor.h
+++ b/engines/sludge/floor.h
@@ -22,9 +22,8 @@
#ifndef SLUDGE_FLOOR_H
#define SLUDGE_FLOOR_H
-#include "common/rect.h"
-
namespace Common {
+struct Point;
class SeekableReadStream;
class WriteStream;
}
diff --git a/engines/sludge/fonttext.cpp b/engines/sludge/fonttext.cpp
index 99c6006f36..018dfad7f2 100644
--- a/engines/sludge/fonttext.cpp
+++ b/engines/sludge/fonttext.cpp
@@ -20,6 +20,8 @@
*
*/
+#include "common/file.h"
+
#include "sludge/fonttext.h"
#include "sludge/graphics.h"
#include "sludge/moreio.h"
diff --git a/engines/sludge/function.cpp b/engines/sludge/function.cpp
index 862239f554..e47939b247 100644
--- a/engines/sludge/function.cpp
+++ b/engines/sludge/function.cpp
@@ -21,6 +21,8 @@
*/
#include "sludge/builtin.h"
+#include "sludge/errors.h"
+#include "sludge/fileset.h"
#include "sludge/function.h"
#include "sludge/loadsave.h"
#include "sludge/newfatal.h"
diff --git a/engines/sludge/graphics.h b/engines/sludge/graphics.h
index 0409a0efec..a65d487deb 100644
--- a/engines/sludge/graphics.h
+++ b/engines/sludge/graphics.h
@@ -23,13 +23,13 @@
#ifndef SLUDGE_GRAPHICS_H
#define SLUDGE_GRAPHICS_H
-#include "common/stream.h"
-
-#include "graphics/surface.h"
-#include "graphics/transparent_surface.h"
-
#include "sludge/sprbanks.h"
+namespace Common {
+class SeekableReadStream;
+class WriteStream;
+}
+
namespace Sludge {
class Parallax;
diff --git a/engines/sludge/hsi.h b/engines/sludge/hsi.h
index e220491a90..bf7826d8e2 100644
--- a/engines/sludge/hsi.h
+++ b/engines/sludge/hsi.h
@@ -24,8 +24,6 @@
#include "image/image_decoder.h"
-#include "graphics/surface.h"
-
namespace Sludge {
class HSIDecoder : public Image::ImageDecoder {
diff --git a/engines/sludge/imgloader.cpp b/engines/sludge/imgloader.cpp
index e28bc9cbca..00c2d0c6fa 100644
--- a/engines/sludge/imgloader.cpp
+++ b/engines/sludge/imgloader.cpp
@@ -26,6 +26,7 @@
#include "image/png.h"
#include "graphics/surface.h"
+#include "sludge/fileset.h"
#include "sludge/hsi.h"
#include "sludge/imgloader.h"
#include "sludge/sludge.h"
diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp
index d80b70e78b..94dc0d7814 100644
--- a/engines/sludge/loadsave.cpp
+++ b/engines/sludge/loadsave.cpp
@@ -27,6 +27,7 @@
#include "sludge/backdrop.h"
#include "sludge/bg_effects.h"
#include "sludge/cursors.h"
+#include "sludge/errors.h"
#include "sludge/event.h"
#include "sludge/floor.h"
#include "sludge/fonttext.h"
diff --git a/engines/sludge/main_loop.cpp b/engines/sludge/main_loop.cpp
index e295c628a5..dcc809f7b7 100644
--- a/engines/sludge/main_loop.cpp
+++ b/engines/sludge/main_loop.cpp
@@ -57,7 +57,7 @@ int main_loop(Common::String filename) {
startNewFunctionNum(0, 0, NULL, noStack);
g_sludge->_evtMan->startGame();
- g_sludge->_timer.init();
+ g_sludge->_timer->init();
while (!g_sludge->_evtMan->quit()) {
g_sludge->_evtMan->checkInput();
@@ -68,7 +68,7 @@ int main_loop(Common::String filename) {
}
sludgeDisplay();
g_sludge->_soundMan->handleSoundLists();
- g_sludge->_timer.waitFrame();
+ g_sludge->_timer->waitFrame();
}
killSludge();
diff --git a/engines/sludge/newfatal.h b/engines/sludge/newfatal.h
index a33a21ed5a..17bc7818e3 100644
--- a/engines/sludge/newfatal.h
+++ b/engines/sludge/newfatal.h
@@ -25,8 +25,6 @@
#include "common/str.h"
#include "common/singleton.h"
-#include "sludge/errors.h"
-
namespace Sludge {
class FatalMsgManager : public Common::Singleton<Sludge::FatalMsgManager>{
diff --git a/engines/sludge/people.cpp b/engines/sludge/people.cpp
index 1e552016c5..53844e8211 100644
--- a/engines/sludge/people.cpp
+++ b/engines/sludge/people.cpp
@@ -20,7 +20,10 @@
*
*/
+#include "common/system.h"
+
#include "sludge/floor.h"
+#include "sludge/freeze.h"
#include "sludge/function.h"
#include "sludge/graphics.h"
#include "sludge/loadsave.h"
diff --git a/engines/sludge/people.h b/engines/sludge/people.h
index 2f76f227d1..51fe20239c 100644
--- a/engines/sludge/people.h
+++ b/engines/sludge/people.h
@@ -23,7 +23,6 @@
#define SLUDGE_PEOPLE_H
#include "common/list.h"
-#include "sludge/variable.h"
namespace Sludge {
diff --git a/engines/sludge/region.cpp b/engines/sludge/region.cpp
index 49d5a97aa1..436c0b5785 100644
--- a/engines/sludge/region.cpp
+++ b/engines/sludge/region.cpp
@@ -22,6 +22,7 @@
#include "sludge/backdrop.h"
#include "sludge/event.h"
+#include "sludge/freeze.h"
#include "sludge/graphics.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
diff --git a/engines/sludge/region.h b/engines/sludge/region.h
index 5f307cc9d0..6de5ff98fd 100644
--- a/engines/sludge/region.h
+++ b/engines/sludge/region.h
@@ -22,11 +22,12 @@
#ifndef SLUDGE_REGION_H
#define SLUDGE_REGION_H
-#include "sludge/objtypes.h"
-#include "sludge/freeze.h"
+//#include "sludge/freeze.h"
namespace Sludge {
+struct ObjectType;
+
struct ScreenRegion {
int x1, y1, x2, y2, sX, sY, di;
ObjectType *thisType;
diff --git a/engines/sludge/sludge.cpp b/engines/sludge/sludge.cpp
index 1c177e97ef..533761233c 100644
--- a/engines/sludge/sludge.cpp
+++ b/engines/sludge/sludge.cpp
@@ -24,20 +24,25 @@
#include "common/debug.h"
#include "common/debug-channels.h"
#include "common/error.h"
+#include "common/random.h"
#include "sludge/cursors.h"
#include "sludge/event.h"
+#include "sludge/fileset.h"
#include "sludge/fonttext.h"
#include "sludge/floor.h"
#include "sludge/graphics.h"
+#include "sludge/language.h"
#include "sludge/main_loop.h"
#include "sludge/newfatal.h"
+#include "sludge/objtypes.h"
#include "sludge/people.h"
#include "sludge/region.h"
#include "sludge/sludge.h"
#include "sludge/sound.h"
#include "sludge/speech.h"
#include "sludge/statusba.h"
+#include "sludge/timing.h"
namespace Sludge {
@@ -75,6 +80,7 @@ SludgeEngine::SludgeEngine(OSystem *syst, const SludgeGameDescription *gameDesc)
gamePath = "";
// Init managers
+ _timer = new Timer();
_fatalMan = new FatalMsgManager();
_peopleMan = new PeopleManager(this);
_resMan = new ResourceManager();
@@ -134,6 +140,7 @@ SludgeEngine::~SludgeEngine() {
delete _fatalMan;
_fatalMan = nullptr;
delete _statusBar;
+ delete _timer;
}
Common::Error SludgeEngine::run() {
diff --git a/engines/sludge/sludge.h b/engines/sludge/sludge.h
index 852894903f..e379e26e06 100644
--- a/engines/sludge/sludge.h
+++ b/engines/sludge/sludge.h
@@ -23,31 +23,33 @@
#ifndef SLUDGE_SLUDGE_H
#define SLUDGE_SLUDGE_H
-#include "common/random.h"
#include "engines/engine.h"
-#include "graphics/pixelformat.h"
-#include "gui/debugger.h"
-#include "sludge/fileset.h"
-#include "sludge/language.h"
-#include "sludge/objtypes.h"
-#include "sludge/timing.h"
+namespace Common {
+class RandomSource;
+}
-namespace Sludge {
+namespace Graphics {
+struct PixelFormat;
+}
-extern SludgeEngine *g_sludge;
+namespace Sludge {
class CursorManager;
class EventManager;
class FatalMsgManager;
class FloorManager;
class GraphicsManager;
+class LanguageManager;
+class ObjectManager;
class PeopleManager;
+class ResourceManager;
class RegionManager;
class SoundManager;
class SpeechManager;
-class TextManager;
class StatusBarManager;
+class TextManager;
+class Timer;
struct SludgeGameDescription;
@@ -77,7 +79,7 @@ public:
Common::String gamePath;
// timer
- Timer _timer;
+ Timer *_timer;
// managers
ResourceManager *_resMan;
@@ -116,6 +118,8 @@ private:
Graphics::PixelFormat *_origFormat;
};
+extern SludgeEngine *g_sludge;
+
} // End of namespace Sludge
#endif
diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp
index 29d7b3cb4e..29556af2b5 100644
--- a/engines/sludge/sludger.cpp
+++ b/engines/sludge/sludger.cpp
@@ -26,6 +26,7 @@
#include "sludge/backdrop.h"
#include "sludge/builtin.h"
#include "sludge/cursors.h"
+#include "sludge/errors.h"
#include "sludge/event.h"
#include "sludge/fonttext.h"
#include "sludge/freeze.h"
@@ -48,6 +49,7 @@
#include "sludge/sprites.h"
#include "sludge/sprbanks.h"
#include "sludge/statusba.h"
+#include "sludge/timing.h"
#include "sludge/variable.h"
#include "sludge/version.h"
#include "sludge/zbuffer.h"
@@ -122,7 +124,7 @@ Common::File *openAndVerify(const Common::String &filename, char extra1, char ex
}
void initSludge() {
- g_sludge->_timer.reset();
+ g_sludge->_timer->reset();
g_sludge->_languageMan->init();
g_sludge->_gfxMan->init();
g_sludge->_resMan->init();
@@ -216,7 +218,7 @@ bool initSludge(const Common::String &filename) {
int specialSettings = fp->readByte();
debugC(2, kSludgeDebugDataLoad, "specialSettings : %i", specialSettings);
- g_sludge->_timer.setDesiredFPS(1000 / fp->readByte());
+ g_sludge->_timer->setDesiredFPS(1000 / fp->readByte());
readString(fp); // Unused - was used for registration purposes.
diff --git a/engines/sludge/sludger.h b/engines/sludge/sludger.h
index ca27c53cee..2f08d4969f 100644
--- a/engines/sludge/sludger.h
+++ b/engines/sludge/sludger.h
@@ -22,6 +22,8 @@
#ifndef SLUDGER_H
#define SLUDGER_H
+#include "common/file.h"
+
namespace Sludge {
typedef struct _FILETIME {
diff --git a/engines/sludge/sound.cpp b/engines/sludge/sound.cpp
index afd78a2baa..1605de8295 100644
--- a/engines/sludge/sound.cpp
+++ b/engines/sludge/sound.cpp
@@ -30,11 +30,13 @@
#include "audio/decoders/vorbis.h"
#include "audio/mods/mod_xm_s3m.h"
+#include "sludge/errors.h"
#include "sludge/fileset.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/sludge.h"
#include "sludge/sound.h"
+#include "sludge/variable.h"
namespace Sludge {
diff --git a/engines/sludge/sound.h b/engines/sludge/sound.h
index dd9a0179d9..49b13591e5 100644
--- a/engines/sludge/sound.h
+++ b/engines/sludge/sound.h
@@ -23,14 +23,21 @@
#ifndef SLUDGE_SOUND_H
#define SLUDGE_SOUND_H
-#include "common/file.h"
+#include "common/list.h"
#include "audio/mixer.h"
-#include "sludge/variable.h"
+namespace Common {
+class SeekableReadStream;
+class WriteStream;
+}
+
+//#include "sludge/variable.h"
namespace Sludge {
+struct StackHandler;
+
// Sound list stuff
struct SoundList{
int sound;
diff --git a/engines/sludge/statusba.h b/engines/sludge/statusba.h
index 9c18194ee7..9e7721e326 100644
--- a/engines/sludge/statusba.h
+++ b/engines/sludge/statusba.h
@@ -22,8 +22,6 @@
#ifndef SLUDGE_STATUSBA_H
#define SLUDGE_STATUSBA_H
-#include "common/str.h"
-
namespace Sludge {
struct StatusBar {
diff --git a/engines/sludge/zbuffer.h b/engines/sludge/zbuffer.h
index 22676a03f9..1fb0c8ef92 100644
--- a/engines/sludge/zbuffer.h
+++ b/engines/sludge/zbuffer.h
@@ -22,8 +22,6 @@
#ifndef SLUDGE_ZBUFFER_H
#define SLUDGE_ZBUFFER_H
-#include "graphics/surface.h"
-
namespace Sludge {
struct ZBufferData {
Commit: 28e4e4670759f964898aae451868d7187a81eec8
https://github.com/scummvm/scummvm/commit/28e4e4670759f964898aae451868d7187a81eec8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-07T01:29:53+02:00
Commit Message:
SLUDGE: Reduce header dependencies
Changed paths:
engines/sludge/backdrop.cpp
engines/sludge/bg_effects.cpp
engines/sludge/builtin.cpp
engines/sludge/cursors.cpp
engines/sludge/cursors.h
engines/sludge/detection.cpp
engines/sludge/event.cpp
engines/sludge/fileset.cpp
engines/sludge/floor.cpp
engines/sludge/fonttext.cpp
engines/sludge/freeze.cpp
engines/sludge/function.cpp
engines/sludge/graphics.cpp
engines/sludge/imgloader.cpp
engines/sludge/loadsave.cpp
engines/sludge/main_loop.cpp
engines/sludge/metaengine.cpp
engines/sludge/moreio.cpp
engines/sludge/movie.cpp
engines/sludge/newfatal.cpp
engines/sludge/objtypes.cpp
engines/sludge/people.cpp
engines/sludge/region.cpp
engines/sludge/savedata.cpp
engines/sludge/sludge.cpp
engines/sludge/sludger.cpp
engines/sludge/sound.cpp
engines/sludge/speech.cpp
engines/sludge/sprbanks.cpp
engines/sludge/sprites.cpp
engines/sludge/statusba.cpp
engines/sludge/thumbnail.cpp
engines/sludge/transition.cpp
engines/sludge/variable.cpp
engines/sludge/zbuffer.cpp
diff --git a/engines/sludge/backdrop.cpp b/engines/sludge/backdrop.cpp
index e6974c0823..be3a741211 100644
--- a/engines/sludge/backdrop.cpp
+++ b/engines/sludge/backdrop.cpp
@@ -20,27 +20,21 @@
*
*/
-#include "common/debug.h"
-#include "common/rect.h"
#include "image/png.h"
-#include "graphics/surface.h"
-#include "graphics/transparent_surface.h"
-#include "graphics/palette.h"
#include "sludge/backdrop.h"
#include "sludge/event.h"
#include "sludge/fileset.h"
#include "sludge/graphics.h"
#include "sludge/imgloader.h"
-#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/speech.h"
#include "sludge/statusba.h"
-#include "sludge/zbuffer.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
#include "sludge/variable.h"
#include "sludge/version.h"
+#include "sludge/zbuffer.h"
namespace Sludge {
diff --git a/engines/sludge/bg_effects.cpp b/engines/sludge/bg_effects.cpp
index 4c9bc99825..1c359ed3f5 100644
--- a/engines/sludge/bg_effects.cpp
+++ b/engines/sludge/bg_effects.cpp
@@ -23,8 +23,6 @@
#include "common/debug.h"
#include "common/file.h"
-#include "sludge/backdrop.h"
-#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/variable.h"
diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index 93b45cfa41..fbebfc1cf4 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -19,25 +19,20 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
-#define SYMBIAN_USE_SYSTEM_REMOVE
#include "common/config-manager.h"
#include "common/random.h"
#include "common/savefile.h"
#include "common/system.h"
-#include "sludge/backdrop.h"
#include "sludge/bg_effects.h"
#include "sludge/builtin.h"
#include "sludge/cursors.h"
#include "sludge/event.h"
#include "sludge/floor.h"
#include "sludge/fonttext.h"
-#include "sludge/freeze.h"
#include "sludge/function.h"
#include "sludge/graphics.h"
-#include "sludge/language.h"
-#include "sludge/loadsave.h"
#include "sludge/moreio.h"
#include "sludge/movie.h"
#include "sludge/newfatal.h"
@@ -48,12 +43,9 @@
#include "sludge/sludger.h"
#include "sludge/sound.h"
#include "sludge/speech.h"
-#include "sludge/sprbanks.h"
-#include "sludge/sprites.h"
#include "sludge/statusba.h"
#include "sludge/sludge.h"
#include "sludge/timing.h"
-#include "sludge/zbuffer.h"
namespace Sludge {
diff --git a/engines/sludge/cursors.cpp b/engines/sludge/cursors.cpp
index d0962f462e..d53a05764a 100644
--- a/engines/sludge/cursors.cpp
+++ b/engines/sludge/cursors.cpp
@@ -28,8 +28,6 @@
#include "sludge/graphics.h"
#include "sludge/newfatal.h"
#include "sludge/people.h"
-#include "sludge/sprites.h"
-#include "sludge/sprbanks.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
diff --git a/engines/sludge/cursors.h b/engines/sludge/cursors.h
index f3c71c2560..ba2a85f10f 100644
--- a/engines/sludge/cursors.h
+++ b/engines/sludge/cursors.h
@@ -23,6 +23,11 @@
#ifndef SLUDGE_CURSORS_H
#define SLUDGE_CURSORS_H
+namespace Common {
+class SeekableReadStream;
+class WriteStream;
+}
+
namespace Sludge {
class SludgeEngine;
diff --git a/engines/sludge/detection.cpp b/engines/sludge/detection.cpp
index db2832a605..de3b543895 100644
--- a/engines/sludge/detection.cpp
+++ b/engines/sludge/detection.cpp
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
-#include "common/debug.h"
-#include "common/stream.h"
#include "common/file.h"
#include "engines/advancedDetector.h"
diff --git a/engines/sludge/event.cpp b/engines/sludge/event.cpp
index 3901bedea2..0269c8abea 100644
--- a/engines/sludge/event.cpp
+++ b/engines/sludge/event.cpp
@@ -21,7 +21,6 @@
*/
#include "common/events.h"
-#include "common/keyboard.h"
#include "common/system.h"
#include "sludge/event.h"
@@ -33,7 +32,6 @@
#include "sludge/region.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
-#include "sludge/variable.h"
namespace Sludge {
diff --git a/engines/sludge/fileset.cpp b/engines/sludge/fileset.cpp
index 21acf7d176..936ce150fb 100644
--- a/engines/sludge/fileset.cpp
+++ b/engines/sludge/fileset.cpp
@@ -20,9 +20,7 @@
*
*/
-#include "common/file.h"
#include "common/debug.h"
-#include "common/ustr.h"
#include "common/config-manager.h"
#include "sludge/fileset.h"
diff --git a/engines/sludge/floor.cpp b/engines/sludge/floor.cpp
index bacfd847a8..2224c2d2c4 100644
--- a/engines/sludge/floor.cpp
+++ b/engines/sludge/floor.cpp
@@ -20,12 +20,9 @@
*
*/
-#include "graphics/surface.h"
-
#include "sludge/fileset.h"
#include "sludge/floor.h"
#include "sludge/graphics.h"
-#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/people.h"
#include "sludge/sludge.h"
diff --git a/engines/sludge/fonttext.cpp b/engines/sludge/fonttext.cpp
index 018dfad7f2..cbebb02411 100644
--- a/engines/sludge/fonttext.cpp
+++ b/engines/sludge/fonttext.cpp
@@ -26,7 +26,6 @@
#include "sludge/graphics.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
-#include "sludge/sprites.h"
#include "sludge/sludge.h"
#include "sludge/version.h"
diff --git a/engines/sludge/freeze.cpp b/engines/sludge/freeze.cpp
index 071604b872..c201db8936 100644
--- a/engines/sludge/freeze.cpp
+++ b/engines/sludge/freeze.cpp
@@ -23,18 +23,14 @@
#include "sludge/backdrop.h"
#include "sludge/cursors.h"
#include "sludge/event.h"
-#include "sludge/fonttext.h"
#include "sludge/freeze.h"
#include "sludge/graphics.h"
#include "sludge/newfatal.h"
-#include "sludge/objtypes.h"
#include "sludge/people.h"
#include "sludge/region.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
#include "sludge/speech.h"
-#include "sludge/sprites.h"
-#include "sludge/sprbanks.h"
#include "sludge/statusba.h"
#include "sludge/zbuffer.h"
diff --git a/engines/sludge/function.cpp b/engines/sludge/function.cpp
index e47939b247..8f5c93d1a8 100644
--- a/engines/sludge/function.cpp
+++ b/engines/sludge/function.cpp
@@ -24,7 +24,6 @@
#include "sludge/errors.h"
#include "sludge/fileset.h"
#include "sludge/function.h"
-#include "sludge/loadsave.h"
#include "sludge/newfatal.h"
#include "sludge/people.h"
#include "sludge/sludge.h"
diff --git a/engines/sludge/graphics.cpp b/engines/sludge/graphics.cpp
index 564ae8631e..3a453a0ab4 100644
--- a/engines/sludge/graphics.cpp
+++ b/engines/sludge/graphics.cpp
@@ -31,8 +31,6 @@
#include "sludge/newfatal.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
-#include "sludge/sprites.h"
-#include "sludge/sprbanks.h"
#include "sludge/zbuffer.h"
namespace Sludge {
diff --git a/engines/sludge/imgloader.cpp b/engines/sludge/imgloader.cpp
index 00c2d0c6fa..2e5a921d45 100644
--- a/engines/sludge/imgloader.cpp
+++ b/engines/sludge/imgloader.cpp
@@ -22,7 +22,7 @@
#include "common/config-manager.h"
#include "common/debug.h"
-#include "common/stream.h"
+
#include "image/png.h"
#include "graphics/surface.h"
diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp
index 94dc0d7814..eab6cea8c5 100644
--- a/engines/sludge/loadsave.cpp
+++ b/engines/sludge/loadsave.cpp
@@ -24,7 +24,6 @@
#include "common/savefile.h"
-#include "sludge/backdrop.h"
#include "sludge/bg_effects.h"
#include "sludge/cursors.h"
#include "sludge/errors.h"
@@ -35,21 +34,16 @@
#include "sludge/graphics.h"
#include "sludge/language.h"
#include "sludge/loadsave.h"
-#include "sludge/moreio.h"
#include "sludge/newfatal.h"
-#include "sludge/objtypes.h"
#include "sludge/people.h"
#include "sludge/region.h"
#include "sludge/savedata.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
#include "sludge/sound.h"
-#include "sludge/sprites.h"
#include "sludge/statusba.h"
#include "sludge/speech.h"
-#include "sludge/variable.h"
#include "sludge/version.h"
-#include "sludge/zbuffer.h"
namespace Sludge {
diff --git a/engines/sludge/main_loop.cpp b/engines/sludge/main_loop.cpp
index dcc809f7b7..96e384518a 100644
--- a/engines/sludge/main_loop.cpp
+++ b/engines/sludge/main_loop.cpp
@@ -20,26 +20,15 @@
*
*/
-#include "common/debug.h"
-
-#include "graphics/surface.h"
-
#include "sludge/backdrop.h"
#include "sludge/event.h"
-#include "sludge/floor.h"
#include "sludge/function.h"
#include "sludge/graphics.h"
-#include "sludge/language.h"
#include "sludge/loadsave.h"
-#include "sludge/newfatal.h"
-#include "sludge/objtypes.h"
#include "sludge/people.h"
-#include "sludge/region.h"
-#include "sludge/statusba.h"
#include "sludge/sound.h"
#include "sludge/sludge.h"
#include "sludge/sludger.h"
-#include "sludge/speech.h"
#include "sludge/timing.h"
namespace Sludge {
diff --git a/engines/sludge/metaengine.cpp b/engines/sludge/metaengine.cpp
index ef9b740fd1..53664b48a3 100644
--- a/engines/sludge/metaengine.cpp
+++ b/engines/sludge/metaengine.cpp
@@ -20,9 +20,6 @@
*
*/
-#include "common/debug.h"
-#include "common/stream.h"
-
#include "engines/advancedDetector.h"
#include "sludge/sludge.h"
diff --git a/engines/sludge/moreio.cpp b/engines/sludge/moreio.cpp
index ba153c9f4e..8a397510b2 100644
--- a/engines/sludge/moreio.cpp
+++ b/engines/sludge/moreio.cpp
@@ -20,12 +20,9 @@
*
*/
-#include "common/debug.h"
#include "common/file.h"
-#include "sludge/moreio.h"
#include "sludge/newfatal.h"
-#include "sludge/sludge.h"
namespace Sludge {
diff --git a/engines/sludge/movie.cpp b/engines/sludge/movie.cpp
index 315c0a08f3..e35d1a98b9 100644
--- a/engines/sludge/movie.cpp
+++ b/engines/sludge/movie.cpp
@@ -21,9 +21,7 @@
*/
#include "sludge/movie.h"
-#include "sludge/newfatal.h"
#include "sludge/sound.h"
-#include "sludge/timing.h"
namespace Sludge {
diff --git a/engines/sludge/newfatal.cpp b/engines/sludge/newfatal.cpp
index 2c23075985..6a72f42af8 100644
--- a/engines/sludge/newfatal.cpp
+++ b/engines/sludge/newfatal.cpp
@@ -27,7 +27,6 @@
#include "sludge/newfatal.h"
#include "sludge/sludge.h"
#include "sludge/sound.h"
-#include "sludge/version.h"
namespace Common {
DECLARE_SINGLETON(Sludge::FatalMsgManager);
diff --git a/engines/sludge/objtypes.cpp b/engines/sludge/objtypes.cpp
index dced40159e..c0631bd82a 100644
--- a/engines/sludge/objtypes.cpp
+++ b/engines/sludge/objtypes.cpp
@@ -25,7 +25,6 @@
#include "sludge/newfatal.h"
#include "sludge/objtypes.h"
#include "sludge/sludge.h"
-#include "sludge/variable.h"
#include "sludge/version.h"
namespace Sludge {
diff --git a/engines/sludge/people.cpp b/engines/sludge/people.cpp
index 53844e8211..cbda12370c 100644
--- a/engines/sludge/people.cpp
+++ b/engines/sludge/people.cpp
@@ -20,14 +20,10 @@
*
*/
-#include "common/system.h"
-
#include "sludge/floor.h"
#include "sludge/freeze.h"
#include "sludge/function.h"
#include "sludge/graphics.h"
-#include "sludge/loadsave.h"
-#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/objtypes.h"
#include "sludge/people.h"
@@ -36,11 +32,7 @@
#include "sludge/sludger.h"
#include "sludge/sound.h"
#include "sludge/speech.h"
-#include "sludge/sprbanks.h"
-#include "sludge/sprites.h"
-#include "sludge/variable.h"
#include "sludge/version.h"
-#include "sludge/zbuffer.h"
#define ANI_STAND 0
#define ANI_WALK 1
diff --git a/engines/sludge/region.cpp b/engines/sludge/region.cpp
index 436c0b5785..bb38814c82 100644
--- a/engines/sludge/region.cpp
+++ b/engines/sludge/region.cpp
@@ -24,7 +24,6 @@
#include "sludge/event.h"
#include "sludge/freeze.h"
#include "sludge/graphics.h"
-#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/objtypes.h"
#include "sludge/region.h"
diff --git a/engines/sludge/savedata.cpp b/engines/sludge/savedata.cpp
index fe73c2cce1..82f454215e 100644
--- a/engines/sludge/savedata.cpp
+++ b/engines/sludge/savedata.cpp
@@ -23,7 +23,6 @@
#include "common/savefile.h"
#include "common/system.h"
-#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/savedata.h"
#include "sludge/variable.h"
diff --git a/engines/sludge/sludge.cpp b/engines/sludge/sludge.cpp
index 533761233c..976510a2df 100644
--- a/engines/sludge/sludge.cpp
+++ b/engines/sludge/sludge.cpp
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
-#include "common/scummsys.h"
-#include "common/config-manager.h"
-#include "common/debug.h"
#include "common/debug-channels.h"
#include "common/error.h"
#include "common/random.h"
diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp
index 29556af2b5..d45e426c5b 100644
--- a/engines/sludge/sludger.cpp
+++ b/engines/sludge/sludger.cpp
@@ -21,15 +21,11 @@
*/
#include "common/config-manager.h"
-#include "common/debug.h"
-#include "sludge/backdrop.h"
-#include "sludge/builtin.h"
#include "sludge/cursors.h"
#include "sludge/errors.h"
#include "sludge/event.h"
#include "sludge/fonttext.h"
-#include "sludge/freeze.h"
#include "sludge/floor.h"
#include "sludge/fileset.h"
#include "sludge/function.h"
@@ -46,13 +42,9 @@
#include "sludge/sludger.h"
#include "sludge/sound.h"
#include "sludge/speech.h"
-#include "sludge/sprites.h"
-#include "sludge/sprbanks.h"
#include "sludge/statusba.h"
#include "sludge/timing.h"
-#include "sludge/variable.h"
#include "sludge/version.h"
-#include "sludge/zbuffer.h"
namespace Sludge {
diff --git a/engines/sludge/sound.cpp b/engines/sludge/sound.cpp
index 1605de8295..7654f7c3e0 100644
--- a/engines/sludge/sound.cpp
+++ b/engines/sludge/sound.cpp
@@ -20,11 +20,6 @@
*
*/
-#include "common/debug.h"
-#include "common/file.h"
-#include "common/list.h"
-#include "common/memstream.h"
-
#include "audio/audiostream.h"
#include "audio/decoders/wave.h"
#include "audio/decoders/vorbis.h"
@@ -32,7 +27,6 @@
#include "sludge/errors.h"
#include "sludge/fileset.h"
-#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/sludge.h"
#include "sludge/sound.h"
diff --git a/engines/sludge/speech.cpp b/engines/sludge/speech.cpp
index 3ab7e76991..9ce3f614f2 100644
--- a/engines/sludge/speech.cpp
+++ b/engines/sludge/speech.cpp
@@ -22,7 +22,6 @@
#include "common/system.h"
-#include "sludge/backdrop.h"
#include "sludge/fonttext.h"
#include "sludge/freeze.h"
#include "sludge/graphics.h"
@@ -35,8 +34,6 @@
#include "sludge/sludger.h"
#include "sludge/sound.h"
#include "sludge/speech.h"
-#include "sludge/sprbanks.h"
-#include "sludge/sprites.h"
namespace Sludge {
diff --git a/engines/sludge/sprbanks.cpp b/engines/sludge/sprbanks.cpp
index 276e9e1d85..1466480e59 100644
--- a/engines/sludge/sprbanks.cpp
+++ b/engines/sludge/sprbanks.cpp
@@ -20,13 +20,9 @@
*
*/
-#include "common/textconsole.h"
-
#include "sludge/graphics.h"
#include "sludge/newfatal.h"
#include "sludge/sludge.h"
-#include "sludge/sprites.h"
-#include "sludge/sprbanks.h"
namespace Sludge {
diff --git a/engines/sludge/sprites.cpp b/engines/sludge/sprites.cpp
index a2f506ea65..c2e158aaa1 100644
--- a/engines/sludge/sprites.cpp
+++ b/engines/sludge/sprites.cpp
@@ -20,21 +20,14 @@
*
*/
-#include "common/rect.h"
-#include "graphics/surface.h"
-#include "graphics/transparent_surface.h"
-
#include "sludge/backdrop.h"
#include "sludge/event.h"
#include "sludge/fileset.h"
#include "sludge/graphics.h"
#include "sludge/imgloader.h"
-#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/people.h"
#include "sludge/sludge.h"
-#include "sludge/sludger.h"
-#include "sludge/sprites.h"
#include "sludge/zbuffer.h"
namespace Sludge {
diff --git a/engines/sludge/statusba.cpp b/engines/sludge/statusba.cpp
index 38e91261e5..099738e0e8 100644
--- a/engines/sludge/statusba.cpp
+++ b/engines/sludge/statusba.cpp
@@ -23,13 +23,11 @@
#include "common/file.h"
#include "common/system.h"
-#include "sludge/backdrop.h"
#include "sludge/fonttext.h"
#include "sludge/graphics.h"
#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/sludge.h"
-#include "sludge/sprites.h"
#include "sludge/statusba.h"
namespace Sludge {
diff --git a/engines/sludge/thumbnail.cpp b/engines/sludge/thumbnail.cpp
index f3dbc0f9be..e82389270b 100644
--- a/engines/sludge/thumbnail.cpp
+++ b/engines/sludge/thumbnail.cpp
@@ -25,13 +25,10 @@
#include "image/png.h"
-#include "sludge/backdrop.h"
#include "sludge/errors.h"
#include "sludge/graphics.h"
#include "sludge/imgloader.h"
-#include "sludge/moreio.h"
#include "sludge/newfatal.h"
-#include "sludge/sludger.h"
#include "sludge/version.h"
namespace Sludge {
diff --git a/engines/sludge/transition.cpp b/engines/sludge/transition.cpp
index 376d52f2b5..eb5376b71b 100644
--- a/engines/sludge/transition.cpp
+++ b/engines/sludge/transition.cpp
@@ -20,9 +20,7 @@
*
*/
-#include "sludge/backdrop.h"
#include "sludge/graphics.h"
-#include "sludge/newfatal.h"
namespace Sludge {
diff --git a/engines/sludge/variable.cpp b/engines/sludge/variable.cpp
index 3f5e41a8f8..b133dc61a6 100644
--- a/engines/sludge/variable.cpp
+++ b/engines/sludge/variable.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "common/debug.h"
#include "common/savefile.h"
#include "common/system.h"
diff --git a/engines/sludge/zbuffer.cpp b/engines/sludge/zbuffer.cpp
index ce971f50b6..8d04bcccbd 100644
--- a/engines/sludge/zbuffer.cpp
+++ b/engines/sludge/zbuffer.cpp
@@ -20,16 +20,10 @@
*
*/
-#include "common/debug.h"
-#include "graphics/pixelformat.h"
-#include "graphics/transparent_surface.h"
-
#include "sludge/fileset.h"
#include "sludge/graphics.h"
-#include "sludge/moreio.h"
#include "sludge/newfatal.h"
#include "sludge/sludge.h"
-#include "sludge/sprites.h"
#include "sludge/zbuffer.h"
namespace Sludge {
More information about the Scummvm-git-logs
mailing list