[Scummvm-cvs-logs] CVS: residual engine.cpp,1.36,1.37 engine.h,1.9,1.10 lua.cpp,1.70,1.71
Pawel Kolodziejski
aquadran at users.sourceforge.net
Mon Nov 1 02:30:25 CET 2004
Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12787
Modified Files:
engine.cpp engine.h lua.cpp
Log Message:
added save ,load funcs
Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- engine.cpp 31 Oct 2004 09:31:34 -0000 1.36
+++ engine.cpp 1 Nov 2004 09:47:19 -0000 1.37
@@ -46,6 +46,10 @@
unsigned int frameCounter = 0;
unsigned int timeAccum = 0;
char fps[8] = "";
+ _savegameLoadRequest = false;
+ _savegameSaveRequest = false;
+ _savegameFileName = NULL;
+
for (;;) {
// Process events
Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- engine.h 20 Mar 2004 08:22:51 -0000 1.9
+++ engine.h 1 Nov 2004 09:47:19 -0000 1.10
@@ -140,6 +140,10 @@
}
}
+ bool _savegameLoadRequest;
+ bool _savegameSaveRequest;
+ char *_savegameFileName;
+
private:
static Engine *instance_;
Index: lua.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- lua.cpp 31 Oct 2004 15:34:13 -0000 1.70
+++ lua.cpp 1 Nov 2004 09:47:19 -0000 1.71
@@ -1192,6 +1192,32 @@
current_script();
}
+static void Load() {
+ lua_Object fileName = lua_getparam(1);
+ if (lua_isnil(fileName)) {
+ Engine::instance()->_savegameFileName = NULL;
+ } else if (lua_isstring(fileName)) {
+ Engine::instance()->_savegameFileName = lua_getstring(fileName);
+ } else {
+ warning("Load() fileName is wrong");
+ return;
+ }
+ Engine::instance()->_savegameLoadRequest = true;
+}
+
+static void Save() {
+ lua_Object fileName = lua_getparam(1);
+ if (lua_isnil(fileName)) {
+ Engine::instance()->_savegameFileName = NULL;
+ } else if (lua_isstring(fileName)) {
+ Engine::instance()->_savegameFileName = lua_getstring(fileName);
+ } else {
+ warning("Save() fileName is wrong");
+ return;
+ }
+ Engine::instance()->_savegameSaveRequest = true;
+}
+
// Stub function for builtin functions not yet implemented
static void stubWarning() {
@@ -1395,8 +1421,6 @@
"GetActorTimeScale",
"SetActorScale",
"SetActorColormap",
- "Save",
- "Load",
"SearchForFileOrSwapCDs",
"EngineDisplay",
"SetOffscreenTextPos",
@@ -1680,7 +1704,9 @@
{ "GetTextCharPosition", GetTextCharPosition },
{ "GetDiskFreeSpace", GetDiskFreeSpace },
{ "Is3DHardwareEnabled", Is3DHardwareEnabled },
- { "GetCurrentScript", GetCurrentScript }
+ { "GetCurrentScript", GetCurrentScript },
+ { "Save", Save },
+ { "Load", Load }
};
void register_lua() {
More information about the Scummvm-git-logs
mailing list