diff options
Diffstat (limited to 'engines')
219 files changed, 224 insertions, 224 deletions
diff --git a/engines/agi/preagi_troll.cpp b/engines/agi/preagi_troll.cpp index 04c0d25b11..bee1105727 100644 --- a/engines/agi/preagi_troll.cpp +++ b/engines/agi/preagi_troll.cpp @@ -775,4 +775,4 @@ void Troll::run() { } } -} // end of namespace Agi +} // End of namespace Agi diff --git a/engines/draci/script.cpp b/engines/draci/script.cpp index 5ff21c8d52..d05c1852a4 100644 --- a/engines/draci/script.cpp +++ b/engines/draci/script.cpp @@ -1074,5 +1074,5 @@ int Script::run(const GPL2Program &program, uint16 offset) { return 0; } -} // end of namespace Draci +} // End of namespace Draci diff --git a/engines/draci/script.h b/engines/draci/script.h index aa4b297d28..8e2a3af50c 100644 --- a/engines/draci/script.h +++ b/engines/draci/script.h @@ -170,6 +170,6 @@ private: DraciEngine *_vm; }; -} // end of namespace Draci +} // End of namespace Draci #endif // DRACI_SCRIPT_H diff --git a/engines/kyra/animator_hof.cpp b/engines/kyra/animator_hof.cpp index ee99015db3..7609b3009d 100644 --- a/engines/kyra/animator_hof.cpp +++ b/engines/kyra/animator_hof.cpp @@ -316,5 +316,5 @@ void KyraEngine_HoF::resetCharacterAnimDim() { _animObjects[0].height = _animObj0Height; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/animator_lok.cpp b/engines/kyra/animator_lok.cpp index 04c31a1422..910857121e 100644 --- a/engines/kyra/animator_lok.cpp +++ b/engines/kyra/animator_lok.cpp @@ -654,5 +654,5 @@ void Animator_LoK::setCharactersHeight() { _vm->characterList()[i].height = initHeightTable[i]; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/animator_lok.h b/engines/kyra/animator_lok.h index 3abc9c3b5e..6d22524a77 100644 --- a/engines/kyra/animator_lok.h +++ b/engines/kyra/animator_lok.h @@ -125,7 +125,7 @@ protected: int _brandonAnimSeqSizeHeight; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/animator_mr.cpp b/engines/kyra/animator_mr.cpp index faf1b150a2..b15691c3f0 100644 --- a/engines/kyra/animator_mr.cpp +++ b/engines/kyra/animator_mr.cpp @@ -461,5 +461,5 @@ void KyraEngine_MR::showIdleAnim() { _nextIdleType = !_nextIdleType; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/animator_v2.cpp b/engines/kyra/animator_v2.cpp index 26519bef40..6c4fafa674 100644 --- a/engines/kyra/animator_v2.cpp +++ b/engines/kyra/animator_v2.cpp @@ -190,5 +190,5 @@ void KyraEngine_v2::deleteItemAnimEntry(int item) { _animList = deleteAnimListEntry(_animList, animObj); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp index 0533e55574..ddb9d51fac 100644 --- a/engines/kyra/gui.cpp +++ b/engines/kyra/gui.cpp @@ -651,5 +651,5 @@ void MainMenu::printString(const char *format, int x, int y, int col1, int col2, _screen->printText(string, x, y, col1, col2); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/gui_hof.cpp b/engines/kyra/gui_hof.cpp index cb2476ff99..7fc23ddafa 100644 --- a/engines/kyra/gui_hof.cpp +++ b/engines/kyra/gui_hof.cpp @@ -1199,5 +1199,5 @@ int GUI_HoF::loadMenu(Button *caller) { return 0; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/gui_hof.h b/engines/kyra/gui_hof.h index a9c0426a2b..f0e693081f 100644 --- a/engines/kyra/gui_hof.h +++ b/engines/kyra/gui_hof.h @@ -82,7 +82,7 @@ private: static const uint16 _menuStringsOther[]; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp index b23ca82768..87cd088071 100644 --- a/engines/kyra/gui_lok.cpp +++ b/engines/kyra/gui_lok.cpp @@ -1123,5 +1123,5 @@ void KyraEngine_LoK::drawAmulet() { _screen->showMouse(); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/gui_lok.h b/engines/kyra/gui_lok.h index 5982ef1ce2..05dd1533b1 100644 --- a/engines/kyra/gui_lok.h +++ b/engines/kyra/gui_lok.h @@ -180,7 +180,7 @@ private: const char *_onCDString; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp index b339cc0f2a..7eaff77432 100644 --- a/engines/kyra/gui_lol.cpp +++ b/engines/kyra/gui_lol.cpp @@ -2950,7 +2950,7 @@ const char *GUI_LoL::getMenuItemLabel(const MenuItem &menuItem) { return _vm->getLangString(menuItem.labelId); } -} // end of namespace Kyra +} // End of namespace Kyra #endif // ENABLE_LOL diff --git a/engines/kyra/gui_lol.h b/engines/kyra/gui_lol.h index df383b0d29..8772dfe382 100644 --- a/engines/kyra/gui_lol.h +++ b/engines/kyra/gui_lol.h @@ -175,7 +175,7 @@ private: Button::Callback _scrollDownFunctor; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/gui_mr.cpp b/engines/kyra/gui_mr.cpp index 858e3fde94..bcc74f5a07 100644 --- a/engines/kyra/gui_mr.cpp +++ b/engines/kyra/gui_mr.cpp @@ -1624,5 +1624,5 @@ void GUI_MR::drawSliderBar(int slider, const uint8 *shape) { _screen->drawShape(0, shape, x+position, y, 0, 0); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/gui_mr.h b/engines/kyra/gui_mr.h index a78d0559a6..89aaa447d1 100644 --- a/engines/kyra/gui_mr.h +++ b/engines/kyra/gui_mr.h @@ -87,7 +87,7 @@ private: Screen_MR *_screen; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp index 3633a546e7..69e409c201 100644 --- a/engines/kyra/gui_v2.cpp +++ b/engines/kyra/gui_v2.cpp @@ -875,5 +875,5 @@ int GUI_v2::choiceNo(Button *caller) { return 0; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/gui_v2.h b/engines/kyra/gui_v2.h index f6406f7c1f..4cc52be554 100644 --- a/engines/kyra/gui_v2.h +++ b/engines/kyra/gui_v2.h @@ -231,7 +231,7 @@ protected: int choiceNo(Button *caller); }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/items_hof.cpp b/engines/kyra/items_hof.cpp index 13e269f363..876db58716 100644 --- a/engines/kyra/items_hof.cpp +++ b/engines/kyra/items_hof.cpp @@ -427,5 +427,5 @@ void KyraEngine_HoF::setMouseCursor(uint16 item) { _screen->setMouseCursor(hotX, hotY, getShapePtr(shape)); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/items_lok.cpp b/engines/kyra/items_lok.cpp index bc490d9764..58028cb5d8 100644 --- a/engines/kyra/items_lok.cpp +++ b/engines/kyra/items_lok.cpp @@ -967,5 +967,5 @@ int KyraEngine_LoK::getItemListIndex(uint16 item) { return 81; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/items_lol.cpp b/engines/kyra/items_lol.cpp index c0ddd0c860..d65fe5e28e 100644 --- a/engines/kyra/items_lol.cpp +++ b/engines/kyra/items_lol.cpp @@ -535,7 +535,7 @@ int LoLEngine::checkSceneForItems(uint16 *blockDrawObjects, int colour) { return -1; } -} // end of namespace Kyra +} // End of namespace Kyra #endif // ENABLE_LOL diff --git a/engines/kyra/items_mr.cpp b/engines/kyra/items_mr.cpp index d08d58e65d..256753cc69 100644 --- a/engines/kyra/items_mr.cpp +++ b/engines/kyra/items_mr.cpp @@ -542,5 +542,5 @@ int KyraEngine_MR::getItemCommandStringInv(uint16 item) { return _itemStringInv[stringId]; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp index 720a7e1ffe..31deaab450 100644 --- a/engines/kyra/kyra_hof.cpp +++ b/engines/kyra/kyra_hof.cpp @@ -2001,5 +2001,5 @@ void KyraEngine_HoF::readSettings() { KyraEngine_v1::readSettings(); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h index 02710a9f84..c1278128d2 100644 --- a/engines/kyra/kyra_hof.h +++ b/engines/kyra/kyra_hof.h @@ -919,7 +919,7 @@ protected: Common::Error loadGameState(int slot); }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp index e68a73bb29..ebeb6f3b67 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/kyra_lok.cpp @@ -980,4 +980,4 @@ void KyraEngine_LoK::writeSettings() { KyraEngine_v1::writeSettings(); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h index f89caef142..826d25d8c1 100644 --- a/engines/kyra/kyra_lok.h +++ b/engines/kyra/kyra_lok.h @@ -806,7 +806,7 @@ protected: int o1_dummy(EMCState *script); }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp index a00b3a8956..27ade9ddc1 100644 --- a/engines/kyra/kyra_mr.cpp +++ b/engines/kyra/kyra_mr.cpp @@ -1503,5 +1503,5 @@ void KyraEngine_MR::readSettings() { _configHelium = ConfMan.getBool("helium_mode"); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h index 6a31935178..773b0a1699 100644 --- a/engines/kyra/kyra_mr.h +++ b/engines/kyra/kyra_mr.h @@ -669,7 +669,7 @@ private: int loadLanguageFile(const char *file, uint8 *&buffer); }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index 65cba8c5d8..23fe09668c 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -39,7 +39,7 @@ namespace Common { class SeekableReadStream; class WriteStream; -} // end of namespace Common +} // End of namespace Common class KyraMetaEngine; diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 9ffd796afd..34284a8e20 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -240,5 +240,5 @@ int KyraEngine_v2::updateCharPos(int *table, int force) { return 1; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h index 50c24c80b9..82bb475e25 100644 --- a/engines/kyra/kyra_v2.h +++ b/engines/kyra/kyra_v2.h @@ -397,7 +397,7 @@ protected: int o2_getVocHigh(EMCState *script); }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 2bfe687680..904984cb31 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -4482,7 +4482,7 @@ void LoLEngine::generateTempData() { _hasTempDataFlags |= (1 << l); } -} // end of namespace Kyra +} // End of namespace Kyra #endif // ENABLE_LOL diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h index d0c4d4f3c2..bbf6b71fda 100644 --- a/engines/kyra/lol.h +++ b/engines/kyra/lol.h @@ -1518,7 +1518,7 @@ private: void updateFire(); }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index 3ef5589266..efc1b16c9b 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -367,7 +367,7 @@ void Resource::initializeLoaders() { _loaders.push_back(LoaderList::value_type(new ResLoaderTlk())); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h index 4a9a8a10e9..529d9f4c5a 100644 --- a/engines/kyra/resource.h +++ b/engines/kyra/resource.h @@ -460,7 +460,7 @@ private: const FilenameTable *_filenameTable; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/resource_intern.cpp b/engines/kyra/resource_intern.cpp index fd97a168e6..4c04cc5e7d 100644 --- a/engines/kyra/resource_intern.cpp +++ b/engines/kyra/resource_intern.cpp @@ -1100,4 +1100,4 @@ Common::Archive *InstallerLoader::load(Resource *owner, const Common::String &fi return new CachedArchive(fileList); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/resource_intern.h b/engines/kyra/resource_intern.h index 4f15985dd2..bceccc34b7 100644 --- a/engines/kyra/resource_intern.h +++ b/engines/kyra/resource_intern.h @@ -128,6 +128,6 @@ public: static Common::Archive *load(Resource *owner, const Common::String &filename, const Common::String &extension, const uint8 offset); }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp index fe0b168f61..959d89f0ad 100644 --- a/engines/kyra/saveload.cpp +++ b/engines/kyra/saveload.cpp @@ -268,5 +268,5 @@ void KyraEngine_v1::loadGameStateCheck(int slot) { } } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/saveload_hof.cpp b/engines/kyra/saveload_hof.cpp index 4a42f9e065..4ff63eaff0 100644 --- a/engines/kyra/saveload_hof.cpp +++ b/engines/kyra/saveload_hof.cpp @@ -332,5 +332,5 @@ Common::Error KyraEngine_HoF::loadGameState(int slot) { return Common::kNoError; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/saveload_lok.cpp b/engines/kyra/saveload_lok.cpp index df12d92660..1a61f9a962 100644 --- a/engines/kyra/saveload_lok.cpp +++ b/engines/kyra/saveload_lok.cpp @@ -322,5 +322,5 @@ Common::Error KyraEngine_LoK::saveGameState(int slot, const char *saveName, cons delete out; return Common::kNoError; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/saveload_lol.cpp index 928cb508c7..e27c0431e2 100644 --- a/engines/kyra/saveload_lol.cpp +++ b/engines/kyra/saveload_lol.cpp @@ -474,7 +474,7 @@ Graphics::Surface *LoLEngine::generateSaveThumbnail() const { return dst; } -} // end of namespace Kyra +} // End of namespace Kyra #endif // ENABLE_LOL diff --git a/engines/kyra/saveload_mr.cpp b/engines/kyra/saveload_mr.cpp index 9981eeac25..16fbbdd902 100644 --- a/engines/kyra/saveload_mr.cpp +++ b/engines/kyra/saveload_mr.cpp @@ -328,5 +328,5 @@ Common::Error KyraEngine_MR::loadGameState(int slot) { return Common::kNoError; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/scene_hof.cpp b/engines/kyra/scene_hof.cpp index 2d15af92fd..531dddb828 100644 --- a/engines/kyra/scene_hof.cpp +++ b/engines/kyra/scene_hof.cpp @@ -739,5 +739,5 @@ bool KyraEngine_HoF::lineIsPassable(int x, int y) { return true; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/scene_lok.cpp b/engines/kyra/scene_lok.cpp index e7f4ecbae0..f71c3bd756 100644 --- a/engines/kyra/scene_lok.cpp +++ b/engines/kyra/scene_lok.cpp @@ -1309,5 +1309,5 @@ void KyraEngine_LoK::setupSceneResource(int sceneId) { _res->loadPakFile(file); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp index 415ec31c69..aed696a091 100644 --- a/engines/kyra/scene_lol.cpp +++ b/engines/kyra/scene_lol.cpp @@ -2187,7 +2187,7 @@ void LoLEngine::drawSpecialGuiShape(int pageNum) { _screen->drawShape(pageNum, _specialGuiShape, _specialGuiShapeX + _specialGuiShape[3], _specialGuiShapeY, 2, 1); } -} // end of namespace Kyra +} // End of namespace Kyra #endif // ENABLE_LOL diff --git a/engines/kyra/scene_mr.cpp b/engines/kyra/scene_mr.cpp index a68dcfb394..875200895a 100644 --- a/engines/kyra/scene_mr.cpp +++ b/engines/kyra/scene_mr.cpp @@ -831,4 +831,4 @@ bool KyraEngine_MR::lineIsPassable(int x, int y) { return true; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/scene_v1.cpp b/engines/kyra/scene_v1.cpp index d3ca010917..848735b4a5 100644 --- a/engines/kyra/scene_v1.cpp +++ b/engines/kyra/scene_v1.cpp @@ -374,4 +374,4 @@ int KyraEngine_v1::getMoveTableSize(int *moveTable) { return retValue; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/scene_v2.cpp b/engines/kyra/scene_v2.cpp index 3def71a076..f0c26acd54 100644 --- a/engines/kyra/scene_v2.cpp +++ b/engines/kyra/scene_v2.cpp @@ -225,5 +225,5 @@ void KyraEngine_v2::pathfinderFinializePath(int *moveTable, int tableLen, int x, } } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h index a5acdb6758..0e8ffada86 100644 --- a/engines/kyra/screen.h +++ b/engines/kyra/screen.h @@ -37,7 +37,7 @@ class OSystem; namespace Graphics { class FontSJIS; -} // end of namespace Graphics +} // End of namespace Graphics namespace Kyra { diff --git a/engines/kyra/screen_hof.cpp b/engines/kyra/screen_hof.cpp index 516cb5bc41..a180c28442 100644 --- a/engines/kyra/screen_hof.cpp +++ b/engines/kyra/screen_hof.cpp @@ -150,5 +150,5 @@ void Screen_HoF::copyRegionEx(int srcPage, int srcW, int srcH, int dstPage, int } } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/screen_lok.cpp b/engines/kyra/screen_lok.cpp index 9ecdef325d..da82ec947b 100644 --- a/engines/kyra/screen_lok.cpp +++ b/engines/kyra/screen_lok.cpp @@ -455,4 +455,4 @@ void Screen_LoK_16::set16ColorPalette(const uint8 *pal) { _system->setPalette(palette, 0, 16); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/screen_lok.h b/engines/kyra/screen_lok.h index ae1d85c0a7..2a5ef7e12e 100644 --- a/engines/kyra/screen_lok.h +++ b/engines/kyra/screen_lok.h @@ -112,6 +112,6 @@ private: static const uint8 _palette16[48]; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp index 345c15b784..d988ae857a 100644 --- a/engines/kyra/screen_lol.cpp +++ b/engines/kyra/screen_lol.cpp @@ -1017,7 +1017,7 @@ void Screen_LoL::postProcessCursor(uint8 *data, int w, int h, int pitch) { } } -} // end of namespace Kyra +} // End of namespace Kyra #endif // ENABLE_LOL diff --git a/engines/kyra/screen_lol.h b/engines/kyra/screen_lol.h index 293d0ef42c..e455976d76 100644 --- a/engines/kyra/screen_lol.h +++ b/engines/kyra/screen_lol.h @@ -117,7 +117,7 @@ private: void postProcessCursor(uint8 *data, int width, int height, int pitch); }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/screen_mr.cpp b/engines/kyra/screen_mr.cpp index a54eeacb02..33bfc517f7 100644 --- a/engines/kyra/screen_mr.cpp +++ b/engines/kyra/screen_mr.cpp @@ -140,4 +140,4 @@ void Screen_MR::drawFilledBox(int x1, int y1, int x2, int y2, uint8 c1, uint8 c2 drawClippedLine(x1, y2-1, x2-1, y2-1, c3); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/screen_mr.h b/engines/kyra/screen_mr.h index 7fbcbdcb6e..4107003b12 100644 --- a/engines/kyra/screen_mr.h +++ b/engines/kyra/screen_mr.h @@ -54,6 +54,6 @@ private: static const int _screenDimTableCount; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/screen_v2.cpp b/engines/kyra/screen_v2.cpp index 177d7d66dd..919b9086f3 100644 --- a/engines/kyra/screen_v2.cpp +++ b/engines/kyra/screen_v2.cpp @@ -355,5 +355,5 @@ void Screen_v2::checkedPageUpdate(int srcPage, int dstPage) { addDirtyRect(0, 0, 320, 200); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/screen_v2.h b/engines/kyra/screen_v2.h index 3aa726334c..7be68e7b6d 100644 --- a/engines/kyra/screen_v2.h +++ b/engines/kyra/screen_v2.h @@ -73,7 +73,7 @@ protected: uint8 *_wsaFrameAnimBuffer; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp index c1c6a5122d..87e3456934 100644 --- a/engines/kyra/script.cpp +++ b/engines/kyra/script.cpp @@ -447,5 +447,5 @@ void EMCInterpreter::op_setRetAndJmp(EMCState *script) { script->ip = &script->dataPtr->data[temp]; } } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/script.h b/engines/kyra/script.h index bfe188d22a..94315ff8a9 100644 --- a/engines/kyra/script.h +++ b/engines/kyra/script.h @@ -140,7 +140,7 @@ private: void op_eval(EMCState *); void op_setRetAndJmp(EMCState *); }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/script_hof.cpp b/engines/kyra/script_hof.cpp index 3ffbaee210..8121335879 100644 --- a/engines/kyra/script_hof.cpp +++ b/engines/kyra/script_hof.cpp @@ -1735,5 +1735,5 @@ void KyraEngine_HoF::setupOpcodeTable() { OpcodeTim(t2_playSoundEffect); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/script_lok.cpp b/engines/kyra/script_lok.cpp index 0a96db8277..848eb238e8 100644 --- a/engines/kyra/script_lok.cpp +++ b/engines/kyra/script_lok.cpp @@ -1957,5 +1957,5 @@ void KyraEngine_LoK::setupOpcodeTable() { } #undef Opcode -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp index ff358eb69e..73c9577b4f 100644 --- a/engines/kyra/script_lol.cpp +++ b/engines/kyra/script_lol.cpp @@ -3044,7 +3044,7 @@ void LoLEngine::setupOpcodeTable() { OpcodeTim(tlol_stopBackgroundAnimation); } -} // end of namespace Kyra +} // End of namespace Kyra #endif // ENABLE_LOL diff --git a/engines/kyra/script_mr.cpp b/engines/kyra/script_mr.cpp index 9943fe419d..b404747eb6 100644 --- a/engines/kyra/script_mr.cpp +++ b/engines/kyra/script_mr.cpp @@ -1391,4 +1391,4 @@ void KyraEngine_MR::setupOpcodeTable() { Opcode(o3_dummy); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp index 317ab01c22..cbca497c70 100644 --- a/engines/kyra/script_tim.cpp +++ b/engines/kyra/script_tim.cpp @@ -1410,5 +1410,5 @@ int TIMInterpreter_LoL::cmd_dialogueBox(const uint16 *param) { } #endif // ENABLE_LOL -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/script_tim.h b/engines/kyra/script_tim.h index 40049c3dec..7958dc66fc 100644 --- a/engines/kyra/script_tim.h +++ b/engines/kyra/script_tim.h @@ -288,7 +288,7 @@ private: }; #endif // ENABLE_LOL -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp index 0f36d5d12b..12f26ec5f6 100644 --- a/engines/kyra/script_v1.cpp +++ b/engines/kyra/script_v1.cpp @@ -123,5 +123,5 @@ int KyraEngine_v1::o1_playSoundEffect(EMCState *script) { return 0; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp index 2af4fda727..01f058c383 100644 --- a/engines/kyra/script_v2.cpp +++ b/engines/kyra/script_v2.cpp @@ -342,5 +342,5 @@ int KyraEngine_v2::o2a_setResetFrame(EMCState *script) { return 0; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp index 81ab237e0f..d045af13f9 100644 --- a/engines/kyra/sequences_hof.cpp +++ b/engines/kyra/sequences_hof.cpp @@ -2927,6 +2927,6 @@ void KyraEngine_HoF::seq_makeBookAppear() { _screen->showMouse(); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp index 1d14a51375..66e32006b5 100644 --- a/engines/kyra/sequences_lok.cpp +++ b/engines/kyra/sequences_lok.cpp @@ -2086,5 +2086,5 @@ void KyraEngine_LoK::drawJewelsFadeOutEnd(int jewel) { _screen->showMouse(); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp index 15c9bbdd7e..2edfb5dcda 100644 --- a/engines/kyra/sequences_lol.cpp +++ b/engines/kyra/sequences_lol.cpp @@ -1469,7 +1469,7 @@ void LoLEngine::loadOutroShapes(int file, uint8 **storage) { } } -} // end of namespace Kyra +} // End of namespace Kyra #endif // ENABLE_LOL diff --git a/engines/kyra/sequences_mr.cpp b/engines/kyra/sequences_mr.cpp index a1830aec5c..d3250823c5 100644 --- a/engines/kyra/sequences_mr.cpp +++ b/engines/kyra/sequences_mr.cpp @@ -237,5 +237,5 @@ void KyraEngine_MR::uninitAnimationShapes(int count, uint8 *filedata) { setNextIdleAnimTimer(); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/sequences_v2.cpp b/engines/kyra/sequences_v2.cpp index 59e101a98f..3824676213 100644 --- a/engines/kyra/sequences_v2.cpp +++ b/engines/kyra/sequences_v2.cpp @@ -128,5 +128,5 @@ void KyraEngine_v2::processAnimationScript(int allowSkip, int resetChar) { resetCharacterAnimDim(); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 781516282e..865360dfc1 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -279,6 +279,6 @@ const Sound::SpeechCodecs Sound::_supportedCodecs[] = { { 0, 0 } }; -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h index 09a87b6d87..3d74972162 100644 --- a/engines/kyra/sound.h +++ b/engines/kyra/sound.h @@ -35,7 +35,7 @@ namespace Audio { class AudioStream; -} // end of namespace Audio +} // End of namespace Audio namespace Kyra { @@ -376,6 +376,6 @@ private: static const AudioCodecs _supportedCodecs[]; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp index ef4223f8e4..1e55e12b8c 100644 --- a/engines/kyra/sound_adlib.cpp +++ b/engines/kyra/sound_adlib.cpp @@ -2425,5 +2425,5 @@ void SoundAdlibPC::unk2() { playSoundEffect(0); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/sound_adlib.h b/engines/kyra/sound_adlib.h index f384113af7..d96eb5ab8f 100644 --- a/engines/kyra/sound_adlib.h +++ b/engines/kyra/sound_adlib.h @@ -107,7 +107,7 @@ private: static const int _kyra1SoundTriggers[]; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp index 9e9cfa3678..38565ad023 100644 --- a/engines/kyra/sound_amiga.cpp +++ b/engines/kyra/sound_amiga.cpp @@ -219,5 +219,5 @@ void SoundAmiga::playSoundEffect(uint8 track) { } } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/sound_digital.cpp b/engines/kyra/sound_digital.cpp index 1d8bc5b03c..3a04fa266b 100644 --- a/engines/kyra/sound_digital.cpp +++ b/engines/kyra/sound_digital.cpp @@ -496,5 +496,5 @@ const SoundDigital::AudioCodecs SoundDigital::_supportedCodecs[] = { }; -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/sound_intern.h b/engines/kyra/sound_intern.h index 70c6b66dd4..994dd5a76e 100644 --- a/engines/kyra/sound_intern.h +++ b/engines/kyra/sound_intern.h @@ -38,7 +38,7 @@ namespace Audio { class PCSpeaker; class MaxTrax; -} // end of namespace Audio +} // End of namespace Audio namespace Kyra { class MidiOutput; @@ -327,6 +327,6 @@ protected: int _tableSfxGame_Size; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/sound_lok.cpp b/engines/kyra/sound_lok.cpp index f14e4eae84..8399e0cc51 100644 --- a/engines/kyra/sound_lok.cpp +++ b/engines/kyra/sound_lok.cpp @@ -97,4 +97,4 @@ uint32 KyraEngine_LoK::snd_getVoicePlayTime() { return (_speechPlayTime != -1 ? _speechPlayTime : 0); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp index 7ee49a7894..52fb9eeb43 100644 --- a/engines/kyra/sound_lol.cpp +++ b/engines/kyra/sound_lol.cpp @@ -316,7 +316,7 @@ int LoLEngine::convertVolumeFromMixer(int value) { return (value * 100) / Audio::Mixer::kMaxMixerVolume + 2; } -} // end of namespace Kyra +} // End of namespace Kyra #endif // ENABLE_LOL diff --git a/engines/kyra/sound_midi.cpp b/engines/kyra/sound_midi.cpp index 28d4844d7d..24ff956052 100644 --- a/engines/kyra/sound_midi.cpp +++ b/engines/kyra/sound_midi.cpp @@ -772,5 +772,5 @@ Common::String SoundMidiPC::getFileName(const Common::String &str) { return str + ".XMI"; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/sound_pcspk.cpp b/engines/kyra/sound_pcspk.cpp index 2afed22a80..8da356072a 100644 --- a/engines/kyra/sound_pcspk.cpp +++ b/engines/kyra/sound_pcspk.cpp @@ -366,5 +366,5 @@ const uint8 MidiDriver_PCSpeaker::_noteTable2[] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }; -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp index 4d42068f35..f2c021a8bc 100644 --- a/engines/kyra/sound_towns.cpp +++ b/engines/kyra/sound_towns.cpp @@ -4441,7 +4441,7 @@ const uint8 TownsPC98_OpnCore::_percussionData[] = { 58,145,244,145,43,35,9,171,16,110,25,8,28,74,162,128,26,27,82,45,136,153,18,8,136,8 }; -} // end of namespace Kyra +} // End of namespace Kyra #undef EUPHONY_FADEOUT_TICKS diff --git a/engines/kyra/sprites.cpp b/engines/kyra/sprites.cpp index 456dcc06f3..11a47f1527 100644 --- a/engines/kyra/sprites.cpp +++ b/engines/kyra/sprites.cpp @@ -582,5 +582,5 @@ int Sprites::getDrawLayer(int y) { return returnValue; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/sprites_lol.cpp index e8d8b18ab2..2dfff893e8 100644 --- a/engines/kyra/sprites_lol.cpp +++ b/engines/kyra/sprites_lol.cpp @@ -1622,7 +1622,7 @@ void LoLEngine::killMonster(MonsterInPlay *monster) { placeMonster(monster, 0, 0); } -} // end of namespace Kyra +} // End of namespace Kyra #endif // ENABLE_LOL diff --git a/engines/kyra/text.cpp b/engines/kyra/text.cpp index a20e94fc1f..0ac75ddf0a 100644 --- a/engines/kyra/text.cpp +++ b/engines/kyra/text.cpp @@ -340,4 +340,4 @@ void TextDisplayer::setTextColor(uint8 color) { _screen->setPaletteIndex(0x10, r, g, b); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/text.h b/engines/kyra/text.h index 73d77dcb4c..bf346f8e3e 100644 --- a/engines/kyra/text.h +++ b/engines/kyra/text.h @@ -78,7 +78,7 @@ protected: bool _talkMessagePrinted; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/text_hof.cpp b/engines/kyra/text_hof.cpp index a5b6835e27..48eda97f80 100644 --- a/engines/kyra/text_hof.cpp +++ b/engines/kyra/text_hof.cpp @@ -681,4 +681,4 @@ void KyraEngine_HoF::setDlgIndex(int dlgIndex) { _mainCharacter.dlgIndex = dlgIndex; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/text_hof.h b/engines/kyra/text_hof.h index 3da6e081f0..8e88918fa4 100644 --- a/engines/kyra/text_hof.h +++ b/engines/kyra/text_hof.h @@ -50,7 +50,7 @@ private: KyraEngine_HoF *_vm; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/text_lok.cpp b/engines/kyra/text_lok.cpp index 178966196c..93a16d9a1e 100644 --- a/engines/kyra/text_lok.cpp +++ b/engines/kyra/text_lok.cpp @@ -388,4 +388,4 @@ void KyraEngine_LoK::updateTextFade() { } } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/text_lol.cpp b/engines/kyra/text_lol.cpp index a6fbe9f699..fda46f2dfa 100644 --- a/engines/kyra/text_lol.cpp +++ b/engines/kyra/text_lol.cpp @@ -793,7 +793,7 @@ void TextDisplayer_LoL::clearCurDim() { _textDimData[d].column = _textDimData[d].line = 0; } -} // end of namespace Kyra +} // End of namespace Kyra #endif // ENABLE_LOL diff --git a/engines/kyra/text_lol.h b/engines/kyra/text_lol.h index ce6e2c8a2b..488be17cff 100644 --- a/engines/kyra/text_lol.h +++ b/engines/kyra/text_lol.h @@ -93,7 +93,7 @@ private: TextDimData _textDimData[14]; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/text_mr.cpp b/engines/kyra/text_mr.cpp index 40f651ab01..b2c4517c73 100644 --- a/engines/kyra/text_mr.cpp +++ b/engines/kyra/text_mr.cpp @@ -904,5 +904,5 @@ void KyraEngine_MR::runDialog(int dlgIndex, int funcNum) { processDialog(vocHighIndex, vocHighBase, funcNum); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/text_mr.h b/engines/kyra/text_mr.h index d96b0964ba..8c559e067a 100644 --- a/engines/kyra/text_mr.h +++ b/engines/kyra/text_mr.h @@ -50,6 +50,6 @@ protected: Screen_MR *_screen; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/timer.cpp b/engines/kyra/timer.cpp index 18e25a3e08..66b78d3c03 100644 --- a/engines/kyra/timer.cpp +++ b/engines/kyra/timer.cpp @@ -302,4 +302,4 @@ void TimerManager::saveDataToFile(Common::WriteStream &file) const { } } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/timer.h b/engines/kyra/timer.h index 3892ecd580..d85a48cfa4 100644 --- a/engines/kyra/timer.h +++ b/engines/kyra/timer.h @@ -104,7 +104,7 @@ private: TimerManager &_timer; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/timer_hof.cpp b/engines/kyra/timer_hof.cpp index 9d502f0492..117b84f48a 100644 --- a/engines/kyra/timer_hof.cpp +++ b/engines/kyra/timer_hof.cpp @@ -107,4 +107,4 @@ void KyraEngine_HoF::setWalkspeed(uint8 newSpeed) { } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/timer_lok.cpp b/engines/kyra/timer_lok.cpp index 0e05188fe8..b8f79c7644 100644 --- a/engines/kyra/timer_lok.cpp +++ b/engines/kyra/timer_lok.cpp @@ -163,5 +163,5 @@ void KyraEngine_LoK::setWalkspeed(uint8 newSpeed) { _timer->setDelay(5, speeds[newSpeed]); } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/timer_lol.cpp b/engines/kyra/timer_lol.cpp index 0e43487217..c38d8cef10 100644 --- a/engines/kyra/timer_lol.cpp +++ b/engines/kyra/timer_lol.cpp @@ -256,7 +256,7 @@ void LoLEngine::timerFadeMessageText(int timerNum) { initTextFading(0, 0); } -} // end of namespace Kyra +} // End of namespace Kyra #endif // ENABLE_LOL diff --git a/engines/kyra/timer_mr.cpp b/engines/kyra/timer_mr.cpp index 0b9eb221b1..48fa55519c 100644 --- a/engines/kyra/timer_mr.cpp +++ b/engines/kyra/timer_mr.cpp @@ -99,4 +99,4 @@ void KyraEngine_MR::setNextIdleAnimTimer() { _nextIdleAnim = _system->getMillis() + _rnd.getRandomNumberRng(10, 15) * 1000; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/util.cpp b/engines/kyra/util.cpp index fe02ba49ba..8fd7d4d069 100644 --- a/engines/kyra/util.cpp +++ b/engines/kyra/util.cpp @@ -148,5 +148,5 @@ const uint8 Util::_charMapISOToDOS[128] = { 151, 163, 150, 129, 236, 231, 152 }; -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/util.h b/engines/kyra/util.h index 6850a4d757..43a861907b 100644 --- a/engines/kyra/util.h +++ b/engines/kyra/util.h @@ -46,7 +46,7 @@ private: static const uint8 _charMapISOToDOS[128]; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp index 1225bc9976..2011135adf 100644 --- a/engines/kyra/vqa.cpp +++ b/engines/kyra/vqa.cpp @@ -684,4 +684,4 @@ void VQAMovie::play() { // TODO: Wait for the sound to finish? } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/vqa.h b/engines/kyra/vqa.h index 98e279bd29..bf3d1fe855 100644 --- a/engines/kyra/vqa.h +++ b/engines/kyra/vqa.h @@ -34,11 +34,11 @@ class OSystem; namespace Audio { class AppendableAudioStream; -} // end of namespace Audio +} // End of namespace Audio namespace Common { class SeekableReadStream; -} // end of namespace Common +} // End of namespace Common namespace Kyra { @@ -133,6 +133,6 @@ protected: uint32 readTag(); }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp index b221f869b7..05c4ca7747 100644 --- a/engines/kyra/wsamovie.cpp +++ b/engines/kyra/wsamovie.cpp @@ -463,6 +463,6 @@ int WSAMovie_v2::open(const char *filename, int unk1, Palette *palBuf) { return _numFrames; } -} // end of namespace Kyra +} // End of namespace Kyra diff --git a/engines/kyra/wsamovie.h b/engines/kyra/wsamovie.h index ac104de443..c93221d7a0 100644 --- a/engines/kyra/wsamovie.h +++ b/engines/kyra/wsamovie.h @@ -29,7 +29,7 @@ namespace Audio { class AppendableAudioStream; class SoundHandle; -} // end of namespace Audio +} // End of namespace Audio namespace Kyra { class KyraEngine_v1; @@ -136,7 +136,7 @@ protected: int16 _yAdd; }; -} // end of namespace Kyra +} // End of namespace Kyra #endif diff --git a/engines/lure/animseq.cpp b/engines/lure/animseq.cpp index 5094c60961..f53b532815 100644 --- a/engines/lure/animseq.cpp +++ b/engines/lure/animseq.cpp @@ -281,4 +281,4 @@ bool AnimationSequence::step() { return true; } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/decode.cpp b/engines/lure/decode.cpp index 26eec5ba6d..ae91cc1c52 100644 --- a/engines/lure/decode.cpp +++ b/engines/lure/decode.cpp @@ -499,4 +499,4 @@ loc_1441: return pDest - dest->data(); } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/disk.cpp b/engines/lure/disk.cpp index 282b231371..b04cbdac27 100644 --- a/engines/lure/disk.cpp +++ b/engines/lure/disk.cpp @@ -225,4 +225,4 @@ FileEntry *Disk::getIndex(uint8 entryIndex) { return &_entries[entryIndex]; } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/disk.h b/engines/lure/disk.h index 3f789bed1b..d2848cc587 100644 --- a/engines/lure/disk.h +++ b/engines/lure/disk.h @@ -65,6 +65,6 @@ public: FileEntry *getIndex(uint8 entryIndex); }; -} // end of namespace Lure +} // End of namespace Lure #endif diff --git a/engines/lure/events.cpp b/engines/lure/events.cpp index 5ca82a9be4..c637d4d7f7 100644 --- a/engines/lure/events.cpp +++ b/engines/lure/events.cpp @@ -226,4 +226,4 @@ bool Events::interruptableDelay(uint32 milliseconds) { return false; } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/fights.cpp b/engines/lure/fights.cpp index 4a67c3df66..930d46640e 100644 --- a/engines/lure/fights.cpp +++ b/engines/lure/fights.cpp @@ -627,4 +627,4 @@ uint16 FightsManager::getFighterMove(FighterRecord &rec, uint16 baseOffset) { return getByte(baseOffset + (rec.fwhits << 5) + actionIndex); } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp index 3dfc6a8478..1ff9819f33 100644 --- a/engines/lure/game.cpp +++ b/engines/lure/game.cpp @@ -1071,4 +1071,4 @@ void Game::loadFromStream(ReadStream *stream) { } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp index b7d7593a6f..94b68d75c3 100644 --- a/engines/lure/hotspots.cpp +++ b/engines/lure/hotspots.cpp @@ -4707,4 +4707,4 @@ void HotspotList::loadFromStream(ReadStream *stream) { } } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/intro.cpp b/engines/lure/intro.cpp index c2b84001fc..5afc2d7aaf 100644 --- a/engines/lure/intro.cpp +++ b/engines/lure/intro.cpp @@ -185,4 +185,4 @@ bool Introduction::show() { return false; } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/memory.cpp b/engines/lure/memory.cpp index 042bed2bec..814251e425 100644 --- a/engines/lure/memory.cpp +++ b/engines/lure/memory.cpp @@ -99,4 +99,4 @@ void MemoryBlock::reallocate(uint32 size1) { if (!_data) error ("Failed reallocating memory block"); } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp index 5027e6967e..4d91284364 100644 --- a/engines/lure/menu.cpp +++ b/engines/lure/menu.cpp @@ -639,4 +639,4 @@ bail_out: return selectedIndex; } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/palette.cpp b/engines/lure/palette.cpp index badc3c96b0..d77f64f00a 100644 --- a/engines/lure/palette.cpp +++ b/engines/lure/palette.cpp @@ -215,4 +215,4 @@ Palette &PaletteCollection::getPalette(uint8 paletteNum) { return *_palettes[paletteNum]; } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp index c3683fe6a7..c33ad49ef4 100644 --- a/engines/lure/res.cpp +++ b/engines/lure/res.cpp @@ -817,4 +817,4 @@ void Resources::loadFromStream(Common::ReadStream *stream) { debugC(ERROR_DETAILED, kLureDebugScripts, "Finished loading"); } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp index 31f6d8f240..2515d8dc60 100644 --- a/engines/lure/res_struct.cpp +++ b/engines/lure/res_struct.cpp @@ -1537,4 +1537,4 @@ void CurrentActionStack::copyFrom(CurrentActionStack &stack) { } } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/room.cpp b/engines/lure/room.cpp index cf4363f6fd..6dddffac9c 100644 --- a/engines/lure/room.cpp +++ b/engines/lure/room.cpp @@ -808,4 +808,4 @@ void Room::reset() { _statusLine[0] = '\0'; } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/room.h b/engines/lure/room.h index 9c183b609c..f24136ac42 100644 --- a/engines/lure/room.h +++ b/engines/lure/room.h @@ -132,6 +132,6 @@ public: void reset(); }; -} // end of namespace Lure +} // End of namespace Lure #endif diff --git a/engines/lure/screen.cpp b/engines/lure/screen.cpp index 35039be1a7..ce353aa04a 100644 --- a/engines/lure/screen.cpp +++ b/engines/lure/screen.cpp @@ -176,4 +176,4 @@ void Screen::updateArea(uint16 x, uint16 y, uint16 w, uint16 h) { _system.updateScreen(); } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/scripts.cpp b/engines/lure/scripts.cpp index 9e13a0d871..41a09e0d1d 100644 --- a/engines/lure/scripts.cpp +++ b/engines/lure/scripts.cpp @@ -1309,4 +1309,4 @@ bool HotspotScript::execute(Hotspot *h) { return (opcode == S2_OPCODE_UNLOAD); } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/sound.cpp b/engines/lure/sound.cpp index ab43b3619a..271df25c19 100644 --- a/engines/lure/sound.cpp +++ b/engines/lure/sound.cpp @@ -741,4 +741,4 @@ void MidiMusic::stopMusic() { close(); } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp index 84930661ad..54b579c557 100644 --- a/engines/lure/surface.cpp +++ b/engines/lure/surface.cpp @@ -1416,4 +1416,4 @@ void CopyProtectionDialog::chooseCharacters() { screen.update(); } -} // end of namespace Lure +} // End of namespace Lure diff --git a/engines/sci/engine/stringfrag.cpp b/engines/sci/engine/stringfrag.cpp index ae17ae7763..c84b56b63f 100644 --- a/engines/sci/engine/stringfrag.cpp +++ b/engines/sci/engine/stringfrag.cpp @@ -455,4 +455,4 @@ void stringfrag_strncmp(EngineState *s, reg_t s1, reg_t s2, int len) { internal_stringfrag_strncmp(s, s1buf, s2buf, len); } -} // end of namespace Sci +} // End of namespace Sci diff --git a/engines/sci/gui/gui_font.cpp b/engines/sci/gui/gui_font.cpp index 06aee14b9f..5725d1ec2a 100644 --- a/engines/sci/gui/gui_font.cpp +++ b/engines/sci/gui/gui_font.cpp @@ -99,4 +99,4 @@ void SciGUIfont::draw(int16 chr, int16 top, int16 left, byte color, byte textfac } } -} // end of namespace Sci +} // End of namespace Sci diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp index a1a8df786a..a3531778f1 100644 --- a/engines/sci/gui/gui_gfx.cpp +++ b/engines/sci/gui/gui_gfx.cpp @@ -1361,4 +1361,4 @@ void SciGUIgfx::SetNowSeen(reg_t objectReference) { } } -} // end of namespace Sci +} // End of namespace Sci diff --git a/engines/sci/gui/gui_memmgr.cpp b/engines/sci/gui/gui_memmgr.cpp index c063fb99e5..0ab06fb724 100644 --- a/engines/sci/gui/gui_memmgr.cpp +++ b/engines/sci/gui/gui_memmgr.cpp @@ -370,4 +370,4 @@ bool restoreMemState(Common::InSaveFile *pFile) { } //------------------------------- -}// end of namespace SCI +}// End of namespace SCI diff --git a/engines/sci/gui/gui_picture.cpp b/engines/sci/gui/gui_picture.cpp index fb12c5d6ed..a4261a0db8 100644 --- a/engines/sci/gui/gui_picture.cpp +++ b/engines/sci/gui/gui_picture.cpp @@ -558,4 +558,4 @@ void SciGUIpicture::vectorGetPatternTexture(byte *data, int &curPos, int16 patte } } -} // end of namespace Sci +} // End of namespace Sci diff --git a/engines/sci/gui/gui_picture.h b/engines/sci/gui/gui_picture.h index f6115ab4eb..969e7c3433 100644 --- a/engines/sci/gui/gui_picture.h +++ b/engines/sci/gui/gui_picture.h @@ -69,6 +69,6 @@ private: byte _priority; }; -} // end of namespace Sci +} // End of namespace Sci #endif diff --git a/engines/sci/gui/gui_screen.cpp b/engines/sci/gui/gui_screen.cpp index 0f8b2e4dc1..fb37707d2b 100644 --- a/engines/sci/gui/gui_screen.cpp +++ b/engines/sci/gui/gui_screen.cpp @@ -204,4 +204,4 @@ void SciGUIscreen::BitsRestoreScreen(Common::Rect rect, byte *&memoryPtr, byte * } } -} // end of namespace Sci +} // End of namespace Sci diff --git a/engines/sci/gui/gui_screen.h b/engines/sci/gui/gui_screen.h index 3f45a7171e..fc82922c35 100644 --- a/engines/sci/gui/gui_screen.h +++ b/engines/sci/gui/gui_screen.h @@ -88,6 +88,6 @@ private: byte *_displayScreen; }; -} // end of namespace Sci +} // End of namespace Sci #endif diff --git a/engines/sci/gui/gui_view.cpp b/engines/sci/gui/gui_view.cpp index 60506089d0..1b42a76f4e 100644 --- a/engines/sci/gui/gui_view.cpp +++ b/engines/sci/gui/gui_view.cpp @@ -307,4 +307,4 @@ void SciGUIview::draw(Common::Rect rect, Common::Rect clipRect, GUIViewLoopNo lo } } -} // end of namespace Sci +} // End of namespace Sci diff --git a/engines/sci/gui/gui_view.h b/engines/sci/gui/gui_view.h index 51dea54cdb..f999adf09c 100644 --- a/engines/sci/gui/gui_view.h +++ b/engines/sci/gui/gui_view.h @@ -78,6 +78,6 @@ private: GUIPalette _palette; }; -} // end of namespace Sci +} // End of namespace Sci #endif diff --git a/engines/sci/gui/gui_windowmgr.cpp b/engines/sci/gui/gui_windowmgr.cpp index e16a1bf1a0..85681f7ec9 100644 --- a/engines/sci/gui/gui_windowmgr.cpp +++ b/engines/sci/gui/gui_windowmgr.cpp @@ -281,4 +281,4 @@ void SciGUIwindowMgr::UpdateWindow(GUIWindow *wnd) { } } -} // end of namespace Sci +} // End of namespace Sci diff --git a/engines/sci/gui/gui_windowmgr.h b/engines/sci/gui/gui_windowmgr.h index 7842d9d271..29a63462e0 100644 --- a/engines/sci/gui/gui_windowmgr.h +++ b/engines/sci/gui/gui_windowmgr.h @@ -57,6 +57,6 @@ private: Common::List<HEAPHANDLE> windowList; }; -} // end of namespace Sci +} // End of namespace Sci #endif diff --git a/engines/scumm/player_v2cms.cpp b/engines/scumm/player_v2cms.cpp index bffe9faf70..28040a84dc 100644 --- a/engines/scumm/player_v2cms.cpp +++ b/engines/scumm/player_v2cms.cpp @@ -1852,4 +1852,4 @@ void Player_V2CMS::mutex_up() { void Player_V2CMS::mutex_down() { _mutex.unlock(); } -} // end of namespace Scumm +} // End of namespace Scumm diff --git a/engines/tinsel/actors.cpp b/engines/tinsel/actors.cpp index 15211c60aa..6b7809e52b 100644 --- a/engines/tinsel/actors.cpp +++ b/engines/tinsel/actors.cpp @@ -1716,4 +1716,4 @@ bool ActorReelPlaying(int actor, int column) { return false; } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/actors.h b/engines/tinsel/actors.h index bda0e8bbb3..02976acaed 100644 --- a/engines/tinsel/actors.h +++ b/engines/tinsel/actors.h @@ -172,6 +172,6 @@ void RestoreActorZ(byte *saveActorZ); /*----------------------------------------------------------------------*/ -} // end of namespace Tinsel +} // End of namespace Tinsel #endif /* TINSEL_ACTOR_H */ diff --git a/engines/tinsel/anim.cpp b/engines/tinsel/anim.cpp index 91187a98e8..37d8de925e 100644 --- a/engines/tinsel/anim.cpp +++ b/engines/tinsel/anim.cpp @@ -448,4 +448,4 @@ bool AboutToJumpOrEnd(PANIM pAnim) { -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/anim.h b/engines/tinsel/anim.h index a3a7b4447e..6022edfc08 100644 --- a/engines/tinsel/anim.h +++ b/engines/tinsel/anim.h @@ -94,6 +94,6 @@ void SkipFrames( // Skip the specified number of frames bool AboutToJumpOrEnd(PANIM pAnim); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_ANIM_H diff --git a/engines/tinsel/background.cpp b/engines/tinsel/background.cpp index 583b9817a9..740b6204ea 100644 --- a/engines/tinsel/background.cpp +++ b/engines/tinsel/background.cpp @@ -260,4 +260,4 @@ void ForceEntireRedraw(void) { } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/background.h b/engines/tinsel/background.h index 3b9d11fee6..b3599d77ae 100644 --- a/engines/tinsel/background.h +++ b/engines/tinsel/background.h @@ -116,6 +116,6 @@ int BgWidth(void); int BgHeight(void); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_BACKGND_H diff --git a/engines/tinsel/bg.cpp b/engines/tinsel/bg.cpp index 4bc7cb5433..0125a681fd 100644 --- a/engines/tinsel/bg.cpp +++ b/engines/tinsel/bg.cpp @@ -279,4 +279,4 @@ SCNHANDLE GetBgroundHandle(void) { return hBackground; } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp index 9f3616baad..ce84f542ff 100644 --- a/engines/tinsel/bmv.cpp +++ b/engines/tinsel/bmv.cpp @@ -1268,4 +1268,4 @@ void SpeedMovieUp(void) { } } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/cliprect.cpp b/engines/tinsel/cliprect.cpp index bd84cc0049..d9520af9e9 100644 --- a/engines/tinsel/cliprect.cpp +++ b/engines/tinsel/cliprect.cpp @@ -310,4 +310,4 @@ void UpdateClipRect(OBJECT *pObjList, Common::Point *pWin, Common::Rect *pClip) } } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/cliprect.h b/engines/tinsel/cliprect.h index 28a66c312c..7bbb6bdc25 100644 --- a/engines/tinsel/cliprect.h +++ b/engines/tinsel/cliprect.h @@ -71,6 +71,6 @@ void UpdateClipRect( // Redraws all objects within this clipping rectangle Common::Point *pWin, // window top left position Common::Rect *pClip); // pointer to clip rectangle -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_CLIPRECT_H diff --git a/engines/tinsel/config.cpp b/engines/tinsel/config.cpp index 4695a2e435..29c6823436 100644 --- a/engines/tinsel/config.cpp +++ b/engines/tinsel/config.cpp @@ -175,4 +175,4 @@ bool isJapanMode() { #endif } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/config.h b/engines/tinsel/config.h index a02b763afb..85d5ca60e0 100644 --- a/engines/tinsel/config.h +++ b/engines/tinsel/config.h @@ -51,6 +51,6 @@ void ReadConfig(void); extern bool isJapanMode(); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif diff --git a/engines/tinsel/coroutine.h b/engines/tinsel/coroutine.h index 34d4865ce9..d4cd54a8db 100644 --- a/engines/tinsel/coroutine.h +++ b/engines/tinsel/coroutine.h @@ -242,6 +242,6 @@ public: //@} -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_COROUTINE_H diff --git a/engines/tinsel/cursor.cpp b/engines/tinsel/cursor.cpp index 1775eab891..15f8f05e07 100644 --- a/engines/tinsel/cursor.cpp +++ b/engines/tinsel/cursor.cpp @@ -693,4 +693,4 @@ bool isCursorShown() { return !(bTempHide || bHiddenCursor); } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/cursor.h b/engines/tinsel/cursor.h index 2648bca1ed..b3f7203f2b 100644 --- a/engines/tinsel/cursor.h +++ b/engines/tinsel/cursor.h @@ -55,6 +55,6 @@ void RebootCursor(void); void StartCursorFollowed(void); void EndCursorFollowed(void); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_CURSOR_H diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp index 1deed09f17..9550500867 100644 --- a/engines/tinsel/dialogs.cpp +++ b/engines/tinsel/dialogs.cpp @@ -5738,4 +5738,4 @@ bool IsConvWindow(void) { return (InventoryState == ACTIVE_INV && ino == INV_CONV); } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/dialogs.h b/engines/tinsel/dialogs.h index 91fb7f3240..9834d6ce57 100644 --- a/engines/tinsel/dialogs.h +++ b/engines/tinsel/dialogs.h @@ -165,6 +165,6 @@ void SetObjectFilm(int object, SCNHANDLE hFilm); void ObjectEvent(CORO_PARAM, int objId, TINSEL_EVENT event, bool bWait, int myEscape, bool *result = NULL); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif /* TINSEL_INVENTRY_H */ diff --git a/engines/tinsel/drives.cpp b/engines/tinsel/drives.cpp index 864c554b9c..b611e386b1 100644 --- a/engines/tinsel/drives.cpp +++ b/engines/tinsel/drives.cpp @@ -176,4 +176,4 @@ bool TinselFile::open(const Common::String &filename) { return Common::File::open(newFilename); } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/drives.h b/engines/tinsel/drives.h index 339f4384d0..51f9b0ca92 100644 --- a/engines/tinsel/drives.h +++ b/engines/tinsel/drives.h @@ -70,6 +70,6 @@ public: }; -} // end of namespace Tinsel +} // End of namespace Tinsel #endif /* TINSEL_DRIVES_H */ diff --git a/engines/tinsel/dw.h b/engines/tinsel/dw.h index 943d728354..8bd7ca1a4e 100644 --- a/engines/tinsel/dw.h +++ b/engines/tinsel/dw.h @@ -117,6 +117,6 @@ enum LANGUAGE { #define CANNOT_FIND_FILE "Cannot find file %s" #define NO_MEM "Cannot allocate memory for %s!" -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_DW_H diff --git a/engines/tinsel/events.cpp b/engines/tinsel/events.cpp index ea5dbf0655..55841e369d 100644 --- a/engines/tinsel/events.cpp +++ b/engines/tinsel/events.cpp @@ -668,4 +668,4 @@ bool GetProvNotProcessed() { return bProvNotProcessed; } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/events.h b/engines/tinsel/events.h index b26bb2c5b0..38fbb69715 100644 --- a/engines/tinsel/events.h +++ b/engines/tinsel/events.h @@ -139,6 +139,6 @@ void ProcessedProvisional(void); void ProvNotProcessed(void); bool GetProvNotProcessed(); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif /* TINSEL_EVENTS_H */ diff --git a/engines/tinsel/faders.cpp b/engines/tinsel/faders.cpp index 271bc52da9..1500a56c6d 100644 --- a/engines/tinsel/faders.cpp +++ b/engines/tinsel/faders.cpp @@ -241,4 +241,4 @@ void PokeInTagColour(void) { } } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/faders.h b/engines/tinsel/faders.h index 6e716c3604..b6993039c4 100644 --- a/engines/tinsel/faders.h +++ b/engines/tinsel/faders.h @@ -52,6 +52,6 @@ void FadeInMedium(SCNHANDLE noFadeTable[]); void FadeInFast(SCNHANDLE noFadeTable[]); void PokeInTagColour(void); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_FADERS_H diff --git a/engines/tinsel/film.h b/engines/tinsel/film.h index c8bf4604bc..231fbf28db 100644 --- a/engines/tinsel/film.h +++ b/engines/tinsel/film.h @@ -45,6 +45,6 @@ struct FILM { #include "common/pack-end.h" // END STRUCT PACKING -} // end of namespace Tinsel +} // End of namespace Tinsel #endif diff --git a/engines/tinsel/font.h b/engines/tinsel/font.h index fe2936eb80..e6e202fe6f 100644 --- a/engines/tinsel/font.h +++ b/engines/tinsel/font.h @@ -53,6 +53,6 @@ void ResetFontHandles(void); void FettleFontPal(SCNHANDLE fontPal); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_FONT_H diff --git a/engines/tinsel/graphics.h b/engines/tinsel/graphics.h index 9a05dbe785..8b8bb6488d 100644 --- a/engines/tinsel/graphics.h +++ b/engines/tinsel/graphics.h @@ -68,6 +68,6 @@ void DrawObject(DRAWOBJECT *pObj); // called to update a rectangle on the video screen from a video page void UpdateScreenRect(const Common::Rect &pClip); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp index 5ef5bea702..93536fd4e5 100644 --- a/engines/tinsel/handle.cpp +++ b/engines/tinsel/handle.cpp @@ -554,4 +554,4 @@ int CdNumber(SCNHANDLE offset) { return GetCD(pH->flags2 & fAllCds); } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/handle.h b/engines/tinsel/handle.h index 0e40309f11..4665124e5a 100644 --- a/engines/tinsel/handle.h +++ b/engines/tinsel/handle.h @@ -62,6 +62,6 @@ void LoadExtraGraphData( int CdNumber(SCNHANDLE offset); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_HANDLE_H diff --git a/engines/tinsel/heapmem.cpp b/engines/tinsel/heapmem.cpp index 5db2918d2f..edd012e760 100644 --- a/engines/tinsel/heapmem.cpp +++ b/engines/tinsel/heapmem.cpp @@ -603,4 +603,4 @@ MEM_NODE *MemoryHandle(void *pMem) { return NULL; } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/heapmem.h b/engines/tinsel/heapmem.h index 7fb85985a9..358c5f77b5 100644 --- a/engines/tinsel/heapmem.h +++ b/engines/tinsel/heapmem.h @@ -104,6 +104,6 @@ bool HeapCompact( // Allocates the specified number of bytes from the specified long size, // number of bytes to free up bool bDiscard); // when set - will discard blocks to fullfill the request -} // end of namespace Tinsel +} // End of namespace Tinsel #endif diff --git a/engines/tinsel/mareels.cpp b/engines/tinsel/mareels.cpp index cb20bac627..e0419cc1ec 100644 --- a/engines/tinsel/mareels.cpp +++ b/engines/tinsel/mareels.cpp @@ -190,4 +190,4 @@ void TouchMoverReels(void) { } while ((pMover = NextMover(pMover)) != NULL); } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/mareels.h b/engines/tinsel/mareels.h index cca406a04b..8421fa2ff4 100644 --- a/engines/tinsel/mareels.h +++ b/engines/tinsel/mareels.h @@ -51,6 +51,6 @@ void RebootScalingReels(void); void TouchMoverReels(void); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif diff --git a/engines/tinsel/move.cpp b/engines/tinsel/move.cpp index 25aeec67ba..84caa5082d 100644 --- a/engines/tinsel/move.cpp +++ b/engines/tinsel/move.cpp @@ -1745,4 +1745,4 @@ void DoMoveActor(PMOVER pActor) { } } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/move.h b/engines/tinsel/move.h index 9ab703839f..86100fae8e 100644 --- a/engines/tinsel/move.h +++ b/engines/tinsel/move.h @@ -45,6 +45,6 @@ int GetLastLeadYdest(void); DIRECTION GetDirection(int fromx, int fromy, int tox, int toy, DIRECTION lastreel, HPOLYGON hPath, YBIAS yBias = YB_X2); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif /* TINSEL_MOVE_H */ diff --git a/engines/tinsel/multiobj.cpp b/engines/tinsel/multiobj.cpp index b375f8bad5..fad6fa2951 100644 --- a/engines/tinsel/multiobj.cpp +++ b/engines/tinsel/multiobj.cpp @@ -562,4 +562,4 @@ void MultiForceRedraw(POBJECT pMultiObj) { } while (pMultiObj != NULL); } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/multiobj.h b/engines/tinsel/multiobj.h index 9bf1579363..79984f8dff 100644 --- a/engines/tinsel/multiobj.h +++ b/engines/tinsel/multiobj.h @@ -128,6 +128,6 @@ bool MultiHasShape( // Returns TRUE if the object currently has an image void MultiForceRedraw( POBJECT pMultiObj); // multi-part object to be forced -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_MULTIOBJ_H diff --git a/engines/tinsel/object.cpp b/engines/tinsel/object.cpp index adea6fbc21..a308745743 100644 --- a/engines/tinsel/object.cpp +++ b/engines/tinsel/object.cpp @@ -535,4 +535,4 @@ OBJECT *TranslucentObject(int width, int height) { return pRect; } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/object.h b/engines/tinsel/object.h index f77c113482..3dafcb3522 100644 --- a/engines/tinsel/object.h +++ b/engines/tinsel/object.h @@ -205,6 +205,6 @@ IMAGE *GetImageFromFilm(SCNHANDLE hFilm, int reel, const FREEL **ppfr = 0, const MULTI_INIT **ppmi = 0, const FILM **ppfilm = 0); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_OBJECT_H diff --git a/engines/tinsel/palette.cpp b/engines/tinsel/palette.cpp index 84e88fe06b..8918aa47e6 100644 --- a/engines/tinsel/palette.cpp +++ b/engines/tinsel/palette.cpp @@ -655,4 +655,4 @@ void SetTalkTextOffset(int offset) { talkIndex = offset; } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/palette.h b/engines/tinsel/palette.h index 259f693923..d5b64ae11f 100644 --- a/engines/tinsel/palette.h +++ b/engines/tinsel/palette.h @@ -179,6 +179,6 @@ void SetTalkTextOffset(int offset); void SetTranslucencyOffset(int offset); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_PALETTE_H diff --git a/engines/tinsel/pcode.cpp b/engines/tinsel/pcode.cpp index 07503ad2af..448972b7ed 100644 --- a/engines/tinsel/pcode.cpp +++ b/engines/tinsel/pcode.cpp @@ -917,4 +917,4 @@ void CheckOutWaiters(void) { } } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/pcode.h b/engines/tinsel/pcode.h index fad50cdb9d..02a091e617 100644 --- a/engines/tinsel/pcode.h +++ b/engines/tinsel/pcode.h @@ -175,6 +175,6 @@ void WaitInterpret(CORO_PARAM, PPROCESS pWaitProc, bool *result); #define ST_ON 0 // #define ST_OFF 1 // SubTitles() -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_PCODE_H diff --git a/engines/tinsel/pdisplay.cpp b/engines/tinsel/pdisplay.cpp index 17e9a3a517..25e3ec0a5e 100644 --- a/engines/tinsel/pdisplay.cpp +++ b/engines/tinsel/pdisplay.cpp @@ -847,4 +847,4 @@ void setshowstring(void) { bShowString = true; } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/pdisplay.h b/engines/tinsel/pdisplay.h index 7a67f3541c..d2efc23f96 100644 --- a/engines/tinsel/pdisplay.h +++ b/engines/tinsel/pdisplay.h @@ -32,6 +32,6 @@ namespace Tinsel { void EnableTags(void); void DisableTags(void); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif /* TINSEL_PDISPLAY_H */ diff --git a/engines/tinsel/pid.h b/engines/tinsel/pid.h index c7872d6432..786ccc6327 100644 --- a/engines/tinsel/pid.h +++ b/engines/tinsel/pid.h @@ -75,6 +75,6 @@ namespace Tinsel { #define PID_GPROCESS 0x0120 // Global process base -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_PID_H diff --git a/engines/tinsel/play.cpp b/engines/tinsel/play.cpp index 90709f6d31..b5967efa37 100644 --- a/engines/tinsel/play.cpp +++ b/engines/tinsel/play.cpp @@ -1169,4 +1169,4 @@ void RestoreActorReels(SCNHANDLE hFilm, int actor, int x, int y) { } } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/play.h b/engines/tinsel/play.h index dd79b304f8..7ac166f26a 100644 --- a/engines/tinsel/play.h +++ b/engines/tinsel/play.h @@ -59,6 +59,6 @@ void NoSoundReels(void); void SaveSoundReels(PSOUNDREELS psr); void RestoreSoundReels(PSOUNDREELS psr); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif diff --git a/engines/tinsel/polygons.cpp b/engines/tinsel/polygons.cpp index 3ee88c3112..53358aa9a2 100644 --- a/engines/tinsel/polygons.cpp +++ b/engines/tinsel/polygons.cpp @@ -2376,4 +2376,4 @@ void DisableExit(int exitno) { } } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/polygons.h b/engines/tinsel/polygons.h index 7cb22a1b8a..23beb76d6c 100644 --- a/engines/tinsel/polygons.h +++ b/engines/tinsel/polygons.h @@ -156,6 +156,6 @@ void MovePolygonTo(PTYPE ptype, int id, int x, int y); /*-------------------------------------------------------------------------*/ -} // end of namespace Tinsel +} // End of namespace Tinsel #endif /* TINSEL_POLYGONS_H */ diff --git a/engines/tinsel/rince.cpp b/engines/tinsel/rince.cpp index 5a46da4e05..21cbb76127 100644 --- a/engines/tinsel/rince.cpp +++ b/engines/tinsel/rince.cpp @@ -965,4 +965,4 @@ void StopMover(PMOVER pMover) { DoMoveActor(pMover); } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/rince.h b/engines/tinsel/rince.h index 4a60fdca07..aa6f16d795 100644 --- a/engines/tinsel/rince.h +++ b/engines/tinsel/rince.h @@ -222,6 +222,6 @@ enum { /*----------------------------------------------------------------------*/ -} // end of namespace Tinsel +} // End of namespace Tinsel #endif /* TINSEL_RINCE_H */ diff --git a/engines/tinsel/saveload.cpp b/engines/tinsel/saveload.cpp index 0069778531..79a47bc026 100644 --- a/engines/tinsel/saveload.cpp +++ b/engines/tinsel/saveload.cpp @@ -583,4 +583,4 @@ int NewestSavedGame(void) { return (numFiles == 0) ? -1 : 0; } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/savescn.cpp b/engines/tinsel/savescn.cpp index 32f375290f..16634b321b 100644 --- a/engines/tinsel/savescn.cpp +++ b/engines/tinsel/savescn.cpp @@ -474,4 +474,4 @@ void TinselSaveScene(CORO_PARAM) { CORO_END_CODE; } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/savescn.h b/engines/tinsel/savescn.h index e7a4f18adf..0f272c21bb 100644 --- a/engines/tinsel/savescn.h +++ b/engines/tinsel/savescn.h @@ -114,6 +114,6 @@ void RequestRestoreGame(int num, SAVED_DATA *sd, int *ssCount, SAVED_DATA *ssDat void InitialiseSaveScenes(void); void FreeSaveScenes(void); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif /* TINSEL_SAVESCN_H */ diff --git a/engines/tinsel/scene.cpp b/engines/tinsel/scene.cpp index a9ad9617c0..3f28018c71 100644 --- a/engines/tinsel/scene.cpp +++ b/engines/tinsel/scene.cpp @@ -494,4 +494,4 @@ void WrapScene(void) { SendSceneTinselProcess(CLOSEDOWN); } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/scene.h b/engines/tinsel/scene.h index e47f0b864c..8420c3f1cc 100644 --- a/engines/tinsel/scene.h +++ b/engines/tinsel/scene.h @@ -92,6 +92,6 @@ void EndScene(void); void SendSceneTinselProcess(TINSEL_EVENT event); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_SCENE_H diff --git a/engines/tinsel/sched.cpp b/engines/tinsel/sched.cpp index 295df019c8..d39d01117b 100644 --- a/engines/tinsel/sched.cpp +++ b/engines/tinsel/sched.cpp @@ -759,4 +759,4 @@ void FreeGlobalProcesses() { numGlobalProcess = 0; } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/sched.h b/engines/tinsel/sched.h index 67b11271cd..07ca44bf54 100644 --- a/engines/tinsel/sched.h +++ b/engines/tinsel/sched.h @@ -143,6 +143,6 @@ void RestoreGlobalProcess(INT_CONTEXT *pic); void KillGlobalProcesses(void); void FreeGlobalProcesses(); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_SCHED_H diff --git a/engines/tinsel/scn.cpp b/engines/tinsel/scn.cpp index e0b4188b90..6672b35b27 100644 --- a/engines/tinsel/scn.cpp +++ b/engines/tinsel/scn.cpp @@ -82,4 +82,4 @@ int ExtractActor(SCNHANDLE hFilm) { return (int)FROM_LE_32(pmi->mulID); } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/scn.h b/engines/tinsel/scn.h index 2e49765351..6c57a595f8 100644 --- a/engines/tinsel/scn.h +++ b/engines/tinsel/scn.h @@ -94,6 +94,6 @@ namespace Tinsel { byte *FindChunk(SCNHANDLE handle, uint32 chunk); int ExtractActor(SCNHANDLE hFilm); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif /* TINSEL_SCN_H */ diff --git a/engines/tinsel/scroll.cpp b/engines/tinsel/scroll.cpp index f31f596c43..65980c061b 100644 --- a/engines/tinsel/scroll.cpp +++ b/engines/tinsel/scroll.cpp @@ -532,4 +532,4 @@ bool IsScrolling(void) { return (LeftScroll || DownScroll); } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/scroll.h b/engines/tinsel/scroll.h index 864fe74beb..2c5f52d9ec 100644 --- a/engines/tinsel/scroll.h +++ b/engines/tinsel/scroll.h @@ -87,6 +87,6 @@ void SetScrollParameters(int xTrigger, int xDistance, int xSpeed, int yTriggerTo bool IsScrolling(void); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif /* TINSEL_SCROLL_H */ diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index 528a0c78f8..ad7027c3e4 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -567,4 +567,4 @@ void SoundManager::closeSampleStream(void) { _sampleIndexLen = 0; } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/sound.h b/engines/tinsel/sound.h index 27682a4a21..4f37108949 100644 --- a/engines/tinsel/sound.h +++ b/engines/tinsel/sound.h @@ -125,6 +125,6 @@ public: void closeSampleStream(void); }; -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_SOUND_H diff --git a/engines/tinsel/strres.cpp b/engines/tinsel/strres.cpp index 6f0c471878..2e9bade209 100644 --- a/engines/tinsel/strres.cpp +++ b/engines/tinsel/strres.cpp @@ -439,4 +439,4 @@ SCNHANDLE LanguageFlag(LANGUAGE thisOne) { return languages[thisOne].hFlagFilm; } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/strres.h b/engines/tinsel/strres.h index c996317b21..1c8e8f56cd 100644 --- a/engines/tinsel/strres.h +++ b/engines/tinsel/strres.h @@ -96,7 +96,7 @@ LANGUAGE PrevLanguage(LANGUAGE thisOne); SCNHANDLE LanguageDesc(LANGUAGE thisOne); SCNHANDLE LanguageFlag(LANGUAGE thisOne); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif diff --git a/engines/tinsel/sysvar.cpp b/engines/tinsel/sysvar.cpp index c489e4523b..88c702609d 100644 --- a/engines/tinsel/sysvar.cpp +++ b/engines/tinsel/sysvar.cpp @@ -215,4 +215,4 @@ void SetNoBlocking(bool flag) { SetSysVar(ISV_NO_BLOCKING, flag); } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/sysvar.h b/engines/tinsel/sysvar.h index 8866558e62..0cb830ec91 100644 --- a/engines/tinsel/sysvar.h +++ b/engines/tinsel/sysvar.h @@ -144,6 +144,6 @@ bool GetNoBlocking(void); void SetNoBlocking(bool flag); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif diff --git a/engines/tinsel/text.cpp b/engines/tinsel/text.cpp index fbeee9b8ed..c7c921b935 100644 --- a/engines/tinsel/text.cpp +++ b/engines/tinsel/text.cpp @@ -277,4 +277,4 @@ bool IsCharImage(SCNHANDLE hFont, char c) { return pFont->fontDef[c2] != 0; } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/text.h b/engines/tinsel/text.h index 29e1a08bfe..3a61eb3cfc 100644 --- a/engines/tinsel/text.h +++ b/engines/tinsel/text.h @@ -108,6 +108,6 @@ bool IsCharImage( // Is there an image for this character in this font? SCNHANDLE hFont, // which font to use char c); // character to test -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_TEXT_H diff --git a/engines/tinsel/timers.cpp b/engines/tinsel/timers.cpp index a627b05c31..8ac715a52b 100644 --- a/engines/tinsel/timers.cpp +++ b/engines/tinsel/timers.cpp @@ -189,4 +189,4 @@ int Timer(int num) { return pt->secs; } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/timers.h b/engines/tinsel/timers.h index a03786ff97..5437890790 100644 --- a/engines/tinsel/timers.h +++ b/engines/tinsel/timers.h @@ -50,6 +50,6 @@ void StartTimer(int num, int sval, bool up, bool frame); int Timer(int num); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp index 2a5fc5af08..0f83906917 100644 --- a/engines/tinsel/tinlib.cpp +++ b/engines/tinsel/tinlib.cpp @@ -5642,4 +5642,4 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi //error("Can't possibly get here"); } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/tinlib.h b/engines/tinsel/tinlib.h index 6dded5a563..27d38a9a22 100644 --- a/engines/tinsel/tinlib.h +++ b/engines/tinsel/tinlib.h @@ -64,6 +64,6 @@ void KeepOnScreen(OBJECT *pText, int *pTextX, int *pTextY); enum SPEECH_TYPE { IS_SAY, IS_SAYAT, IS_TALK, IS_TALKAT }; -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_TINLIB_H diff --git a/engines/tinsel/token.cpp b/engines/tinsel/token.cpp index 0bdac0d6eb..1c78f462b1 100644 --- a/engines/tinsel/token.cpp +++ b/engines/tinsel/token.cpp @@ -126,4 +126,4 @@ void FreeAllTokens(void) { } } -} // end of namespace Tinsel +} // End of namespace Tinsel diff --git a/engines/tinsel/token.h b/engines/tinsel/token.h index 4ab4775bfb..906ce4589d 100644 --- a/engines/tinsel/token.h +++ b/engines/tinsel/token.h @@ -52,6 +52,6 @@ void FreeAllTokens(void); bool TestToken(int which); -} // end of namespace Tinsel +} // End of namespace Tinsel #endif // TINSEL_TOKEN_H |