[Scummvm-cvs-logs] scummvm master -> d23871fdd83299dfe5b559f8b6b828c9315a84b1
m-kiewitz
m_kiewitz at users.sourceforge.net
Wed Feb 3 04:17:09 CET 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d23871fdd8 AGI: Rename WINDOWRESET to WINDOW_AUTO_CLOSE_TIMER
Commit: d23871fdd83299dfe5b559f8b6b828c9315a84b1
https://github.com/scummvm/scummvm/commit/d23871fdd83299dfe5b559f8b6b828c9315a84b1
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-03T04:17:15+01:00
Commit Message:
AGI: Rename WINDOWRESET to WINDOW_AUTO_CLOSE_TIMER
Changed paths:
engines/agi/agi.h
engines/agi/text.cpp
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 4ec7746..e3bfc98 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -267,7 +267,7 @@ enum {
VM_VAR_AGI_ERROR_INFO, // 18
VM_VAR_KEY, // 19
VM_VAR_COMPUTER, // 20
- VM_VAR_WINDOW_RESET, // 21
+ VM_VAR_WINDOW_AUTO_CLOSE_TIMER, // 21
VM_VAR_SOUNDGENERATOR, // 22
VM_VAR_VOLUME, // 23
VM_VAR_MAX_INPUT_CHARACTERS, // 24
diff --git a/engines/agi/text.cpp b/engines/agi/text.cpp
index 317ecbe..135d05e 100644
--- a/engines/agi/text.cpp
+++ b/engines/agi/text.cpp
@@ -351,7 +351,7 @@ bool TextMgr::messageBox(const char *textPtr) {
_vm->nonBlockingText_Forget();
// timed window
- uint32 windowTimer = _vm->getVar(VM_VAR_WINDOW_RESET);
+ uint32 windowTimer = _vm->getVar(VM_VAR_WINDOW_AUTO_CLOSE_TIMER);
debugC(3, kDebugLevelText, "blocking window v21=%d", windowTimer);
windowTimer = windowTimer * 10; // 1 = 0.5 seconds
@@ -373,7 +373,7 @@ bool TextMgr::messageBox(const char *textPtr) {
_vm->inGameTimerResetPassedCycles();
- _vm->setVar(VM_VAR_WINDOW_RESET, 0);
+ _vm->setVar(VM_VAR_WINDOW_AUTO_CLOSE_TIMER, 0);
closeWindow();
_vm->_noSaveLoadAllowed = false;
More information about the Scummvm-git-logs
mailing list