From 2664f2a2d95dbc2122ff1f9b96e8569ae401892f Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 6 May 2009 15:06:57 +0000 Subject: (svn r16242) -Codechange: rework pausing -Fix [FS#2864]: autopause and manual pausing conflict with eachother -Fix: new game + pause on new game + autopause make the game not unpause on the first join --- src/openttd.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'src/openttd.h') diff --git a/src/openttd.h b/src/openttd.h index d3cc1bb1e..c8d22b03c 100644 --- a/src/openttd.h +++ b/src/openttd.h @@ -5,6 +5,8 @@ #ifndef OPENTTD_H #define OPENTTD_H +#include "core/enum_type.hpp" + enum GameMode { GM_MENU, GM_NORMAL, @@ -38,6 +40,19 @@ enum { extern GameMode _game_mode; extern SwitchMode _switch_mode; extern bool _exit_game; -extern int8 _pause_game; + +/** Modes of pausing we've got */ +enum PauseMode { + PM_UNPAUSED = 0, ///< A normal unpaused game + PM_PAUSED_NORMAL = 1 << 0, ///< A game normally paused + PM_PAUSED_SAVELOAD = 1 << 1, ///< A game paused for saving/loading + PM_PAUSED_JOIN = 1 << 2, ///< A game paused for 'pause on join' + PM_PAUSED_ERROR = 1 << 3, ///< A game paused because a (critical) error +}; +DECLARE_ENUM_AS_BIT_SET(PauseMode); +typedef SimpleTinyEnumT PauseModeByte; + +/** The current pause mode */ +extern PauseModeByte _pause_mode; #endif /* OPENTTD_H */ -- cgit v1.2.3-70-g09d2