diff options
| author | Johannes Schickel | 2010-07-16 23:30:29 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-07-16 23:30:29 +0000 |
| commit | bf17cc1053b4273ff21f069e161fdb38b4aec83a (patch) | |
| tree | 1d717b79d3a2218fc3dbf91700243462076706d8 /engines/kyra | |
| parent | aa631a64dce17e89cc657b4588af0ba032b9664d (diff) | |
| download | scummvm-rg350-bf17cc1053b4273ff21f069e161fdb38b4aec83a.tar.gz scummvm-rg350-bf17cc1053b4273ff21f069e161fdb38b4aec83a.tar.bz2 scummvm-rg350-bf17cc1053b4273ff21f069e161fdb38b4aec83a.zip | |
In the help of making the new C++ standard a better one, we will now no longer rely on using parent class names in friend classes of a subclass.
svn-id: r50952
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/gui_lok.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/gui_lol.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/gui_v2.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp index c8b7e8ec4f..9a1d750391 100644 --- a/engines/kyra/gui_lok.cpp +++ b/engines/kyra/gui_lok.cpp @@ -579,7 +579,7 @@ void GUI_LoK::setupSavegames(Menu &menu, int num) { for (int i = startSlot; i < num; ++i) menu.item[i].enabled = 0; - KyraEngine_v1::SaveHeader header; + KyraEngine_LoK::SaveHeader header; for (int i = startSlot; i < num && uint(_savegameOffset + i) < _saveSlots.size(); i++) { if ((in = _vm->openSaveForReading(_vm->getSavegameFilename(_saveSlots[i + _savegameOffset]), header))) { Common::strlcpy(savenames[i], header.description.c_str(), ARRAYSIZE(savenames[0])); diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp index ded1326110..2c86073892 100644 --- a/engines/kyra/gui_lol.cpp +++ b/engines/kyra/gui_lol.cpp @@ -2611,7 +2611,7 @@ void GUI_LoL::updateSavegameList() { if (_savegameListSize) { Common::sort(_saveSlots.begin(), _saveSlots.end(), Common::Greater<int>()); - KyraEngine_v1::SaveHeader header; + LoLEngine::SaveHeader header; Common::InSaveFile *in; _savegameList = new char *[_savegameListSize]; @@ -2658,7 +2658,7 @@ int GUI_LoL::getInput() { if (_currentMenu == &_savenameMenu) { _vm->updateInput(); - for (Common::List<KyraEngine_v1::Event>::const_iterator evt = _vm->_eventList.begin(); evt != _vm->_eventList.end(); ++evt) { + for (Common::List<LoLEngine::Event>::const_iterator evt = _vm->_eventList.begin(); evt != _vm->_eventList.end(); ++evt) { if (evt->event.type == Common::EVENT_KEYDOWN) _keyPressed = evt->event.kbd; } diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp index de19228d16..fe4b54d09b 100644 --- a/engines/kyra/gui_v2.cpp +++ b/engines/kyra/gui_v2.cpp @@ -452,7 +452,7 @@ void GUI_v2::setupSavegameNames(Menu &menu, int num) { if (_isSaveMenu && _savegameOffset == 0) startSlot = 1; - KyraEngine_v1::SaveHeader header; + KyraEngine_v2::SaveHeader header; Common::InSaveFile *in; for (int i = startSlot; i < num && uint(_savegameOffset + i) < _saveSlots.size(); ++i) { if ((in = _vm->openSaveForReading(_vm->getSavegameFilename(_saveSlots[i + _savegameOffset]), header)) != 0) { |