[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.195,1.196 scumm.h,1.540,1.541

Max Horn fingolfin at users.sourceforge.net
Tue Mar 15 13:21:49 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27935

Modified Files:
	saveload.cpp scumm.h 
Log Message:
Use better variable names...

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- saveload.cpp	7 Mar 2005 00:53:30 -0000	1.195
+++ saveload.cpp	15 Mar 2005 21:20:44 -0000	1.196
@@ -52,9 +52,9 @@
 };
 
 
-void ScummEngine::requestSave(int slot, const char *name, bool compatible) {
+void ScummEngine::requestSave(int slot, const char *name, bool temporary) {
 	_saveLoadSlot = slot;
-	_saveTemporaryState = compatible;
+	_saveTemporaryState = temporary;
 	_saveLoadFlag = 1;		// 1 for save
 	assert(name);
 	strcpy(_saveLoadName, name);
@@ -345,8 +345,8 @@
 	return true;
 }
 
-void ScummEngine::makeSavegameName(char *out, int slot, bool compatible) {
-	sprintf(out, "%s.%c%.2d", _targetName.c_str(), compatible ? 'c' : 's', slot);
+void ScummEngine::makeSavegameName(char *out, int slot, bool temporary) {
+	sprintf(out, "%s.%c%.2d", _targetName.c_str(), temporary ? 'c' : 's', slot);
 }
 
 void ScummEngine::listSavegames(bool *marks, int num) {

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.540
retrieving revision 1.541
diff -u -d -r1.540 -r1.541
--- scumm.h	14 Mar 2005 21:13:35 -0000	1.540
+++ scumm.h	15 Mar 2005 21:20:44 -0000	1.541
@@ -524,7 +524,7 @@
 	void saveLoadResource(Serializer *ser, int type, int index);	// "Obsolete"
 	void saveResource(Serializer *ser, int type, int index);
 	void loadResource(Serializer *ser, int type, int index);
-	void makeSavegameName(char *out, int slot, bool compatible);
+	void makeSavegameName(char *out, int slot, bool temporary);
 
 	int getKeyState(int key);
 
@@ -532,7 +532,7 @@
 	bool getSavegameName(int slot, char *desc);
 	void listSavegames(bool *marks, int num);
 	
-	void requestSave(int slot, const char *name, bool compatible = false);
+	void requestSave(int slot, const char *name, bool temporary = false);
 	void requestLoad(int slot);
 
 	void lock(int type, int i);





More information about the Scummvm-git-logs mailing list