fixed object flags, it's right shifted half byte

svn-id: r7049

1 files changed, 20 insertions, 18 deletions

diff --git a/scumm/intern.h b/scumm/intern.h
index a69b3e37e6..3abe5a9373 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -194,18 +194,20 @@ protected:
 	virtual const char *getOpcodeDesc(int i);
 	virtual void getResultPos();
 	virtual void getResultPosDirect();
-	virtual void ifStateGeneral(byte type);
-	virtual void ifNotStateGeneral(byte type);
+	virtual void ifStateCommon(byte type);
+	virtual void ifNotStateCommon(byte type);
+	virtual void setStateCommon(byte type);
+	virtual void clearStateCommon(byte type);
 
 	/* Version 2 script opcodes */
-	void o2_setState80();
-	void o2_clearState80();
-	void o2_setState40();
-	void o2_clearState40();
-	void o2_setState20();
-	void o2_clearState20();
-	void o2_setState10();
-	void o2_clearState10();
+	void o2_setState08();
+	void o2_clearState08();
+	void o2_setState04();
+	void o2_clearState04();
+	void o2_setState02();
+	void o2_clearState02();
+	void o2_setState01();
+	void o2_clearState01();
 	void o2_assignVarByteDirect();
 	void o2_assignVarWordDirect();
 	void o2_assignVarByte();
@@ -216,14 +218,14 @@ protected:
 	void o2_getBitVar();
 	void o2_addDirect();
 	void o2_subDirect();
-	void o2_ifState80();
-	void o2_ifNotState80();
-	void o2_ifState40();
-	void o2_ifNotState40();
-	void o2_ifState20();
-	void o2_ifNotState20();
-	void o2_ifState10();
-	void o2_ifNotState10();
+	void o2_ifState08();
+	void o2_ifNotState08();
+	void o2_ifState04();
+	void o2_ifNotState04();
+	void o2_ifState02();
+	void o2_ifNotState02();
+	void o2_ifState01();
+	void o2_ifNotState01();
 	void o2_actorSet();
 	void o2_waitForActor();
 	void o2_waitForSentence();