diff options
| author | Alyssa Milburn | 2012-08-28 09:47:21 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2012-08-28 09:47:21 +0200 |
| commit | e6bd426398c75fb6e268e58508b19307ab0c53eb (patch) | |
| tree | 031515dd1c93c3a968ec5c2b0d7bbf7838fa626f | |
| parent | 3570a0153dfa1034fc8acece5f755038487a5886 (diff) | |
| download | scummvm-rg350-e6bd426398c75fb6e268e58508b19307ab0c53eb.tar.gz scummvm-rg350-e6bd426398c75fb6e268e58508b19307ab0c53eb.tar.bz2 scummvm-rg350-e6bd426398c75fb6e268e58508b19307ab0c53eb.zip | |
TONY: Rename curDialog to g_curDialog.
| -rw-r--r-- | engines/tony/custom.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp index 3031fc342b..c73c7dec36 100644 --- a/engines/tony/custom.cpp +++ b/engines/tony/custom.cpp @@ -1779,7 +1779,7 @@ DECLARE_CUSTOM_FUNCTION(MCharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMes * Dialogs */ -int curDialog; +int g_curDialog; DECLARE_CUSTOM_FUNCTION(SendDialogMessage)(CORO_PARAM, uint32 nPers, uint32 nMsg, uint32, uint32) { CORO_BEGIN_CONTEXT; @@ -1801,7 +1801,7 @@ DECLARE_CUSTOM_FUNCTION(SendDialogMessage)(CORO_PARAM, uint32 nPers, uint32 nMsg if (nPers != 0 && GLOBALS._isMChar[nPers] && GLOBALS._mCharacter[nPers]._bAlwaysBack) _ctx->bIsBack = true; - _ctx->curVoc = SearchVoiceHeader(curDialog, nMsg); + _ctx->curVoc = SearchVoiceHeader(g_curDialog, nMsg); _ctx->voice = NULL; if (_ctx->curVoc) { @@ -1978,7 +1978,7 @@ DECLARE_CUSTOM_FUNCTION(StartDialog)(CORO_PARAM, uint32 nDialog, uint32 nStartGr CORO_BEGIN_CODE(_ctx); - curDialog = nDialog; + g_curDialog = nDialog; // Call MPAL to start the dialog mpalQueryDoDialog(nDialog, nStartGroup); |