aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/lab/engine.cpp20
-rw-r--r--engines/lab/interface.cpp34
-rw-r--r--engines/lab/interface.h7
-rw-r--r--engines/lab/intro.cpp10
-rw-r--r--engines/lab/map.cpp12
-rw-r--r--engines/lab/special.cpp18
6 files changed, 50 insertions, 51 deletions
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 8dd48d1d8d..c706dca110 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -797,12 +797,12 @@ static void mainGameLoop() {
} else {
GotMessage = true;
- Class = Msg->Class;
- Code = Msg->Code;
- Qualifier = Msg->Qualifier;
- MouseX = Msg->MouseX;
- MouseY = Msg->MouseY;
- GadID = Msg->GadgetID;
+ Class = Msg->msgClass;
+ Code = Msg->code;
+ Qualifier = Msg->qualifier;
+ MouseX = Msg->mouseX;
+ MouseY = Msg->mouseY;
+ GadID = Msg->gadgetID;
FollowingCrumbs = false;
@@ -868,14 +868,14 @@ from_crumbs:
g_music->updateMusic();
diffNextFrame();
} else {
- if (Msg->Class == RAWKEY) {
- if ((Msg->Code == 'Y') || (Msg->Code == 'y') || (Msg->Code == 'Q') || (Msg->Code == 'q')) {
+ if (Msg->msgClass == RAWKEY) {
+ if ((Msg->code == 'Y') || (Msg->code == 'y') || (Msg->code == 'Q') || (Msg->code == 'q')) {
doit = true;
break;
- } else if (Msg->Code < 128) {
+ } else if (Msg->code < 128) {
break;
}
- } else if (Msg->Class == MOUSEBUTTONS) {
+ } else if (Msg->msgClass == MOUSEBUTTONS) {
break;
}
}
diff --git a/engines/lab/interface.cpp b/engines/lab/interface.cpp
index 8d05e4174d..1cd017d434 100644
--- a/engines/lab/interface.cpp
+++ b/engines/lab/interface.cpp
@@ -177,30 +177,30 @@ IntuiMessage *getMsg() {
if ((curgad = mouseGadget()) != NULL) {
updateMouse();
- IMessage.Class = GADGETUP;
- IMessage.Code = curgad->GadgetID;
- IMessage.GadgetID = curgad->GadgetID;
- IMessage.Qualifier = Qualifiers;
+ IMessage.msgClass = GADGETUP;
+ IMessage.code = curgad->GadgetID;
+ IMessage.gadgetID = curgad->GadgetID;
+ IMessage.qualifier = Qualifiers;
return &IMessage;
- } else if (mouseButton(&IMessage.MouseX, &IMessage.MouseY, true)) { /* Left Button */
- IMessage.Qualifier = IEQUALIFIER_LEFTBUTTON | Qualifiers;
- IMessage.Class = MOUSEBUTTONS;
+ } else if (mouseButton(&IMessage.mouseX, &IMessage.mouseY, true)) { /* Left Button */
+ IMessage.qualifier = IEQUALIFIER_LEFTBUTTON | Qualifiers;
+ IMessage.msgClass = MOUSEBUTTONS;
return &IMessage;
- } else if (mouseButton(&IMessage.MouseX, &IMessage.MouseY, false)) { /* Right Button */
- IMessage.Qualifier = IEQUALIFIER_RBUTTON | Qualifiers;
- IMessage.Class = MOUSEBUTTONS;
+ } else if (mouseButton(&IMessage.mouseX, &IMessage.mouseY, false)) { /* Right Button */
+ IMessage.qualifier = IEQUALIFIER_RBUTTON | Qualifiers;
+ IMessage.msgClass = MOUSEBUTTONS;
return &IMessage;
- } else if (keyPress(&IMessage.Code)) { /* Keyboard key */
- curgad = checkNumGadgetHit(ScreenGadgetList, IMessage.Code);
+ } else if (keyPress(&IMessage.code)) { /* Keyboard key */
+ curgad = checkNumGadgetHit(ScreenGadgetList, IMessage.code);
if (curgad) {
- IMessage.Class = GADGETUP;
- IMessage.Code = curgad->GadgetID;
- IMessage.GadgetID = curgad->GadgetID;
+ IMessage.msgClass = GADGETUP;
+ IMessage.code = curgad->GadgetID;
+ IMessage.gadgetID = curgad->GadgetID;
} else
- IMessage.Class = RAWKEY;
+ IMessage.msgClass = RAWKEY;
- IMessage.Qualifier = Qualifiers;
+ IMessage.qualifier = Qualifiers;
return &IMessage;
} else
return NULL;
diff --git a/engines/lab/interface.h b/engines/lab/interface.h
index ea110f4015..84df28c767 100644
--- a/engines/lab/interface.h
+++ b/engines/lab/interface.h
@@ -37,9 +37,9 @@
namespace Lab {
struct IntuiMessage {
- uint32 Class;
- uint16 Code, Qualifier, MouseX, MouseY, GadgetID;
- uint32 Seconds, Micros;
+ uint32 msgClass;
+ uint16 code, qualifier, mouseX, mouseY, gadgetID;
+ uint32 seconds, micros;
};
@@ -121,4 +121,3 @@ IntuiMessage *getMsg();
} // End of namespace Lab
#endif /* LAB_INTEFACE_H */
-
diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp
index c3a8321f67..eacfd12843 100644
--- a/engines/lab/intro.cpp
+++ b/engines/lab/intro.cpp
@@ -63,8 +63,8 @@ void Intro::introEatMessages() {
if (msg == NULL)
return;
else {
- if (((msg->Class == MOUSEBUTTONS) && (IEQUALIFIER_RBUTTON & msg->Qualifier)) ||
- ((msg->Class == RAWKEY) && (msg->Code == 27))
+ if (((msg->msgClass == MOUSEBUTTONS) && (IEQUALIFIER_RBUTTON & msg->qualifier)) ||
+ ((msg->msgClass == RAWKEY) && (msg->code == 27))
)
_quitIntro = true;
}
@@ -164,9 +164,9 @@ void Intro::doPictText(const char *filename, bool isscreen) {
waitTOF();
} else {
- cls = msg->Class;
- qualifier = msg->Qualifier;
- code = msg->Code;
+ cls = msg->msgClass;
+ qualifier = msg->qualifier;
+ code = msg->code;
if (((cls == MOUSEBUTTONS) && (IEQUALIFIER_RBUTTON & qualifier)) ||
((cls == RAWKEY) && (code == 27))) {
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index a096d28326..f373fb8d9d 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -725,12 +725,12 @@ void processMap(uint16 CurRoom) {
place = 1;
} else {
- Class = Msg->Class;
- Code = Msg->Code;
- GadgetID = Msg->GadgetID;
- Qualifier = Msg->Qualifier;
- MouseX = Msg->MouseX;
- MouseY = Msg->MouseY;
+ Class = Msg->msgClass;
+ Code = Msg->code;
+ GadgetID = Msg->gadgetID;
+ Qualifier = Msg->qualifier;
+ MouseX = Msg->mouseX;
+ MouseY = Msg->mouseY;
if (((Class == MOUSEBUTTONS) && (IEQUALIFIER_RBUTTON & Qualifier)) ||
((Class == RAWKEY) && (Code == 27)))
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index 377f8dbece..9d9ccc7241 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -745,14 +745,14 @@ static void processJournal() {
while (1) {
g_music->updateMusic(); /* Make sure we check the music at least after every message */
- Msg = (IntuiMessage *) getMsg();
+ Msg = (IntuiMessage *)getMsg();
if (Msg == NULL) {
g_music->updateMusic();
} else {
- Class = Msg->Class;
- 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)))
@@ -978,11 +978,11 @@ static void processMonitor(char *ntext, bool isinteractive, uint16 x1, uint16 y1
if (Msg == NULL) {
g_music->updateMusic();
} else {
- Class = Msg->Class;
- 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)))
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-13 03:58:31 +0000