[Scummvm-git-logs] scummvm master -> e7cf48ffd5a430e76fab3f22610dbf7ae92757ea
AndywinXp
noreply at scummvm.org
Wed Jun 18 10:50:54 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
e7cf48ffd5 LASTENGINE: More input events labeling
Commit: e7cf48ffd5a430e76fab3f22610dbf7ae92757ea
https://github.com/scummvm/scummvm/commit/e7cf48ffd5a430e76fab3f22610dbf7ae92757ea
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-06-18T12:50:48+02:00
Commit Message:
LASTENGINE: More input events labeling
Changed paths:
engines/lastexpress/fight/fight.cpp
engines/lastexpress/game/credits.cpp
engines/lastexpress/game/events.cpp
engines/lastexpress/game/nis.cpp
engines/lastexpress/lastexpress.cpp
engines/lastexpress/menu/menu.cpp
engines/lastexpress/shared.h
diff --git a/engines/lastexpress/fight/fight.cpp b/engines/lastexpress/fight/fight.cpp
index 57ca2ec3a70..08024394dd6 100644
--- a/engines/lastexpress/fight/fight.cpp
+++ b/engines/lastexpress/fight/fight.cpp
@@ -183,8 +183,8 @@ CFight::CFight(LastExpressEngine *engine, int fightId) {
_savedMouseEventHandle = _engine->getMessageManager()->getEventHandle(1);
_savedTimerEventHandle = _engine->getMessageManager()->getEventHandle(3);
- _engine->getMessageManager()->setEventHandle(1, &LastExpressEngine::fightMouseWrapper);
- _engine->getMessageManager()->setEventHandle(3, &LastExpressEngine::fightTimerWrapper);
+ _engine->getMessageManager()->setEventHandle(kEventChannelMouse, &LastExpressEngine::fightMouseWrapper);
+ _engine->getMessageManager()->setEventHandle(kEventChannelTimer, &LastExpressEngine::fightTimerWrapper);
_engine->setEventTickInternal(false);
}
@@ -200,8 +200,8 @@ CFight::~CFight() {
_opponent = nullptr;
}
- _engine->getMessageManager()->setEventHandle(1, _savedMouseEventHandle);
- _engine->getMessageManager()->setEventHandle(3, _savedTimerEventHandle);
+ _engine->getMessageManager()->setEventHandle(kEventChannelMouse, _savedMouseEventHandle);
+ _engine->getMessageManager()->setEventHandle(kEventChannelTimer, _savedTimerEventHandle);
}
int CFight::process() {
@@ -323,7 +323,7 @@ void CFight::mouse(Event *event) {
_engine->_cursorY = event->y;
if (_engine->_cursorX < 608 || _engine->_cursorY < 448 || _engine->_cursorX >= 640 || _engine->_cursorY >= 480) {
- if ((event->flags & 0x10) != 0) {
+ if ((event->flags & kMouseFlagRightDown) != 0) {
_engine->getLogicManager()->endDialog(kCharacterTableA);
_engine->abortFight();
@@ -359,7 +359,7 @@ void CFight::mouse(Event *event) {
_engine->_cursorType = link->cursor;
if (_cath->actionAvailable(link->action)) {
- if ((event->flags & 8) != 0)
+ if ((event->flags & kMouseFlagLeftDown) != 0)
_cath->send(link->action);
} else {
_engine->_cursorType = 0;
@@ -377,11 +377,11 @@ void CFight::mouse(Event *event) {
_lowIconToggle = true;
}
- if ((event->flags & 8) != 0) {
+ if ((event->flags & kMouseFlagLeftDown) != 0) {
_lowIconToggle = false;
_engine->getLogicManager()->endDialog(kCharacterTableA);
endFight(2);
- } else if ((event->flags & 0x10) != 0 && _engine->_gracePeriodTimer) {
+ } else if ((event->flags & kMouseFlagRightDown) != 0 && _engine->_gracePeriodTimer) {
if (_engine->getLogicManager()->dialogRunning("TIMER"))
_engine->getLogicManager()->endDialog("TIMER");
diff --git a/engines/lastexpress/game/credits.cpp b/engines/lastexpress/game/credits.cpp
index a62b87e89d6..4e06179976d 100644
--- a/engines/lastexpress/game/credits.cpp
+++ b/engines/lastexpress/game/credits.cpp
@@ -88,8 +88,8 @@ void LastExpressEngine::doCredits() {
_savedMouseEventHandle = getMessageManager()->getEventHandle(1);
_savedTimerEventHandle = getMessageManager()->getEventHandle(3);
- getMessageManager()->setEventHandle(1, &LastExpressEngine::creditsMouseWrapper);
- getMessageManager()->setEventHandle(3, &LastExpressEngine::creditsTimerWrapper);
+ getMessageManager()->setEventHandle(kEventChannelMouse, &LastExpressEngine::creditsMouseWrapper);
+ getMessageManager()->setEventHandle(kEventChannelTimer, &LastExpressEngine::creditsTimerWrapper);
do {
getSoundManager()->soundThread();
@@ -330,8 +330,8 @@ void LastExpressEngine::doCredits() {
if (nextTga)
getMemoryManager()->lockFX();
- getMessageManager()->setEventHandle(1, _savedMouseEventHandle);
- getMessageManager()->setEventHandle(3, _savedTimerEventHandle);
+ getMessageManager()->setEventHandle(kEventChannelMouse, _savedMouseEventHandle);
+ getMessageManager()->setEventHandle(kEventChannelTimer, _savedTimerEventHandle);
_doCredits = 0;
@@ -360,15 +360,15 @@ void LastExpressEngine::creditsMouse(Event *event) {
mouseSetRightClicked(false);
- if ((event->flags & 8) != 0)
+ if ((event->flags & kMouseFlagLeftDown) != 0)
_savedFrameCounter = getSoundFrameCounter();
- if (_savedFrameCounter && (event->flags & 0x80) != 0) {
+ if (_savedFrameCounter && (event->flags & kMouseFlagLeftUp) != 0) {
_savedFrameInterval += getSoundFrameCounter() - _savedFrameCounter;
_savedFrameCounter = 0;
}
- if ((event->flags & 0x10) != 0)
+ if ((event->flags & kMouseFlagRightDown) != 0)
abortCredits();
}
@@ -478,12 +478,12 @@ bool LastExpressEngine::demoEnding(bool wonGame) {
"BONDAGE", "KILL", "HIGHFITE", "1315GUNS", "BOOM2", "ISTANBUL", "LASTSHOT"};
if (wonGame) {
- getMessageManager()->setEventHandle(1, &LastExpressEngine::emptyHandler);
+ getMessageManager()->setEventHandle(kEventChannelMouse, &LastExpressEngine::emptyHandler);
} else {
- getMessageManager()->setEventHandle(1, &LastExpressEngine::demoEndingMouseWrapper);
+ getMessageManager()->setEventHandle(kEventChannelMouse, &LastExpressEngine::demoEndingMouseWrapper);
}
- getMessageManager()->setEventHandle(3, &LastExpressEngine::demoEndingTimerWrapper);
+ getMessageManager()->setEventHandle(kEventChannelTimer, &LastExpressEngine::demoEndingTimerWrapper);
getGraphicsManager()->setMouseDrawable(false);
mouseSetRightClicked(false);
diff --git a/engines/lastexpress/game/events.cpp b/engines/lastexpress/game/events.cpp
index 997f0625f93..7c400649aab 100644
--- a/engines/lastexpress/game/events.cpp
+++ b/engines/lastexpress/game/events.cpp
@@ -65,9 +65,9 @@ void MessageManager::addEvent(int channel, int x, int y, int flags) {
if (_numEventsInQueue >= 127)
return;
- if (channel == 3) {
+ if (channel == kEventChannelTimer) {
_engine->setEventTickInternal(true);
- } else if (channel == 1) {
+ } else if (channel == kEventChannelMouse) {
if ((flags & kMouseFlagLeftButton) != 0) {
// Originally _engine->mouseSetLeftClicked(true); was called from here,
// but it's been moved under the "if" because this lead to fake double
diff --git a/engines/lastexpress/game/nis.cpp b/engines/lastexpress/game/nis.cpp
index 12c4e88799f..17cf909fabd 100644
--- a/engines/lastexpress/game/nis.cpp
+++ b/engines/lastexpress/game/nis.cpp
@@ -331,7 +331,7 @@ void NISManager::abortNIS() {
}
void NISManager::nisMouse(Event *event) {
- if ((event->flags & 0x10) != 0)
+ if ((event->flags & kMouseFlagRightDown) != 0)
abortNIS();
}
@@ -546,8 +546,8 @@ bool NISManager::doNIS(const char *name, int32 flags) {
_savedMouseEventHandle = _engine->getMessageManager()->getEventHandle(1);
_savedTimerEventHandle = _engine->getMessageManager()->getEventHandle(3);
- _engine->getMessageManager()->setEventHandle(1, &LastExpressEngine::nisMouseWrapper);
- _engine->getMessageManager()->setEventHandle(3, &LastExpressEngine::nisTimerWrapper);
+ _engine->getMessageManager()->setEventHandle(kEventChannelMouse, &LastExpressEngine::nisMouseWrapper);
+ _engine->getMessageManager()->setEventHandle(kEventChannelTimer, &LastExpressEngine::nisTimerWrapper);
_engine->getSoundManager()->setSoundDriverTicks(0);
@@ -658,8 +658,8 @@ bool NISManager::doNIS(const char *name, int32 flags) {
if (_currentNISSound && !_currentNISSound->getTime())
_currentNISSound->addStatusFlag(kSoundFlagCloseRequested);
- _engine->getMessageManager()->setEventHandle(1, _savedMouseEventHandle);
- _engine->getMessageManager()->setEventHandle(3, _savedTimerEventHandle);
+ _engine->getMessageManager()->setEventHandle(kEventChannelMouse, _savedMouseEventHandle);
+ _engine->getMessageManager()->setEventHandle(kEventChannelTimer, _savedTimerEventHandle);
if (_currentNISSound && (_flags & kNisFlagAbortRequested) != 0)
_currentNISSound->addStatusFlag(kSoundFlagCloseRequested);
diff --git a/engines/lastexpress/lastexpress.cpp b/engines/lastexpress/lastexpress.cpp
index 2b67e039e09..a8a7c0ebdc7 100644
--- a/engines/lastexpress/lastexpress.cpp
+++ b/engines/lastexpress/lastexpress.cpp
@@ -128,7 +128,7 @@ void LastExpressEngine::soundTimerHandler(void *refCon) {
return;
}
- engine->getMessageManager()->addEvent(3, 0, 0, 0);
+ engine->getMessageManager()->addEvent(kEventChannelTimer, 0, 0, 0);
}
engine->_soundFrameCounter++;
@@ -204,7 +204,7 @@ Common::Error LastExpressEngine::run() {
_system->setImGuiCallbacks(callbacks);
#endif
- getMessageManager()->setEventHandle(4, &LastExpressEngine::engineEventHandlerWrapper);
+ getMessageManager()->setEventHandle(kEventChannelEngine, &LastExpressEngine::engineEventHandlerWrapper);
getTimerManager()->installTimerProc(soundTimerHandler, 17000, this, "LastExpressEngine");
@@ -373,7 +373,7 @@ void LastExpressEngine::engineEventHandler(Event *event) {
getMenu()->doEgg(true, 0, 0); // Save!
_pendingExitEvent = false; // We're done, we can quit
} else {
- getMessageManager()->addEvent(4, 0, 0, 2); // Give the engine the actual chance to abort NIS, fights and credits by running process()
+ getMessageManager()->addEvent(kEventChannelEngine, 0, 0, 2); // Give the engine the actual chance to abort NIS, fights and credits by running process()
_pendingExitEvent = true;
}
}
@@ -481,7 +481,7 @@ bool LastExpressEngine::handleEvents() {
if (_systemEventRightMouseDown)
curFlags |= kMouseFlagRightButton;
- getMessageManager()->addEvent(1, ev.mouse.x, ev.mouse.y, curFlags);
+ getMessageManager()->addEvent(kEventChannelMouse, ev.mouse.x, ev.mouse.y, curFlags);
break;
case Common::EVENT_LBUTTONUP:
_systemEventLeftMouseDown = false;
@@ -489,7 +489,7 @@ bool LastExpressEngine::handleEvents() {
if (_systemEventRightMouseDown)
curFlags |= kMouseFlagRightButton;
- getMessageManager()->addEvent(1, ev.mouse.x, ev.mouse.y, curFlags);
+ getMessageManager()->addEvent(kEventChannelMouse, ev.mouse.x, ev.mouse.y, curFlags);
break;
case Common::EVENT_RBUTTONDOWN:
@@ -499,7 +499,7 @@ bool LastExpressEngine::handleEvents() {
if (_systemEventLeftMouseDown)
curFlags |= kMouseFlagLeftButton;
- getMessageManager()->addEvent(1, ev.mouse.x, ev.mouse.y, curFlags);
+ getMessageManager()->addEvent(kEventChannelMouse, ev.mouse.x, ev.mouse.y, curFlags);
break;
case Common::EVENT_RBUTTONUP:
_systemEventRightMouseDown = false;
@@ -507,7 +507,7 @@ bool LastExpressEngine::handleEvents() {
if (_systemEventLeftMouseDown)
curFlags |= kMouseFlagLeftButton;
- getMessageManager()->addEvent(1, ev.mouse.x, ev.mouse.y, curFlags);
+ getMessageManager()->addEvent(kEventChannelMouse, ev.mouse.x, ev.mouse.y, curFlags);
break;
case Common::EVENT_MOUSEMOVE:
@@ -527,13 +527,13 @@ bool LastExpressEngine::handleEvents() {
_systemEventLastMouseCoords.x = ev.mouse.x;
_systemEventLastMouseCoords.y = ev.mouse.y;
- getMessageManager()->addEvent(1, ev.mouse.x, ev.mouse.y, curFlags);
+ getMessageManager()->addEvent(kEventChannelMouse, ev.mouse.x, ev.mouse.y, curFlags);
break;
case Common::EVENT_QUIT:
case Common::EVENT_RETURN_TO_LAUNCHER:
if (!_exitFromMenuButton) {
- getMessageManager()->addEvent(4, 0, 0, 1);
+ getMessageManager()->addEvent(kEventChannelEngine, 0, 0, 1);
_pendingExitEvent = true;
}
diff --git a/engines/lastexpress/menu/menu.cpp b/engines/lastexpress/menu/menu.cpp
index e5b4f18437b..32928eb8757 100644
--- a/engines/lastexpress/menu/menu.cpp
+++ b/engines/lastexpress/menu/menu.cpp
@@ -100,22 +100,22 @@ void Menu::doEgg(bool doSaveGame, int type, int32 time) {
_engine->getGraphicsManager()->newMouseLoc();
_engine->getGraphicsManager()->setMouseDrawable(oldShouldRedraw);
- _engine->getMessageManager()->setEventHandle(1, &LastExpressEngine::eggMouseWrapper);
- _engine->getMessageManager()->setEventHandle(3, &LastExpressEngine::eggTimerWrapper);
+ _engine->getMessageManager()->setEventHandle(kEventChannelMouse, &LastExpressEngine::eggMouseWrapper);
+ _engine->getMessageManager()->setEventHandle(kEventChannelTimer, &LastExpressEngine::eggTimerWrapper);
_menuSeqs[1] = _engine->getArchiveManager()->loadSeq("buttns.seq", 15, 0);
_menuSeqs[0] = _engine->getArchiveManager()->loadSeq("helpnewr.seq", 15, 0);
switchEggs(_engine->_currentGameFileColorId);
updateEgg();
- _engine->getMessageManager()->setEventHandle(1, &LastExpressEngine::eggMouseWrapper);
- _engine->getMessageManager()->setEventHandle(3, &LastExpressEngine::eggTimerWrapper);
+ _engine->getMessageManager()->setEventHandle(kEventChannelMouse, &LastExpressEngine::eggMouseWrapper);
+ _engine->getMessageManager()->setEventHandle(kEventChannelTimer, &LastExpressEngine::eggTimerWrapper);
}
}
void Menu::endEgg() {
- _engine->getMessageManager()->setEventHandle(1, &LastExpressEngine::nodeStepMouseWrapper);
- _engine->getMessageManager()->setEventHandle(3, &LastExpressEngine::nodeStepTimerWrapper);
+ _engine->getMessageManager()->setEventHandle(kEventChannelMouse, &LastExpressEngine::nodeStepMouseWrapper);
+ _engine->getMessageManager()->setEventHandle(kEventChannelTimer, &LastExpressEngine::nodeStepTimerWrapper);
eggFree();
_engine->getVCR()->free();
diff --git a/engines/lastexpress/shared.h b/engines/lastexpress/shared.h
index 79ad830d0f7..06d924da5b4 100644
--- a/engines/lastexpress/shared.h
+++ b/engines/lastexpress/shared.h
@@ -185,6 +185,12 @@ enum MouseFlags : int {
kMouseFlagRightUp = 0x100
};
+enum EventChannel : int {
+ kEventChannelMouse = 1,
+ kEventChannelTimer = 3,
+ kEventChannelEngine = 4
+};
+
enum NisFlags : uint {
kNisFlagHasSound = 0x1, // Set when a valid NIS sound exists
kNisFlagDataChunksAvailable = 0x100, // Used during initialization and chunk loading
More information about the Scummvm-git-logs
mailing list