[Scummvm-cvs-logs] SF.net SVN: scummvm: [25562] scummvm/trunk/engines/parallaction

peres001 at users.sourceforge.net peres001 at users.sourceforge.net
Tue Feb 13 22:06:14 CET 2007


Revision: 25562
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25562&view=rev
Author:   peres001
Date:     2007-02-13 13:06:13 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/loadsave.cpp
    scummvm/trunk/engines/parallaction/parallaction.h

Modified: scummvm/trunk/engines/parallaction/loadsave.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/loadsave.cpp	2007-02-13 21:04:31 UTC (rev 25561)
+++ scummvm/trunk/engines/parallaction/loadsave.cpp	2007-02-13 21:06:13 UTC (rev 25562)
@@ -705,20 +705,10 @@
 }
 
 
-int Parallaction::selectSaveFile(uint16 arg_0) {
+int Parallaction::selectSaveFile(uint16 arg_0, const char* caption, const char* button) {
 
-    const Common::String caption[2] = {
-        "Load file",
-        "Save file"
-    };
+    SaveLoadChooser* slc = new SaveLoadChooser(caption, button, _vm);
 
-    const Common::String button[2] = {
-        "Load",
-        "Save"
-    };
-
-    SaveLoadChooser* slc = new SaveLoadChooser(caption[arg_0], button[arg_0], _vm);
-
 	Common::StringList l;
 
     /*int count = */ buildSaveFileList(l);
@@ -735,7 +725,7 @@
 
 void Parallaction::loadGame() {
 
-	int _di = selectSaveFile( 0 );
+	int _di = selectSaveFile( 0, "Load file", "Load" );
 	if (_di == -1) {
 	    return;
 	}
@@ -757,7 +747,7 @@
 
 	if (!scumm_stricmp(_location, "caveau")) return;
 
-	int slot = selectSaveFile( 1 );
+	int slot = selectSaveFile( 1, "Save file", "Save" );
 	if (slot == -1) {
 	    return;
 	}

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2007-02-13 21:04:31 UTC (rev 25561)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2007-02-13 21:06:13 UTC (rev 25562)
@@ -300,7 +300,7 @@
 
     Common::String      _saveFileName;
     int         buildSaveFileList(Common::StringList& l);
-    int         selectSaveFile(uint16 arg_0);
+    int         selectSaveFile(uint16 arg_0, const char* caption, const char* button);
 	void		doLoadGame(uint16 slot);
 	void		doSaveGame(uint16 slot, const char* name);
 


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




More information about the Scummvm-git-logs mailing list