aboutsummaryrefslogtreecommitdiff
path: root/engines/lab/special.cpp
diff options
context:
space:
mode:
authorStrangerke2015-12-07 07:18:16 +0100
committerWillem Jan Palenstijn2015-12-23 21:33:52 +0100
commit895d29c1ae411d6a28135451e91e88eba1693f99 (patch)
tree3a41882a36e4a841b8ecce179243b346fca5ef11 /engines/lab/special.cpp
parentd264621832bbfe99cb1232f7fd8165cdc2ecc475 (diff)
downloadscummvm-rg350-895d29c1ae411d6a28135451e91e88eba1693f99.tar.gz
scummvm-rg350-895d29c1ae411d6a28135451e91e88eba1693f99.tar.bz2
scummvm-rg350-895d29c1ae411d6a28135451e91e88eba1693f99.zip
LAB: Some more renaming, remove useless variables
Diffstat (limited to 'engines/lab/special.cpp')
-rw-r--r--engines/lab/special.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index f4c8439a57..0bed4181dd 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -200,8 +200,8 @@ static bool loadJournalData() {
delete journalFile;
- BackG.KeyEquiv = VKEY_LTARROW;
- ForwardG.KeyEquiv = VKEY_RTARROW;
+ BackG._keyEquiv = VKEY_LTARROW;
+ ForwardG._keyEquiv = VKEY_RTARROW;
uint16 counter = 0;
@@ -219,7 +219,7 @@ static bool loadJournalData() {
else
gadget->y = g_lab->_graphics->VGAScaleY(JGadY[counter]) - g_lab->_graphics->SVGACord(1);
- gadget->GadgetID = counter;
+ gadget->_gadgetID = counter;
counter++;
}
@@ -345,9 +345,9 @@ void LabEngine::processJournal() {
if (Msg == NULL) {
_music->updateMusic();
} else {
- Class = Msg->msgClass;
- Qualifier = Msg->qualifier;
- GadID = Msg->code;
+ Class = Msg->_msgClass;
+ Qualifier = Msg->_qualifier;
+ GadID = Msg->_code;
if (((Class == MOUSEBUTTONS) && (IEQUALIFIER_RBUTTON & Qualifier)) ||
((Class == RAWKEY) && (GadID == 27)))
@@ -554,11 +554,11 @@ void LabEngine::processMonitor(char *ntext, TextFont *monitorFont, bool isintera
if (Msg == NULL) {
_music->updateMusic();
} else {
- Class = Msg->msgClass;
- Qualifier = Msg->qualifier;
- MouseX = Msg->mouseX;
- MouseY = Msg->mouseY;
- Code = Msg->code;
+ Class = Msg->_msgClass;
+ Qualifier = Msg->_qualifier;
+ MouseX = Msg->_mouseX;
+ MouseY = Msg->_mouseY;
+ Code = Msg->_code;
if (((Class == MOUSEBUTTONS) && (IEQUALIFIER_RBUTTON & Qualifier)) ||
((Class == RAWKEY) && (Code == 27)))