[Scummvm-cvs-logs] SF.net SVN: scummvm:[50952] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 50952
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50952&view=rev
Author:   lordhoto
Date:     2010-07-16 23:30:29 +0000 (Fri, 16 Jul 2010)

Log Message:
-----------
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.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui_lok.cpp
    scummvm/trunk/engines/kyra/gui_lol.cpp
    scummvm/trunk/engines/kyra/gui_v2.cpp

Modified: scummvm/trunk/engines/kyra/gui_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lok.cpp	2010-07-16 23:23:30 UTC (rev 50951)
+++ scummvm/trunk/engines/kyra/gui_lok.cpp	2010-07-16 23:30:29 UTC (rev 50952)
@@ -579,7 +579,7 @@
 	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]));

Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp	2010-07-16 23:23:30 UTC (rev 50951)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp	2010-07-16 23:30:29 UTC (rev 50952)
@@ -2611,7 +2611,7 @@
 	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 @@
 	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;
 		}

Modified: scummvm/trunk/engines/kyra/gui_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_v2.cpp	2010-07-16 23:23:30 UTC (rev 50951)
+++ scummvm/trunk/engines/kyra/gui_v2.cpp	2010-07-16 23:30:29 UTC (rev 50952)
@@ -452,7 +452,7 @@
 	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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.