diff options
| author | D G Turner | 2013-07-31 01:07:48 +0100 |
|---|---|---|
| committer | D G Turner | 2013-07-31 01:07:48 +0100 |
| commit | b4a0fd13ef28ec8a6d8e60b5ab90539620ee9ee1 (patch) | |
| tree | 912cd2119f0dfd262bc5300a702c7b9f3d9c09be /engines/mortevielle | |
| parent | d81f6450c981d4738df1627611d4b5428e3422c8 (diff) | |
| download | scummvm-rg350-b4a0fd13ef28ec8a6d8e60b5ab90539620ee9ee1.tar.gz scummvm-rg350-b4a0fd13ef28ec8a6d8e60b5ab90539620ee9ee1.tar.bz2 scummvm-rg350-b4a0fd13ef28ec8a6d8e60b5ab90539620ee9ee1.zip | |
MORTEVIELLE: Another fix for WinCE compilation.
S_OK is a system define in the WinCE toolchain library headers, so this
conflicts. Renamed to S_OKAY in the engine code to avoid this.
Diffstat (limited to 'engines/mortevielle')
| -rw-r--r-- | engines/mortevielle/mortevielle.h | 2 | ||||
| -rw-r--r-- | engines/mortevielle/utils.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h index 388abbc50a..795bac5652 100644 --- a/engines/mortevielle/mortevielle.h +++ b/engines/mortevielle/mortevielle.h @@ -83,7 +83,7 @@ enum { S_YES_NO = 0, S_GO_TO = 1, S_SOMEONE_ENTERS = 2, S_COOL = 3, S_LOURDE = 4, S_MALSAINE = 5, S_IDEM = 6, S_YOU = 7, S_ARE = 8, S_ALONE = 9, S_HEAR_NOISE = 10, S_SHOULD_HAVE_NOTICED = 11, S_NUMBER_OF_HINTS = 12, - S_WANT_TO_WAKE_UP = 13, S_OK = 14, S_SAVE_LOAD = 15, S_RESTART = 18, S_F3 = 19, + S_WANT_TO_WAKE_UP = 13, S_OKAY = 14, S_SAVE_LOAD = 15, S_RESTART = 18, S_F3 = 19, S_F8 = 20, S_HIDE_SELF = 21, S_TAKE = 22, S_PROBE = 23, S_RAISE = 24, S_SUITE = 25, S_STOP = 26, S_USE_DEP_MENU = 27, S_LIFT = 28, S_READ = 29, S_LOOK = 30, S_SEARCH = 31, S_OPEN = 32, S_PUT = 33, S_TURN = 34, S_TIE = 35, S_CLOSE = 36, diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp index 2316d1e9fd..8fa608953d 100644 --- a/engines/mortevielle/utils.cpp +++ b/engines/mortevielle/utils.cpp @@ -2315,7 +2315,7 @@ void MortevielleEngine::prepareRoom() { _hintPctMessage += '0'; _hintPctMessage += getEngineString(S_NUMBER_OF_HINTS); _hintPctMessage += "]["; - _hintPctMessage += getEngineString(S_OK); + _hintPctMessage += getEngineString(S_OKAY); _hintPctMessage += ']'; } if (minute > _minute) { |