[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.225,1.226 script_v8.cpp,2.252,2.253
Max Horn
fingolfin at users.sourceforge.net
Sun Jun 27 17:01:04 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5203
Modified Files:
resource.cpp script_v8.cpp
Log Message:
Don't use getGameDataPath()
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- resource.cpp 27 Jun 2004 22:14:33 -0000 1.225
+++ resource.cpp 28 Jun 2004 00:00:32 -0000 1.226
@@ -239,7 +239,7 @@
#ifdef MACOSX
sprintf(buf, "Cannot find file: '%s'\nPlease insert disc %d.\nPress OK to retry, Quit to exit", filename, disknum);
#else
- sprintf(buf, "Cannot find file: '%s'\nInsert disc %d into drive %s\nPress OK to retry, Quit to exit", filename, disknum, getGameDataPath());
+ sprintf(buf, "Cannot find file: '%s'\nInsert disc %d into drive %s\nPress OK to retry, Quit to exit", filename, disknum, _gameDataPath.c_str());
#endif
result = displayMessage("Quit", buf);
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.252
retrieving revision 2.253
diff -u -d -r2.252 -r2.253
--- script_v8.cpp 27 Jun 2004 21:52:23 -0000 2.252
+++ script_v8.cpp 28 Jun 2004 00:00:33 -0000 2.253
@@ -1241,7 +1241,7 @@
void ScummEngine_v8::o8_startVideo() {
int len = resStrLen(_scriptPointer);
- debug(4, "o8_startVideo(%s/%s)", getGameDataPath(), (const char*)_scriptPointer);
+ debug(4, "o8_startVideo(%s)", (const char*)_scriptPointer);
SmushPlayer *sp = new SmushPlayer(this, 1000000 / 12);
sp->play((const char*)_scriptPointer);
More information about the Scummvm-git-logs
mailing list