[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.17,1.18 scumm.h,1.50,1.51 scummvm.cpp,1.66,1.67

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv23319/scumm

Modified Files:
	saveload.cpp scumm.h scummvm.cpp 
Log Message:
Add support for aliased scummvm config entries.

Eg:
 [germandott]
 path=/games/german/dott
 gameid=tentacle
 description=the german version of DOTT

I havn't finished the Launcher changes to show aliased entries yet, as I need to parse the whole domainmap to do so.



Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- saveload.cpp	24 Oct 2002 21:39:44 -0000	1.17
+++ saveload.cpp	28 Oct 2002 09:03:01 -0000	1.18
@@ -181,7 +181,7 @@
 	const char *dir = getSavePath();
 
 	// snprintf should be used here, but it's not portable enough
-	sprintf(out, "%s%s.%c%.2d", dir, _exe_name, compatible ? 'c' : 's', slot);
+	sprintf(out, "%s%s.%c%.2d", dir, _game_name, compatible ? 'c' : 's', slot);
 }
 
 bool Scumm::getSavegameName(int slot, char *desc)

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- scumm.h	27 Oct 2002 19:32:35 -0000	1.50
+++ scumm.h	28 Oct 2002 09:03:02 -0000	1.51
@@ -571,7 +571,8 @@
 	File _fileHandle;
 	char *_resFilePrefix, *_resFilePath;
 	uint32 _fileOffset;
-	char *_exe_name;
+	char *_exe_name;	// This is the name we use for opening resource files
+	char *_game_name;	// This is the game the user calls it, so use for saving
 	bool _dynamicRoomOffsets;
 	byte _resourceMapper[128];
 	uint32 _allocatedSize;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- scummvm.cpp	28 Oct 2002 07:55:29 -0000	1.66
+++ scummvm.cpp	28 Oct 2002 09:03:02 -0000	1.67
@@ -80,7 +80,8 @@
 
 	_debugMode = detector->_debugMode;
 	_bootParam = detector->_bootParam;
-	_exe_name = (char*)detector->_gameFileName.c_str();
+	_exe_name = (char*)detector->_gameRealName.c_str();
+	_game_name = (char*)detector->_gameFileName.c_str();
 	_gameId = detector->_gameId;
 	_features = detector->_features;
 	_soundCardType = detector->_soundCardType;