From 94ddf526f43068925ca914f60934cf5ad53371cf Mon Sep 17 00:00:00 2001 From: yinsimei Date: Thu, 13 Jul 2017 18:08:30 +0200 Subject: SLUDGE: remove CommonCode directory to have a flat structure --- engines/sludge/CommonCode/functionlist.h | 206 ---------------------------- engines/sludge/CommonCode/specialsettings.h | 29 ---- engines/sludge/CommonCode/version.h | 38 ----- engines/sludge/builtin.cpp | 2 +- engines/sludge/fileset.cpp | 2 +- engines/sludge/functionlist.h | 206 ++++++++++++++++++++++++++++ engines/sludge/graphics.cpp | 1 - engines/sludge/language.cpp | 2 +- engines/sludge/loadsave.cpp | 2 +- engines/sludge/main_loop.cpp | 2 +- engines/sludge/movie.cpp | 2 +- engines/sludge/newfatal.cpp | 2 +- engines/sludge/objtypes.cpp | 2 +- engines/sludge/people.cpp | 2 +- engines/sludge/sludger.cpp | 4 +- engines/sludge/specialsettings.h | 29 ++++ engines/sludge/thumbnail.cpp | 2 +- engines/sludge/version.h | 38 +++++ 18 files changed, 285 insertions(+), 286 deletions(-) delete mode 100644 engines/sludge/CommonCode/functionlist.h delete mode 100644 engines/sludge/CommonCode/specialsettings.h delete mode 100644 engines/sludge/CommonCode/version.h create mode 100644 engines/sludge/functionlist.h create mode 100644 engines/sludge/specialsettings.h create mode 100644 engines/sludge/version.h diff --git a/engines/sludge/CommonCode/functionlist.h b/engines/sludge/CommonCode/functionlist.h deleted file mode 100644 index 025f80a844..0000000000 --- a/engines/sludge/CommonCode/functionlist.h +++ /dev/null @@ -1,206 +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. - * - */ -/* - This is the list of the built in functions - - true or false states if it's a used function - in the current version of the engine, - but that value currently isn't used anywhere - */ - -namespace Sludge { - -#define FUNC(special,name) {builtIn_ ## name}, -static builtInFunctionData builtInFunctionArray[] = { - FUNC(true, say) - FUNC(true, skipSpeech) - FUNC(true, statusText) - FUNC(true, pause) - FUNC(true, onLeftMouse) - FUNC(true, onRightMouse) - FUNC(true, setCursor) - FUNC(true, addOverlay) - FUNC(true, addCharacter) - FUNC(true, playSound) - FUNC(true, getMouseX) - FUNC(true, getMouseY) - FUNC(true, addScreenRegion) - FUNC(true, onMoveMouse) - FUNC(true, onFocusChange) - FUNC(true, getOverObject) - FUNC(true, blankScreen) - FUNC(true, moveCharacter) - FUNC(true, onKeyboard) - FUNC(true, getObjectX) - FUNC(true, getObjectY) - FUNC(true, random) - FUNC(true, spawnSub) - FUNC(true, blankArea) - FUNC(true, hideCharacter) - FUNC(true, showCharacter) - FUNC(true, callEvent) - FUNC(true, removeScreenRegion) - FUNC(true, animate) - FUNC(true, turnCharacter) - FUNC(true, removeAllCharacters) - FUNC(true, removeAllScreenRegions) - FUNC(true, setScale) - FUNC(true, newStack) - FUNC(true, pushToStack) - FUNC(true, popFromStack) - FUNC(true, clearStatus) - FUNC(true, addStatus) - FUNC(true, removeLastStatus) - FUNC(true, lightStatus) - FUNC(true, getStatusText) - FUNC(true, setStatusColour) - FUNC(true, deleteFromStack) - FUNC(true, freeze) - FUNC(true, unfreeze) - FUNC(true, pasteImage) - FUNC(true, copyStack) - FUNC(true, completeTimers) - FUNC(true, setCharacterDrawMode) - FUNC(true, anim) - FUNC(true, costume) - FUNC(true, pickOne) - FUNC(true, setCostume) - FUNC(true, wait) - FUNC(true, somethingSpeaking) - FUNC(true, substring) - FUNC(true, stringLength) - FUNC(true, darkBackground) - FUNC(true, saveGame) - FUNC(true, loadGame) - FUNC(true, quitGame) - FUNC(true, rename) - FUNC(true, stackSize) - FUNC(true, pasteString) - FUNC(true, startMusic) - FUNC(true, setDefaultMusicVolume) - FUNC(true, setMusicVolume) - FUNC(true, stopMusic) - FUNC(true, stopSound) - FUNC(true, setFont) - FUNC(true, alignStatus) - FUNC(true, showFloor) - FUNC(true, showBoxes) - FUNC(true, positionStatus) - FUNC(true, setFloor) - FUNC(true, forceCharacter) - FUNC(true, jumpCharacter) - FUNC(true, peekStart) - FUNC(true, peekEnd) - FUNC(true, enqueue) - FUNC(true, setZBuffer) - FUNC(true, getMatchingFiles) - FUNC(true, inFont) - FUNC(true, onLeftMouseUp) - FUNC(true, onRightMouseUp) - FUNC(true, loopSound) - FUNC(true, removeCharacter) - FUNC(true, stopCharacter) - FUNC(true, launch) - FUNC(true, howFrozen) - FUNC(true, setPasteColour) - FUNC(true, setLitStatusColour) - FUNC(true, fileExists) - FUNC(true, floatCharacter) - FUNC(true, cancelSub) - FUNC(true, setCharacterWalkSpeed) - FUNC(true, deleteAllFromStack) - FUNC(true, setCharacterExtra) - FUNC(true, mixOverlay) - FUNC(true, pasteCharacter) - FUNC(true, setSceneDimensions) - FUNC(true, aimCamera) - FUNC(true, getMouseScreenX) - FUNC(true, getMouseScreenY) - FUNC(true, setDefaultSoundVolume) - FUNC(true, setSoundVolume) - FUNC(true, setSoundLoopPoints) - FUNC(true, setSpeechMode) - FUNC(true, setLightMap) - FUNC(true, think) - FUNC(true, getCharacterDirection) - FUNC(true, isCharacter) - FUNC(true, isScreenRegion) - FUNC(true, isMoving) - FUNC(true, deleteFile) - FUNC(true, renameFile) - FUNC(true, hardScroll) - FUNC(true, stringWidth) - FUNC(true, setSpeechSpeed) - FUNC(true, normalCharacter) - FUNC(true, fetchEvent) - FUNC(true, transitionLevel) - FUNC(true, spinCharacter) - FUNC(true, setFontSpacing) - FUNC(true, burnString) - FUNC(true, captureAllKeys) - FUNC(true, cacheSound) - FUNC(true, setCharacterSpinSpeed) - FUNC(true, transitionMode) - FUNC(false, _rem_movieStart) - FUNC(false, _rem_movieAbort) - FUNC(false, _rem_moviePlaying) - FUNC(false, _rem_updateDisplay) - FUNC(true, getSoundCache) - FUNC(true, saveCustomData) - FUNC(true, loadCustomData) - FUNC(true, setCustomEncoding) - FUNC(true, freeSound) - FUNC(true, parallaxAdd) - FUNC(true, parallaxClear) - FUNC(true, setBlankColour) - FUNC(true, setBurnColour) - FUNC(true, getPixelColour) - FUNC(true, makeFastArray) - FUNC(true, getCharacterScale) - FUNC(true, getLanguageID) - FUNC(false, _rem_launchWith) - FUNC(true, getFramesPerSecond) - FUNC(true, showThumbnail) - FUNC(true, setThumbnailSize) - FUNC(true, hasFlag) - FUNC(true, snapshotGrab) - FUNC(true, snapshotClear) - FUNC(true, bodgeFilenames) - FUNC(false, _rem_registryGetString) - FUNC(true, quitWithFatalError) - FUNC(true, _rem_setCharacterAA) - FUNC(true, _rem_setMaximumAA) - FUNC(true, setBackgroundEffect) - FUNC(true, doBackgroundEffect) - FUNC(true, setCharacterAngleOffset) - FUNC(true, setCharacterTransparency) - FUNC(true, setCharacterColourise) - FUNC(true, zoomCamera) - FUNC(true, playMovie) - FUNC(true, stopMovie) - FUNC(true, pauseMovie) -}; -#undef FUNC - -int NUM_FUNCS = (sizeof (builtInFunctionArray) / sizeof (builtInFunctionArray[0])); - -} // End of namespace Sludge diff --git a/engines/sludge/CommonCode/specialsettings.h b/engines/sludge/CommonCode/specialsettings.h deleted file mode 100644 index 0aa4786c7a..0000000000 --- a/engines/sludge/CommonCode/specialsettings.h +++ /dev/null @@ -1,29 +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. - * - */ -#define SPECIAL_REGISTERED 1 -#define SPECIAL_FULLSCREEN 2 -#define SPECIAL_MOUSE_1 4 -#define SPECIAL_SILENT 8 -#define SPECIAL_MOUSE_2 16 -#define SPECIAL_INVISIBLE 32 -#define SPECIAL_HIDELOGO 64 -#define SPECIAL_HIDELOADING 128 diff --git a/engines/sludge/CommonCode/version.h b/engines/sludge/CommonCode/version.h deleted file mode 100644 index f984b0e56a..0000000000 --- a/engines/sludge/CommonCode/version.h +++ /dev/null @@ -1,38 +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. - * - */ -#define MAJOR_VERSION 2 -#define MINOR_VERSION 2 -#define RELEASE_VERSION 1 -#define BUILD_VERSION 208 -#define TEXT_VERSION "2.2.1" -#define WHOLE_VERSION (MAJOR_VERSION * 256 + MINOR_VERSION) // This version -#define MINIM_VERSION (1 * 256 + 2) // Earliest version of games the engine can run - -#define COPYRIGHT_TEXT "\251 Hungry Software and contributors 2000-2014" - -#define VERSION(a,b) (a * 256 + b) - -namespace Sludge { - -extern int gameVersion; - -} // End of namespace Sludge diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp index 6340ad0f44..e2ebb1f16d 100644 --- a/engines/sludge/builtin.cpp +++ b/engines/sludge/builtin.cpp @@ -2614,7 +2614,7 @@ builtIn(doBackgroundEffect) { } // End of namespace Sludge -#include "CommonCode/functionlist.h" +#include "functionlist.h" namespace Sludge { diff --git a/engines/sludge/fileset.cpp b/engines/sludge/fileset.cpp index a019f82f57..f0731fe893 100644 --- a/engines/sludge/fileset.cpp +++ b/engines/sludge/fileset.cpp @@ -27,7 +27,7 @@ #include "sludge/moreio.h" #include "sludge/newfatal.h" #include "sludge/sludge.h" -#include "sludge/CommonCode/version.h" +#include "sludge/version.h" namespace Sludge { diff --git a/engines/sludge/functionlist.h b/engines/sludge/functionlist.h new file mode 100644 index 0000000000..025f80a844 --- /dev/null +++ b/engines/sludge/functionlist.h @@ -0,0 +1,206 @@ +/* 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. + * + */ +/* + This is the list of the built in functions + + true or false states if it's a used function + in the current version of the engine, + but that value currently isn't used anywhere + */ + +namespace Sludge { + +#define FUNC(special,name) {builtIn_ ## name}, +static builtInFunctionData builtInFunctionArray[] = { + FUNC(true, say) + FUNC(true, skipSpeech) + FUNC(true, statusText) + FUNC(true, pause) + FUNC(true, onLeftMouse) + FUNC(true, onRightMouse) + FUNC(true, setCursor) + FUNC(true, addOverlay) + FUNC(true, addCharacter) + FUNC(true, playSound) + FUNC(true, getMouseX) + FUNC(true, getMouseY) + FUNC(true, addScreenRegion) + FUNC(true, onMoveMouse) + FUNC(true, onFocusChange) + FUNC(true, getOverObject) + FUNC(true, blankScreen) + FUNC(true, moveCharacter) + FUNC(true, onKeyboard) + FUNC(true, getObjectX) + FUNC(true, getObjectY) + FUNC(true, random) + FUNC(true, spawnSub) + FUNC(true, blankArea) + FUNC(true, hideCharacter) + FUNC(true, showCharacter) + FUNC(true, callEvent) + FUNC(true, removeScreenRegion) + FUNC(true, animate) + FUNC(true, turnCharacter) + FUNC(true, removeAllCharacters) + FUNC(true, removeAllScreenRegions) + FUNC(true, setScale) + FUNC(true, newStack) + FUNC(true, pushToStack) + FUNC(true, popFromStack) + FUNC(true, clearStatus) + FUNC(true, addStatus) + FUNC(true, removeLastStatus) + FUNC(true, lightStatus) + FUNC(true, getStatusText) + FUNC(true, setStatusColour) + FUNC(true, deleteFromStack) + FUNC(true, freeze) + FUNC(true, unfreeze) + FUNC(true, pasteImage) + FUNC(true, copyStack) + FUNC(true, completeTimers) + FUNC(true, setCharacterDrawMode) + FUNC(true, anim) + FUNC(true, costume) + FUNC(true, pickOne) + FUNC(true, setCostume) + FUNC(true, wait) + FUNC(true, somethingSpeaking) + FUNC(true, substring) + FUNC(true, stringLength) + FUNC(true, darkBackground) + FUNC(true, saveGame) + FUNC(true, loadGame) + FUNC(true, quitGame) + FUNC(true, rename) + FUNC(true, stackSize) + FUNC(true, pasteString) + FUNC(true, startMusic) + FUNC(true, setDefaultMusicVolume) + FUNC(true, setMusicVolume) + FUNC(true, stopMusic) + FUNC(true, stopSound) + FUNC(true, setFont) + FUNC(true, alignStatus) + FUNC(true, showFloor) + FUNC(true, showBoxes) + FUNC(true, positionStatus) + FUNC(true, setFloor) + FUNC(true, forceCharacter) + FUNC(true, jumpCharacter) + FUNC(true, peekStart) + FUNC(true, peekEnd) + FUNC(true, enqueue) + FUNC(true, setZBuffer) + FUNC(true, getMatchingFiles) + FUNC(true, inFont) + FUNC(true, onLeftMouseUp) + FUNC(true, onRightMouseUp) + FUNC(true, loopSound) + FUNC(true, removeCharacter) + FUNC(true, stopCharacter) + FUNC(true, launch) + FUNC(true, howFrozen) + FUNC(true, setPasteColour) + FUNC(true, setLitStatusColour) + FUNC(true, fileExists) + FUNC(true, floatCharacter) + FUNC(true, cancelSub) + FUNC(true, setCharacterWalkSpeed) + FUNC(true, deleteAllFromStack) + FUNC(true, setCharacterExtra) + FUNC(true, mixOverlay) + FUNC(true, pasteCharacter) + FUNC(true, setSceneDimensions) + FUNC(true, aimCamera) + FUNC(true, getMouseScreenX) + FUNC(true, getMouseScreenY) + FUNC(true, setDefaultSoundVolume) + FUNC(true, setSoundVolume) + FUNC(true, setSoundLoopPoints) + FUNC(true, setSpeechMode) + FUNC(true, setLightMap) + FUNC(true, think) + FUNC(true, getCharacterDirection) + FUNC(true, isCharacter) + FUNC(true, isScreenRegion) + FUNC(true, isMoving) + FUNC(true, deleteFile) + FUNC(true, renameFile) + FUNC(true, hardScroll) + FUNC(true, stringWidth) + FUNC(true, setSpeechSpeed) + FUNC(true, normalCharacter) + FUNC(true, fetchEvent) + FUNC(true, transitionLevel) + FUNC(true, spinCharacter) + FUNC(true, setFontSpacing) + FUNC(true, burnString) + FUNC(true, captureAllKeys) + FUNC(true, cacheSound) + FUNC(true, setCharacterSpinSpeed) + FUNC(true, transitionMode) + FUNC(false, _rem_movieStart) + FUNC(false, _rem_movieAbort) + FUNC(false, _rem_moviePlaying) + FUNC(false, _rem_updateDisplay) + FUNC(true, getSoundCache) + FUNC(true, saveCustomData) + FUNC(true, loadCustomData) + FUNC(true, setCustomEncoding) + FUNC(true, freeSound) + FUNC(true, parallaxAdd) + FUNC(true, parallaxClear) + FUNC(true, setBlankColour) + FUNC(true, setBurnColour) + FUNC(true, getPixelColour) + FUNC(true, makeFastArray) + FUNC(true, getCharacterScale) + FUNC(true, getLanguageID) + FUNC(false, _rem_launchWith) + FUNC(true, getFramesPerSecond) + FUNC(true, showThumbnail) + FUNC(true, setThumbnailSize) + FUNC(true, hasFlag) + FUNC(true, snapshotGrab) + FUNC(true, snapshotClear) + FUNC(true, bodgeFilenames) + FUNC(false, _rem_registryGetString) + FUNC(true, quitWithFatalError) + FUNC(true, _rem_setCharacterAA) + FUNC(true, _rem_setMaximumAA) + FUNC(true, setBackgroundEffect) + FUNC(true, doBackgroundEffect) + FUNC(true, setCharacterAngleOffset) + FUNC(true, setCharacterTransparency) + FUNC(true, setCharacterColourise) + FUNC(true, zoomCamera) + FUNC(true, playMovie) + FUNC(true, stopMovie) + FUNC(true, pauseMovie) +}; +#undef FUNC + +int NUM_FUNCS = (sizeof (builtInFunctionArray) / sizeof (builtInFunctionArray[0])); + +} // End of namespace Sludge diff --git a/engines/sludge/graphics.cpp b/engines/sludge/graphics.cpp index 3c7cdbf38c..4a6d9b89a3 100644 --- a/engines/sludge/graphics.cpp +++ b/engines/sludge/graphics.cpp @@ -28,7 +28,6 @@ #include "sludge/zbuffer.h" #include "sludge/backdrop.h" #include "sludge/movie.h" -#include "sludge/CommonCode/specialsettings.h" namespace Sludge { diff --git a/engines/sludge/language.cpp b/engines/sludge/language.cpp index 06f2a0842f..c1917ad61c 100644 --- a/engines/sludge/language.cpp +++ b/engines/sludge/language.cpp @@ -27,7 +27,7 @@ #include "sludge/moreio.h" #include "sludge/language.h" #include "sludge/sludge.h" -#include "sludge/CommonCode/version.h" +#include "sludge/version.h" namespace Sludge { diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp index 04455bfe32..eb2cc61c90 100644 --- a/engines/sludge/loadsave.cpp +++ b/engines/sludge/loadsave.cpp @@ -45,7 +45,7 @@ #include "sludge/bg_effects.h" #include "sludge/thumbnail.h" #include "sludge/utf8.h" -#include "sludge/CommonCode/version.h" +#include "sludge/version.h" namespace Sludge { diff --git a/engines/sludge/main_loop.cpp b/engines/sludge/main_loop.cpp index d888059481..3676a3bcdb 100644 --- a/engines/sludge/main_loop.cpp +++ b/engines/sludge/main_loop.cpp @@ -46,7 +46,7 @@ #include "sludge/graphics.h" #include "sludge/helpers.h" #include "sludge/sludge.h" -#include "sludge/CommonCode/specialsettings.h" +#include "sludge/specialsettings.h" namespace Sludge { diff --git a/engines/sludge/movie.cpp b/engines/sludge/movie.cpp index 06defc4620..c569fb4284 100644 --- a/engines/sludge/movie.cpp +++ b/engines/sludge/movie.cpp @@ -35,7 +35,7 @@ #include "AL/alure.h" #endif -#include "sludge/CommonCode/specialsettings.h" +#include "sludge/specialsettings.h" #include "sludge/newfatal.h" #include "sludge/timing.h" diff --git a/engines/sludge/newfatal.cpp b/engines/sludge/newfatal.cpp index 0f847bdda8..6501f82a64 100644 --- a/engines/sludge/newfatal.cpp +++ b/engines/sludge/newfatal.cpp @@ -27,7 +27,7 @@ #include "sludge/errors.h" #include "sludge/graphics.h" #include "sludge/sludge.h" -#include "sludge/CommonCode/version.h" +#include "sludge/version.h" namespace Sludge { diff --git a/engines/sludge/objtypes.cpp b/engines/sludge/objtypes.cpp index bb9d707ad5..e0fae1b19d 100644 --- a/engines/sludge/objtypes.cpp +++ b/engines/sludge/objtypes.cpp @@ -26,7 +26,7 @@ #include "sludge/newfatal.h" #include "sludge/moreio.h" #include "sludge/fileset.h" -#include "sludge/CommonCode/version.h" +#include "sludge/version.h" namespace Sludge { diff --git a/engines/sludge/people.cpp b/engines/sludge/people.cpp index 45e7263671..afc34cb792 100644 --- a/engines/sludge/people.cpp +++ b/engines/sludge/people.cpp @@ -35,7 +35,7 @@ #include "sludge/floor.h" #include "sludge/zbuffer.h" #include "sludge/sound.h" -#include "sludge/CommonCode/version.h" +#include "sludge/version.h" #define ANGLEFIX (180.0 / 3.14157) #define ANI_STAND 0 diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp index 620d50dbd6..6f502f3359 100644 --- a/engines/sludge/sludger.cpp +++ b/engines/sludge/sludger.cpp @@ -48,8 +48,8 @@ #include "sludge/graphics.h" #include "sludge/variable.h" #include "sludge/sludge.h" -#include "sludge/CommonCode/specialsettings.h" -#include "sludge/CommonCode/version.h" +#include "sludge/specialsettings.h" +#include "sludge/version.h" namespace Sludge { diff --git a/engines/sludge/specialsettings.h b/engines/sludge/specialsettings.h new file mode 100644 index 0000000000..0aa4786c7a --- /dev/null +++ b/engines/sludge/specialsettings.h @@ -0,0 +1,29 @@ +/* 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. + * + */ +#define SPECIAL_REGISTERED 1 +#define SPECIAL_FULLSCREEN 2 +#define SPECIAL_MOUSE_1 4 +#define SPECIAL_SILENT 8 +#define SPECIAL_MOUSE_2 16 +#define SPECIAL_INVISIBLE 32 +#define SPECIAL_HIDELOGO 64 +#define SPECIAL_HIDELOADING 128 diff --git a/engines/sludge/thumbnail.cpp b/engines/sludge/thumbnail.cpp index 8044ee645f..eb026b7b6b 100644 --- a/engines/sludge/thumbnail.cpp +++ b/engines/sludge/thumbnail.cpp @@ -27,7 +27,7 @@ #include "sludge/backdrop.h" #include "sludge/graphics.h" #include "sludge/newfatal.h" -#include "sludge/CommonCode/version.h" +#include "sludge/version.h" namespace Sludge { diff --git a/engines/sludge/version.h b/engines/sludge/version.h new file mode 100644 index 0000000000..f984b0e56a --- /dev/null +++ b/engines/sludge/version.h @@ -0,0 +1,38 @@ +/* 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. + * + */ +#define MAJOR_VERSION 2 +#define MINOR_VERSION 2 +#define RELEASE_VERSION 1 +#define BUILD_VERSION 208 +#define TEXT_VERSION "2.2.1" +#define WHOLE_VERSION (MAJOR_VERSION * 256 + MINOR_VERSION) // This version +#define MINIM_VERSION (1 * 256 + 2) // Earliest version of games the engine can run + +#define COPYRIGHT_TEXT "\251 Hungry Software and contributors 2000-2014" + +#define VERSION(a,b) (a * 256 + b) + +namespace Sludge { + +extern int gameVersion; + +} // End of namespace Sludge -- cgit v1.2.3