diff options
Diffstat (limited to 'engines/dreamweb')
28 files changed, 133 insertions, 88 deletions
diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp index 5ccc68704a..783c5e349a 100644 --- a/engines/dreamweb/backdrop.cpp +++ b/engines/dreamweb/backdrop.cpp @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/configure.engine b/engines/dreamweb/configure.engine new file mode 100644 index 0000000000..27506e650f --- /dev/null +++ b/engines/dreamweb/configure.engine @@ -0,0 +1,3 @@ +# This file is included from the main "configure" script +# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] +add_engine dreamweb "Dreamweb" yes diff --git a/engines/dreamweb/console.cpp b/engines/dreamweb/console.cpp index 532bf815ef..62c02b8617 100644 --- a/engines/dreamweb/console.cpp +++ b/engines/dreamweb/console.cpp @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/console.h b/engines/dreamweb/console.h index a90794e94e..5517d7ffa8 100644 --- a/engines/dreamweb/console.h +++ b/engines/dreamweb/console.h @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp index f2e2f42216..01cfc7e506 100644 --- a/engines/dreamweb/detection.cpp +++ b/engines/dreamweb/detection.cpp @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/detection_tables.h b/engines/dreamweb/detection_tables.h index ec54484d28..cb9bebb304 100644 --- a/engines/dreamweb/detection_tables.h +++ b/engines/dreamweb/detection_tables.h @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp index 08838a784a..94a2e60ef1 100644 --- a/engines/dreamweb/dreamweb.cpp +++ b/engines/dreamweb/dreamweb.cpp @@ -8,12 +8,12 @@ * 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. @@ -199,7 +199,7 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam _saveLoadPage = 0; _currentSlot = 0; _cursorPos = 0; - _colourPos = 0; + _colorPos = 0; _fadeDirection = 0; _numToFade = 0; _fadeCount = 0; @@ -225,6 +225,49 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam _linePointer = 0; _lineDirection = 0; _lineLength = 0; + + _subtitles = 0; + _foreignRelease = 0; + _wonGame = 0; + _hasSpeech = 0; + _roomsSample = 0; + _copyProtection = 0; + + for (uint i = 0; i < 128; i++) + memset(&_setDat[i], 0, sizeof(SetObject)); + + for (uint i = 0; i < 80; i++) + memset(&_freeDat[i], 0, sizeof(DynObject)); + + for (uint i = 0; i < kNumExObjects; i++) + memset(&_exData[i], 0, sizeof(DynObject)); + + memset(&_vars, 0, sizeof(GameVars)); + + for (uint i = 0; i < 96; i++) + memset(&_backdropFlags[i], 0, sizeof(BackdropMapFlag)); + + for (uint i = 0; i < kNumReelRoutines+1; i++) + memset(&_reelRoutines[i], 0, sizeof(ReelRoutine)); + + _personData = 0; + + for (uint i = 0; i < 16; i++) + memset(&_openInvList[i], 0, sizeof(ObjectRef)); + + for (uint i = 0; i < 30; i++) + memset(&_ryanInvList[i], 0, sizeof(ObjectRef)); + + for (uint i = 0; i < 11*10; i++) + memset(&_mapFlags[i], 0, sizeof(MapFlag)); + + for (uint i = 0; i < kNumChanges; i++) + memset(&_listOfChanges[i], 0, sizeof(Change)); + + _currentCharset = 0; + + for (uint i = 0; i < 36; i++) + memset(&_pathData[i], 0, sizeof(RoomPaths)); } DreamWebEngine::~DreamWebEngine() { diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 5746568e4e..e39f8c0d51 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -8,12 +8,12 @@ * 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. @@ -110,6 +110,8 @@ protected: virtual Common::Error run(); virtual bool hasFeature(EngineFeature f) const; + GUI::Debugger *getDebugger() { return _console; } + public: DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gameDesc); virtual ~DreamWebEngine(); @@ -144,8 +146,6 @@ public: bool loadSpeech(const Common::String &filename); - void enableSavingOrLoading(bool enable = true) { _enableSavingOrLoading = enable; } - Common::Language getLanguage() const; uint8 modifyChar(uint8 c) const; Common::String modifyFileName(const char *); @@ -171,7 +171,6 @@ private: uint _speed; bool _turbo; uint _oldMouseState; - bool _enableSavingOrLoading; protected: GameVars _vars; // saved variables @@ -416,7 +415,7 @@ public: uint8 _saveLoadPage; uint8 _currentSlot; uint8 _cursorPos; - uint8 _colourPos; + uint8 _colorPos; uint8 _fadeDirection; uint8 _numToFade; uint8 _fadeCount; @@ -516,8 +515,8 @@ public: int findCommand(const char *const cmdList[]); // from newplace.cpp - void getUnderCentre(); - void putUnderCentre(); + void getUnderCenter(); + void putUnderCenter(); void showArrows(); uint8 getLocation(uint8 index); void setLocation(uint8 index); @@ -997,7 +996,7 @@ public: void useDryer(); void callEdensDLift(); void callEdensLift(); - void openYourNeighbour(); + void openYourNeighbor(); void openRyan(); void openPoolBoss(); void openEden(); diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp index 7bbca2b979..50e452eb82 100644 --- a/engines/dreamweb/keypad.cpp +++ b/engines/dreamweb/keypad.cpp @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp index 108f9d2b60..5f0566c8ba 100644 --- a/engines/dreamweb/monitor.cpp +++ b/engines/dreamweb/monitor.cpp @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/mouse.cpp b/engines/dreamweb/mouse.cpp index 77d907611d..fe5c580738 100644 --- a/engines/dreamweb/mouse.cpp +++ b/engines/dreamweb/mouse.cpp @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp index 6b1f9d097b..3834a114e5 100644 --- a/engines/dreamweb/newplace.cpp +++ b/engines/dreamweb/newplace.cpp @@ -8,12 +8,12 @@ * 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. @@ -113,7 +113,7 @@ void DreamWebEngine::lookAtPlace() { delPointer(); delTextLine(); - getUnderCentre(); + getUnderCenter(); showFrame(_newplaceGraphics3, 60, 72, 0, 0); showFrame(_newplaceGraphics3, 60, 72 + 55, 4, 0); if (_foreignRelease) @@ -127,15 +127,15 @@ void DreamWebEngine::lookAtPlace() { hangOnP(500); _pointerMode = 0; _pointerFrame = 0; - putUnderCentre(); + putUnderCenter(); workToScreenM(); } -void DreamWebEngine::getUnderCentre() { +void DreamWebEngine::getUnderCenter() { multiGet(_mapStore, 58, 72, 254, 110); } -void DreamWebEngine::putUnderCentre() { +void DreamWebEngine::putUnderCenter() { multiPut(_mapStore, 58, 72, 254, 110); } diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp index bee3a6d511..181987d721 100644 --- a/engines/dreamweb/object.cpp +++ b/engines/dreamweb/object.cpp @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp index 64cffde4de..8351a3798a 100644 --- a/engines/dreamweb/pathfind.cpp +++ b/engines/dreamweb/pathfind.cpp @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp index 53f04d482b..6e47513a21 100644 --- a/engines/dreamweb/people.cpp +++ b/engines/dreamweb/people.cpp @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp index bec58322d5..c119f284cc 100644 --- a/engines/dreamweb/print.cpp +++ b/engines/dreamweb/print.cpp @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/rain.cpp b/engines/dreamweb/rain.cpp index b636b7def7..4f68811a3e 100644 --- a/engines/dreamweb/rain.cpp +++ b/engines/dreamweb/rain.cpp @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp index 8a0791d19b..ce89dae732 100644 --- a/engines/dreamweb/saveload.cpp +++ b/engines/dreamweb/saveload.cpp @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp index 570f76f2f9..d3b417de90 100644 --- a/engines/dreamweb/sound.cpp +++ b/engines/dreamweb/sound.cpp @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/sound.h b/engines/dreamweb/sound.h index 1ab06dc694..6553a81b62 100644 --- a/engines/dreamweb/sound.h +++ b/engines/dreamweb/sound.h @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp index 1fa2e7d6a4..633db73bcd 100644 --- a/engines/dreamweb/sprite.cpp +++ b/engines/dreamweb/sprite.cpp @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h index 24b67e317a..cc300e8931 100644 --- a/engines/dreamweb/structs.h +++ b/engines/dreamweb/structs.h @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index 057a0c847a..68b223392c 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -8,12 +8,12 @@ * 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. @@ -2566,14 +2566,14 @@ void DreamWebEngine::showGun() { greyscaleSum(); _fadeDirection = 1; _fadeCount = 63; - _colourPos = 0; + _colorPos = 0; _numToFade = 128; hangOn(130); endPalToStart(); clearEndPal(); _fadeDirection = 1; _fadeCount = 63; - _colourPos = 0; + _colorPos = 0; _numToFade = 128; hangOn(200); _roomsSample = 34; @@ -2749,7 +2749,7 @@ void DreamWebEngine::entryAnims() { // Make doors open removeSetObject(4); placeSetObject(5); - } else if (_vars._location == 47) { // Dream centre + } else if (_vars._location == 47) { // Dream center placeSetObject(4); placeSetObject(5); } else if (_vars._location == 38) { // Car park diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp index 2629c23355..8bb469b8fd 100644 --- a/engines/dreamweb/talk.cpp +++ b/engines/dreamweb/talk.cpp @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp index 4e4faa75a0..bd0957c1bd 100644 --- a/engines/dreamweb/titles.cpp +++ b/engines/dreamweb/titles.cpp @@ -8,12 +8,12 @@ * 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. diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp index 476f847c40..c393fa1173 100644 --- a/engines/dreamweb/use.cpp +++ b/engines/dreamweb/use.cpp @@ -8,12 +8,12 @@ * 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. @@ -73,7 +73,7 @@ void DreamWebEngine::useRoutine() { { &DreamWebEngine::openLouis, "ENTA" }, { &DreamWebEngine::openRyan, "ENTB" }, { &DreamWebEngine::openPoolBoss, "ENTE" }, - { &DreamWebEngine::openYourNeighbour, "ENTC" }, + { &DreamWebEngine::openYourNeighbor, "ENTC" }, { &DreamWebEngine::openEden, "ENTD" }, { &DreamWebEngine::openSarters, "ENTH" }, { &DreamWebEngine::wearWatch, "WWAT" }, @@ -458,7 +458,7 @@ void DreamWebEngine::callEdensDLift() { } } -void DreamWebEngine::openYourNeighbour() { +void DreamWebEngine::openYourNeighbor() { enterCode(255, 255, 255, 255); _getBack = 1; } diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp index d1e2480f70..65930aef7d 100644 --- a/engines/dreamweb/vgafades.cpp +++ b/engines/dreamweb/vgafades.cpp @@ -8,12 +8,12 @@ * 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. @@ -72,11 +72,11 @@ void DreamWebEngine::doFade() { return; processEvents(); - uint8 *src = _startPal + 3 * _colourPos; - setPalette(src, _colourPos, _numToFade); + uint8 *src = _startPal + 3 * _colorPos; + setPalette(src, _colorPos, _numToFade); - _colourPos += _numToFade; - if (_colourPos == 0) + _colorPos += _numToFade; + if (_colorPos == 0) fadeCalculation(); } @@ -109,7 +109,7 @@ void DreamWebEngine::fadeUpYellows() { memset(_endPal + 246 * 3, 0, 1 * 3); _fadeDirection = 1; _fadeCount = 63; - _colourPos = 0; + _colorPos = 0; _numToFade = 128; hangOn(128); } @@ -121,7 +121,7 @@ void DreamWebEngine::fadeUpMonFirst() { memset(_startPal + 246 * 3, 0, 1 * 3); _fadeDirection = 1; _fadeCount = 63; - _colourPos = 0; + _colorPos = 0; _numToFade = 128; hangOn(64); _sound->playChannel1(26); @@ -136,7 +136,7 @@ void DreamWebEngine::fadeDownMon() { memset(_endPal + 246 * 3, 0, 1 * 3); _fadeDirection = 1; _fadeCount = 63; - _colourPos = 0; + _colorPos = 0; _numToFade = 128; hangOn(64); } @@ -148,7 +148,7 @@ void DreamWebEngine::fadeUpMon() { memset(_startPal + 246 * 3, 0, 1 * 3); _fadeDirection = 1; _fadeCount = 63; - _colourPos = 0; + _colorPos = 0; _numToFade = 128; hangOn(128); } @@ -166,7 +166,7 @@ void DreamWebEngine::fadeScreenUp() { palToEndPal(); _fadeDirection = 1; _fadeCount = 63; - _colourPos = 0; + _colorPos = 0; _numToFade = 128; } @@ -175,7 +175,7 @@ void DreamWebEngine::fadeScreenUps() { palToEndPal(); _fadeDirection = 1; _fadeCount = 63; - _colourPos = 0; + _colorPos = 0; _numToFade = 64; } @@ -184,7 +184,7 @@ void DreamWebEngine::fadeScreenUpHalf() { palToEndPal(); _fadeDirection = 1; _fadeCount = 31; - _colourPos = 0; + _colorPos = 0; _numToFade = 32; } @@ -193,7 +193,7 @@ void DreamWebEngine::fadeScreenDown() { clearEndPal(); _fadeDirection = 1; _fadeCount = 63; - _colourPos = 0; + _colorPos = 0; _numToFade = 128; } @@ -202,7 +202,7 @@ void DreamWebEngine::fadeScreenDowns() { clearEndPal(); _fadeDirection = 1; _fadeCount = 63; - _colourPos = 0; + _colorPos = 0; _numToFade = 64; } @@ -222,7 +222,7 @@ void DreamWebEngine::fadeScreenDownHalf() { _fadeDirection = 1; _fadeCount = 31; - _colourPos = 0; + _colorPos = 0; _numToFade = 32; } diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp index d8984d312b..c59d3e3ad5 100644 --- a/engines/dreamweb/vgagrafx.cpp +++ b/engines/dreamweb/vgagrafx.cpp @@ -8,12 +8,12 @@ * 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. @@ -23,7 +23,7 @@ #include "dreamweb/dreamweb.h" #include "engines/util.h" #include "graphics/surface.h" -#include "graphics/decoders/pcx.h" +#include "image/pcx.h" namespace DreamWeb { @@ -161,7 +161,7 @@ void DreamWebEngine::showPCX(const Common::String &suffix) { return; } - Graphics::PCXDecoder pcx; + Image::PCXDecoder pcx; if (!pcx.loadStream(pcxFile)) { warning("showpcx: Could not process '%s'", name.c_str()); return; @@ -235,7 +235,7 @@ void DreamWebEngine::showFrame(const GraphicsFile &frameData, uint16 x, uint16 y void DreamWebEngine::showFrameInternal(const uint8 *pSrc, uint16 x, uint16 y, uint8 effectsFlag, uint8 width, uint8 height) { if (effectsFlag) { - if (effectsFlag & 128) { //centred + if (effectsFlag & 128) { //centered x -= width / 2; y -= height / 2; } |