diff options
| author | Oliver Kiehl | 2003-05-26 17:56:17 +0000 |
|---|---|---|
| committer | Oliver Kiehl | 2003-05-26 17:56:17 +0000 |
| commit | 11902dcb5092cc603504707dd1e26e122b87f692 (patch) | |
| tree | aaf9b881aa8473a746d2e9998325568f1e55891b | |
| parent | 4554cd1b195c56a7aac2bea095e85ba3aa03e085 (diff) | |
| download | scummvm-rg350-11902dcb5092cc603504707dd1e26e122b87f692.tar.gz scummvm-rg350-11902dcb5092cc603504707dd1e26e122b87f692.tar.bz2 scummvm-rg350-11902dcb5092cc603504707dd1e26e122b87f692.zip | |
slight cleanup
svn-id: r8011
| -rw-r--r-- | sky/logic.h | 21 | ||||
| -rw-r--r-- | sky/skydefs.h | 25 |
2 files changed, 25 insertions, 21 deletions
diff --git a/sky/logic.h b/sky/logic.h index b6c04bcf08..91afef133f 100644 --- a/sky/logic.h +++ b/sky/logic.h @@ -29,6 +29,27 @@ #include "sky/musicbase.h" #include "sky/mouse.h" +enum scriptVariableOffsets { + RESULT = 0, + SCREEN = 1, + LOGIC_LIST_NO = 2, + CUR_ID = 12, + MOUSE_STATUS = 13, + MOUSE_STOP = 14, + GET_OFF = 18, + PLAYER_X = 27, + PLAYER_Y = 28, + PLAYER_MOOD = 29, + PLAYER_SCREEN = 30, + HIT_ID = 37, + THE_CHOSEN_ONE = 51, + TEXT1 = 53, + MENU_LENGTH = 100, + SCROLL_OFFSET = 101, + MENU = 102, + CUR_SECTION = 143 +}; + class SkyLogic { public: SkyLogic(SkyDisk *skyDisk, SkyGrid *skyGrid, SkyText *skyText, SkyMusicBase *skyMusic, SkyMouse *skyMouse, SkySound *skySound, uint32 gameVersion); diff --git a/sky/skydefs.h b/sky/skydefs.h index a7a146eb32..b3a916538a 100644 --- a/sky/skydefs.h +++ b/sky/skydefs.h @@ -19,6 +19,9 @@ * */ +#ifndef SKYDEFS_H +#define SKYDEFS_H + #include "struc.h" //This file is incomplete, several flags still missing. @@ -36,26 +39,6 @@ #define FIRST_TEXT_COMPACT 23 -// scriptVariable offsets -#define RESULT 0 -#define SCREEN 1 -#define LOGIC_LIST_NO 2 -#define CUR_ID 12 -#define MOUSE_STATUS 13 -#define MOUSE_STOP 14 -#define GET_OFF 18 -#define PLAYER_X 27 -#define PLAYER_Y 28 -#define PLAYER_MOOD 29 -#define PLAYER_SCREEN 30 -#define HIT_ID 37 -#define THE_CHOSEN_ONE 51 -#define TEXT1 53 -#define MENU_LENGTH 100 -#define SCROLL_OFFSET 101 -#define MENU 102 -#define CUR_SECTION 143 - //screen/grid defines #define GAME_SCREEN_WIDTH 320 #define GAME_SCREEN_HEIGHT 192 @@ -4302,5 +4285,5 @@ #define MOUSE_CROSS (1 << 7) // angry mouse #define MOUSE_UP (1 << 8) // mouse up - +#endif |