diff options
author | rubidium <rubidium@openttd.org> | 2007-12-22 23:30:28 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-12-22 23:30:28 +0000 |
commit | 8f0e68285b4eadd1780280d7e36b00ff80c20f67 (patch) | |
tree | bb7b4abc525aa4e79b1a40ebe21516d9c47244e1 /src/openttd.h | |
parent | a7d54cf9464f457f181f920a4edc34fcb97aac4f (diff) | |
download | openttd-8f0e68285b4eadd1780280d7e36b00ff80c20f67.tar.xz |
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
Diffstat (limited to 'src/openttd.h')
-rw-r--r-- | src/openttd.h | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/src/openttd.h b/src/openttd.h index 664a0b72c..7ad6de5b9 100644 --- a/src/openttd.h +++ b/src/openttd.h @@ -11,21 +11,6 @@ #include "helpers.hpp" #include "strings_type.h" -struct Oblong { - int x, y; - int width, height; -}; - -struct BoundingRect { - int width; - int height; -}; - -struct Pair { - int a; - int b; -}; - #include "map.h" #include "slope_type.h" @@ -46,6 +31,7 @@ struct PalSpriteID { SpriteID sprite; SpriteID pal; }; +typedef int32 CursorID; typedef uint16 EngineID; typedef uint16 UnitID; @@ -83,6 +69,12 @@ typedef int32 Date; typedef uint32 PlayerFace; ///< player face bits, info see in player_face.h +enum GameModes { + GM_MENU, + GM_NORMAL, + GM_EDITOR +}; + enum SwitchModes { SM_NONE = 0, SM_NEWGAME = 1, @@ -282,4 +274,8 @@ enum ThreadMsg { void OTTD_SendThreadMessage(ThreadMsg msg); +extern byte _game_mode; +extern bool _exit_game; +extern byte _pause_game; + #endif /* OPENTTD_H */ |