- renaming all opcodes from cmd_* to c1_*

- changing ScriptHelper functions so it will be useable for kyra2 and kyra3 too
- unbreaking savegames (increasing the VERSION number since the game flags table got resized to be useable for kyra3)

svn-id: r23612

1 files changed, 3 insertions, 2 deletions

diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp
index 13caa36ed9..d34dc66097 100644
--- a/engines/kyra/saveload.cpp
+++ b/engines/kyra/saveload.cpp
@@ -30,7 +30,7 @@
 #include "kyra/screen.h"
 #include "kyra/resource.h"
 
-#define CURRENT_VERSION 5
+#define CURRENT_VERSION 6
 
 namespace Kyra {
 void KyraEngine::loadGame(const char *fileName) {
@@ -145,8 +145,9 @@ void KyraEngine::loadGame(const char *fileName) {
 	}
 	_timerNextRun = 0;
 
+	memset(_flagsTable, 0, sizeof(_flagsTable));
 	uint32 flagsSize = in->readUint32BE();
-	assert(flagsSize == sizeof(_flagsTable));
+	assert(flagsSize <= sizeof(_flagsTable));
 	in->read(_flagsTable, flagsSize);
 
 	for (int i = 0; i < _roomTableSize; ++i) {