backported some changes for OS

- added parsing of VOL.CNF to get the (filename,bundle) mapping (should be more efficient than testing every bundle file)
- delphineUnpack allows "inplace unpacking", use this instead of allocating temporary buffers
- relation script run count should be set in _localVars[0]
- added comments for some "special" script variables

svn-id: r29749

1 files changed, 15 insertions, 2 deletions

diff --git a/engines/cine/cine.h b/engines/cine/cine.h
index b225f9490a..8d9fdb6f8e 100644
--- a/engines/cine/cine.h
+++ b/engines/cine/cine.h
@@ -30,6 +30,9 @@
 #include "common/scummsys.h"
 #include "common/file.h"
 #include "common/util.h"
+#include "common/str.h"
+#include "common/hashmap.h"
+#include "common/hash-str.h"
 
 #include "engines/engine.h"
 
@@ -61,6 +64,8 @@ enum CineGameFeatures {
 
 struct CINEGameDescription;
 
+typedef Common::HashMap<Common::String, const char *, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> StringPtrHashMap;
+
 class CineEngine : public Engine {
 
 protected:
@@ -87,10 +92,14 @@ public:
 
 	Common::RandomSource _rnd;
 
+	Common::StringList _volumeResourceFiles;
+	StringPtrHashMap _volumeEntriesMap;
+
 private:
 	void initialize(void);
 	bool makeLoad(char *saveName);
 	void mainLoop(int bootScriptIdx);
+	void readVolCnf();
 
 	bool _preLoad;
 };
@@ -103,7 +112,10 @@ enum {
 	VAR_MOUSE_X_MODE = 253,
 	VAR_MOUSE_X_POS = 249,
 	VAR_MOUSE_Y_MODE = 251,
-	VAR_MOUSE_Y_POS = 250
+	VAR_MOUSE_Y_POS = 250,
+	// OS only
+	VAR_BYPASS_PROTECTION = 255,
+	VAR_LOW_MEMORY = 0
 };
 
 enum {
@@ -113,7 +125,8 @@ enum {
 };
 
 enum {
-	kCineDebugScript = 1 << 0
+	kCineDebugScript = 1 << 0,
+	kCineDebugPart   = 1 << 1
 };
 
 enum {