diff options
author | Max Horn | 2009-10-04 21:26:33 +0000 |
---|---|---|
committer | Max Horn | 2009-10-04 21:26:33 +0000 |
commit | f242266f6dc1f18e1b47aa4942c263cf81b75300 (patch) | |
tree | 349e8aa3db0d2dfbb54676aa84bb13d2e40dabdf /engines/kyra | |
parent | c8f002ae437677c08ab6154983c70f146607bfaa (diff) | |
download | scummvm-rg350-f242266f6dc1f18e1b47aa4942c263cf81b75300.tar.gz scummvm-rg350-f242266f6dc1f18e1b47aa4942c263cf81b75300.tar.bz2 scummvm-rg350-f242266f6dc1f18e1b47aa4942c263cf81b75300.zip |
Change a couple places from 'end of namespace' to 'End of namespace', for consistency
svn-id: r44634
Diffstat (limited to 'engines/kyra')
106 files changed, 111 insertions, 111 deletions
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 |