aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2009-10-09 21:36:09 +0000
committerMax Horn2009-10-09 21:36:09 +0000
commita8cd7694ccea215b6f003899333b1d727384b5b5 (patch)
treea3c06e008c9f9c091ec0b3025d92524b03d19912
parent0d7d2b8371e5d903fe0390de8656e33bf0fabdb2 (diff)
downloadscummvm-rg350-a8cd7694ccea215b6f003899333b1d727384b5b5.tar.gz
scummvm-rg350-a8cd7694ccea215b6f003899333b1d727384b5b5.tar.bz2
scummvm-rg350-a8cd7694ccea215b6f003899333b1d727384b5b5.zip
Fix warnings about non-static const member in class without a constructor
svn-id: r44848
-rw-r--r--engines/cine/script.h2
-rw-r--r--engines/kyra/kyra_v2.h8
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/cine/script.h b/engines/cine/script.h
index 5b930e3f64..f3920448f3 100644
--- a/engines/cine/script.h
+++ b/engines/cine/script.h
@@ -47,7 +47,7 @@ class FWScript;
typedef int (FWScript::*OpFunc)();
struct Opcode {
- const OpFunc proc;
+ OpFunc proc;
const char *args;
};
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h
index 82bb475e25..ca6499e74e 100644
--- a/engines/kyra/kyra_v2.h
+++ b/engines/kyra/kyra_v2.h
@@ -59,17 +59,17 @@ friend class GUI_v2;
public:
struct EngineDesc {
// Generic shape related
- const int itemShapeStart;
+ int itemShapeStart;
const uint8 *characterFrameTable;
// Scene script
- const int firstAnimSceneScript;
+ int firstAnimSceneScript;
// Animation script specific
- const int animScriptFrameAdd;
+ int animScriptFrameAdd;
// Item specific
- const int maxItemId;
+ int maxItemId;
};
KyraEngine_v2(OSystem *system, const GameFlags &flags, const EngineDesc &desc);