aboutsummaryrefslogtreecommitdiff
path: root/queen/logic.h
diff options
context:
space:
mode:
authorGregory Montoir2003-12-11 10:03:35 +0000
committerGregory Montoir2003-12-11 10:03:35 +0000
commitae338068025ec17d952af996267a6cad59b5187e (patch)
treed4a6769b29cb19194854595aee8c5d16368fc3b3 /queen/logic.h
parent3c9c652f13912020fd3d0c90cd2820ae18508f16 (diff)
downloadscummvm-rg350-ae338068025ec17d952af996267a6cad59b5187e.tar.gz
scummvm-rg350-ae338068025ec17d952af996267a6cad59b5187e.tar.bz2
scummvm-rg350-ae338068025ec17d952af996267a6cad59b5187e.zip
centralize all State related stuff
svn-id: r11577
Diffstat (limited to 'queen/logic.h')
-rw-r--r--queen/logic.h58
1 files changed, 1 insertions, 57 deletions
diff --git a/queen/logic.h b/queen/logic.h
index 87143c48f4..16ef37c62f 100644
--- a/queen/logic.h
+++ b/queen/logic.h
@@ -25,6 +25,7 @@
#include "common/util.h"
#include "queen/defs.h"
#include "queen/structs.h"
+#include "queen/state.h" // for joeGrabDirection()
#include "queen/verb.h"
namespace Queen {
@@ -41,63 +42,6 @@ struct ZoneSlot {
Box box;
};
-
-/*!
- Each object/item in game has a state field.
- (refer to ObjectData and ItemData).
-
- <table>
- <tr>
- <td>Name</td>
- <td>Bits</td>
- <td>Description</td>
- </tr>
- <tr>
- <td>USE</td>
- <td>10</td>
- <td>Use</td>
- </tr>
- <tr>
- <td>TALK</td>
- <td>9</td>
- <td>Talk</td>
- </tr>
- <tr>
- <td>ON</td>
- <td>8</td>
- <td>On/Off</td>
- </tr>
- <tr>
- <td>DEF</td>
- <td>7,6,5,4</td>
- <td>Default verb command</td>
- </tr>
- <tr>
- <td>DIR</td>
- <td>3,2</td>
- <td>Direction faced</td>
- </tr>
- <tr>
- <td>GRAB</td>
- <td>1,0</td>
- <td>Grab Direction</td>
- </tr>
- </table>
-*/
-struct State {
-
- static Direction findDirection(uint16 state);
- static StateTalk findTalk(uint16 state);
- static StateGrab findGrab(uint16 state);
- static StateOn findOn(uint16 state);
- static Verb findDefaultVerb(uint16 state);
- static StateUse findUse(uint16 state);
-
- static void alterOn(uint16 *objState, StateOn state);
- static void alterDefaultVerb(uint16 *objState, Verb v);
-};
-
-
class Command;
class Debug;
class Display;