[Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.12,1.13 game.h,1.6,1.7

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Wed May 5 05:06:01 CEST 2004


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

Modified Files:
	game.cpp game.h 
Log Message:
Removed data_dir, since it wasn't used.


Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- game.cpp	2 May 2004 01:39:14 -0000	1.12
+++ game.cpp	5 May 2004 12:05:00 -0000	1.13
@@ -282,7 +282,6 @@
 	debug(0, "Using game data path: %s", gamedir);
 
 	strcpy(GameModule.game_dir, gamedir);
-	strcpy(GameModule.data_dir, ".");
 }
 
 int GAME_Register() {
@@ -296,14 +295,6 @@
 		return R_FAILURE;
 	}
 
-	// Register "datadir" cfg cvar
-	strncpy(GameModule.data_dir, "./", R_MAXPATH);
-
-	if (CVAR_Register_S(GameModule.data_dir,
-		"datadir", NULL, R_CVAR_CFG, R_MAXPATH) != R_SUCCESS) {
-		return R_FAILURE;
-	}
-
 	// Register "g_language" cfg cvar
 	strncpy(GameModule.game_dir, "us", R_MAXPATH);
 

Index: game.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- game.h	2 May 2004 01:39:14 -0000	1.6
+++ game.h	5 May 2004 12:05:00 -0000	1.7
@@ -81,7 +81,6 @@
 	R_GAMEDESC *gamedesc;
 	int g_skipintro;
 	char game_dir[R_MAXPATH];
-	char data_dir[R_MAXPATH];
 	char game_language[R_GAME_LANGSTR_LIMIT];
 	uint16 gfile_n;
 	R_GAME_FILEDATA *gfile_data;





More information about the Scummvm-git-logs mailing list