[Scummvm-cvs-logs] SF.net SVN: scummvm:[40799] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sat May 23 03:15:20 CEST 2009
Revision: 40799
http://scummvm.svn.sourceforge.net/scummvm/?rev=40799&view=rev
Author: lordhoto
Date: 2009-05-23 01:15:20 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Cleanup.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/gui_lol.cpp
scummvm/trunk/engines/kyra/gui_lol.h
scummvm/trunk/engines/kyra/gui_v2.cpp
scummvm/trunk/engines/kyra/gui_v2.h
Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp 2009-05-23 00:05:16 UTC (rev 40798)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp 2009-05-23 01:15:20 UTC (rev 40799)
@@ -1803,7 +1803,7 @@
GUI_LoL::GUI_LoL(LoLEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
_scrollUpFunctor = BUTTON_FUNCTOR(GUI_LoL, this, &GUI_LoL::scrollUp);
_scrollDownFunctor = BUTTON_FUNCTOR(GUI_LoL, this, &GUI_LoL::scrollDown);
- _unknownButtonList = _backUpButtonList = 0;
+ _specialProcessButton = _backUpButtonList = 0;
_flagsModifier = 0;
_buttonListChanged = false;
}
@@ -1900,7 +1900,7 @@
return inputFlag & 0x7FFF;
if (_backUpButtonList != buttonList || _buttonListChanged) {
- _unknownButtonList = 0;
+ _specialProcessButton = 0;
//flagsModifier |= 0x2200;
_backUpButtonList = buttonList;
_buttonListChanged = false;
@@ -1938,10 +1938,10 @@
}
buttonList = _backUpButtonList;
- if (_unknownButtonList) {
- buttonList = _unknownButtonList;
- if (_unknownButtonList->flags & 8)
- _unknownButtonList = 0;
+ if (_specialProcessButton) {
+ buttonList = _specialProcessButton;
+ if (_specialProcessButton->flags & 8)
+ _specialProcessButton = 0;
}
int returnValue = 0;
@@ -1976,7 +1976,7 @@
flags = buttonList->flags & 0x0F00;
buttonList->flags2 |= 0x80;
inputFlag = 0;
- _unknownButtonList = buttonList;
+ _specialProcessButton = buttonList;
} else if (buttonList->keyCode2 == inFlags) {
flags = buttonList->flags & 0xF000;
if (!flags)
@@ -1984,7 +1984,7 @@
progress = true;
buttonList->flags2 |= 0x80;
inputFlag = 0;
- _unknownButtonList = buttonList;
+ _specialProcessButton = buttonList;
}
}
@@ -1998,10 +1998,10 @@
if (!progress)
buttonList->flags2 &= ~6;
- if ((flags & 0x3300) && (buttonList->flags & 4) && progress && (buttonList == _unknownButtonList || !_unknownButtonList)) {
+ if ((flags & 0x3300) && (buttonList->flags & 4) && progress && (buttonList == _specialProcessButton || !_specialProcessButton)) {
buttonList->flags |= 6;
- if (!_unknownButtonList)
- _unknownButtonList = buttonList;
+ if (!_specialProcessButton)
+ _specialProcessButton = buttonList;
} else if ((flags & 0x8800) && !(buttonList->flags & 4) && progress) {
buttonList->flags2 |= 6;
} else {
@@ -2009,19 +2009,19 @@
}
bool progressSwitch = false;
- if (!_unknownButtonList) {
+ if (!_specialProcessButton) {
progressSwitch = progress;
} else {
- if (_unknownButtonList->flags & 0x40)
- progressSwitch = (_unknownButtonList == buttonList);
+ if (_specialProcessButton->flags & 0x40)
+ progressSwitch = (_specialProcessButton == buttonList);
else
progressSwitch = progress;
}
if (progressSwitch) {
- if ((flags & 0x1100) && progress && !_unknownButtonList) {
+ if ((flags & 0x1100) && progress && !_specialProcessButton) {
inputFlag = 0;
- _unknownButtonList = buttonList;
+ _specialProcessButton = buttonList;
}
if ((buttonList->flags & flags) && (progress || !(buttonList->flags & 1))) {
@@ -2038,7 +2038,7 @@
switch (flagTable[combinedFlags]) {
case 0x400:
- if (!(buttonList->flags & 1) || ((buttonList->flags & 1) && _unknownButtonList == buttonList)) {
+ if (!(buttonList->flags & 1) || ((buttonList->flags & 1) && _specialProcessButton == buttonList)) {
buttonList->flags2 ^= 1;
returnValue = buttonList->index | 0x8000;
unk1 = true;
@@ -2079,7 +2079,7 @@
buttonList->flags2 |= 4;
buttonList->flags2 |= 2;
}
- _unknownButtonList = buttonList;
+ _specialProcessButton = buttonList;
break;
}
}
@@ -2095,13 +2095,13 @@
}
if ((flags & 0x8800) == 0x8800) {
- _unknownButtonList = 0;
+ _specialProcessButton = 0;
if (!progress || (buttonList->flags & 4))
buttonList->flags2 &= ~6;
}
- if (!progress && buttonList == _unknownButtonList && !(buttonList->flags & 0x40))
- _unknownButtonList = 0;
+ if (!progress && buttonList == _specialProcessButton && !(buttonList->flags & 0x40))
+ _specialProcessButton = 0;
if ((buttonList->flags2 & 0x18) != ((buttonList->flags2 & 3) << 3))
processButton(buttonList);
@@ -2123,7 +2123,7 @@
break;
}
- if (_unknownButtonList == buttonList && (buttonList->flags & 0x40))
+ if (_specialProcessButton == buttonList && (buttonList->flags & 0x40))
break;
buttonList = buttonList->nextButton;
Modified: scummvm/trunk/engines/kyra/gui_lol.h
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.h 2009-05-23 00:05:16 UTC (rev 40798)
+++ scummvm/trunk/engines/kyra/gui_lol.h 2009-05-23 01:15:20 UTC (rev 40799)
@@ -53,7 +53,7 @@
bool _pressFlag;
- Button *_unknownButtonList;
+ Button *_specialProcessButton;
Button *_backUpButtonList;
bool _buttonListChanged;
uint16 _flagsModifier;
Modified: scummvm/trunk/engines/kyra/gui_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_v2.cpp 2009-05-23 00:05:16 UTC (rev 40798)
+++ scummvm/trunk/engines/kyra/gui_v2.cpp 2009-05-23 01:15:20 UTC (rev 40799)
@@ -33,7 +33,7 @@
namespace Kyra {
GUI_v2::GUI_v2(KyraEngine_v2 *vm) : GUI(vm), _vm(vm), _screen(vm->screen_v2()) {
- _backUpButtonList = _unknownButtonList = 0;
+ _backUpButtonList = _specialProcessButton = 0;
_buttonListChanged = false;
_lastScreenUpdate = 0;
_flagsModifier = 0;
@@ -147,7 +147,7 @@
return inputFlag & 0x7FFF;
if (_backUpButtonList != buttonList || _buttonListChanged) {
- _unknownButtonList = 0;
+ _specialProcessButton = 0;
//flagsModifier |= 0x2200;
_backUpButtonList = buttonList;
_buttonListChanged = false;
@@ -185,10 +185,10 @@
}
buttonList = _backUpButtonList;
- if (_unknownButtonList) {
- buttonList = _unknownButtonList;
- if (_unknownButtonList->flags & 8)
- _unknownButtonList = 0;
+ if (_specialProcessButton) {
+ buttonList = _specialProcessButton;
+ if (_specialProcessButton->flags & 8)
+ _specialProcessButton = 0;
}
int returnValue = 0;
@@ -223,7 +223,7 @@
flags = buttonList->flags & 0x0F00;
buttonList->flags2 |= 0x80;
inputFlag = 0;
- _unknownButtonList = buttonList;
+ _specialProcessButton = buttonList;
} else if (buttonList->keyCode2 == inFlags) {
flags = buttonList->flags & 0xF000;
if (!flags)
@@ -231,7 +231,7 @@
progress = true;
buttonList->flags2 |= 0x80;
inputFlag = 0;
- _unknownButtonList = buttonList;
+ _specialProcessButton = buttonList;
}
}
@@ -245,10 +245,10 @@
if (!progress)
buttonList->flags2 &= ~6;
- if ((flags & 0x3300) && (buttonList->flags & 4) && progress && (buttonList == _unknownButtonList || !_unknownButtonList)) {
+ if ((flags & 0x3300) && (buttonList->flags & 4) && progress && (buttonList == _specialProcessButton || !_specialProcessButton)) {
buttonList->flags |= 6;
- if (!_unknownButtonList)
- _unknownButtonList = buttonList;
+ if (!_specialProcessButton)
+ _specialProcessButton = buttonList;
} else if ((flags & 0x8800) && !(buttonList->flags & 4) && progress) {
buttonList->flags2 |= 6;
} else {
@@ -256,19 +256,19 @@
}
bool progressSwitch = false;
- if (!_unknownButtonList) {
+ if (!_specialProcessButton) {
progressSwitch = progress;
} else {
- if (_unknownButtonList->flags & 0x40)
- progressSwitch = (_unknownButtonList == buttonList);
+ if (_specialProcessButton->flags & 0x40)
+ progressSwitch = (_specialProcessButton == buttonList);
else
progressSwitch = progress;
}
if (progressSwitch) {
- if ((flags & 0x1100) && progress && !_unknownButtonList) {
+ if ((flags & 0x1100) && progress && !_specialProcessButton) {
inputFlag = 0;
- _unknownButtonList = buttonList;
+ _specialProcessButton = buttonList;
}
if ((buttonList->flags & flags) && (progress || !(buttonList->flags & 1))) {
@@ -285,7 +285,7 @@
switch (flagTable[combinedFlags]) {
case 0x400:
- if (!(buttonList->flags & 1) || ((buttonList->flags & 1) && _unknownButtonList == buttonList)) {
+ if (!(buttonList->flags & 1) || ((buttonList->flags & 1) && _specialProcessButton == buttonList)) {
buttonList->flags2 ^= 1;
returnValue = buttonList->index | 0x8000;
unk1 = true;
@@ -326,7 +326,7 @@
buttonList->flags2 |= 4;
buttonList->flags2 |= 2;
}
- _unknownButtonList = buttonList;
+ _specialProcessButton = buttonList;
break;
}
}
@@ -342,13 +342,13 @@
}
if ((flags & 0x8800) == 0x8800) {
- _unknownButtonList = 0;
+ _specialProcessButton = 0;
if (!progress || (buttonList->flags & 4))
buttonList->flags2 &= ~6;
}
- if (!progress && buttonList == _unknownButtonList && !(buttonList->flags & 0x40))
- _unknownButtonList = 0;
+ if (!progress && buttonList == _specialProcessButton && !(buttonList->flags & 0x40))
+ _specialProcessButton = 0;
if ((buttonList->flags2 & 0x18) != ((buttonList->flags2 & 3) << 3))
processButton(buttonList);
@@ -370,7 +370,7 @@
break;
}
- if (_unknownButtonList == buttonList && (buttonList->flags & 0x40))
+ if (_specialProcessButton == buttonList && (buttonList->flags & 0x40))
break;
buttonList = buttonList->nextButton;
Modified: scummvm/trunk/engines/kyra/gui_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/gui_v2.h 2009-05-23 00:05:16 UTC (rev 40798)
+++ scummvm/trunk/engines/kyra/gui_v2.h 2009-05-23 01:15:20 UTC (rev 40799)
@@ -121,7 +121,7 @@
bool _buttonListChanged;
Button *_backUpButtonList;
- Button *_unknownButtonList;
+ Button *_specialProcessButton;
uint16 _flagsModifier;
protected:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list