libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

CINE: FW: Fix command line updating

Browse Source 
In Future Wars the command line was not always updated and thus failed
sometimes to be up to date (i.e. showing wrong text, e.g. "EXAMINE" only
when it should have read "EXAMINE scaffolding" because the mouse cursor
was on the scaffolding).

Now we just always update the command line for both Future Wars and
Operation Stealth which seems to fix the command line updating.

I think this probably was a regression caused by adding support for
Operation Stealth (i.e. pull request #2365) and the efforts made in it
to make the user interface responsive.
This commit is contained in:
Kari Salminen 2020-09-10 01:18:45 +03:00 committed by Thierry Crozat
parent eabd1c243d
commit 70d16a3689
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/cine/main_loop.cpp
View File

@ -350,12 +350,9 @@ void manageEvents(CallSource callSource, EventTarget eventTarget, bool useMaxMou
// responsive by updating it here.
if (allowPlayerInput && playerCommand != -1 && !mouseLeft && !mouseRight) {
// A player command is given, left and right mouse buttons are up
Common::String oldCommand = renderer->getCommand();
mousePos = eventMan->getMousePos();
playerCommandMouseLeftRightUp(mousePos.x, mousePos.y);
if (!oldCommand.equals(renderer->getCommand())) {
renderer->drawCommand();
}
renderer->drawCommand();
}
renderer->blit();

15
engines/cine/various.cpp
View File

@ -1102,7 +1102,20 @@ void playerCommandMouseLeftRightUp(uint16 mouseX, uint16 mouseY) {
objIdx = getObjectUnderCursor(mouseX, mouseY);
if (g_cine->getGameType() == Cine::GType_OS || commandVar2 != objIdx) {
// Previously in Operation Stealth the following code was always run but in
// Future Wars only if commandVar2 != objIdx (Both cases based on disassembly).
// Trying to update the command line e.g. "EXAMINE" -> "EXAMINE scaffolding"
// in the manageEvents function to make the user interface responsive made a
// regression in Future Wars.
//
// In Future Wars the command line was not always updated and thus failed sometimes
// to be up to date (i.e. showing wrong text, e.g. "EXAMINE" only when it should
// have read "EXAMINE scaffolding" because the mouse cursor was on the scaffolding).
//
// Now we just always run this code for both Future Wars and Operation Stealth
// which seems to fix the command line updating.
const bool update = true; // Previously: g_cine->getGameType() == Cine::GType_OS || commandVar2 != objIdx
if (update) {
if (objIdx != -1) {
renderer->setCommand(g_cine->_commandBuffer + " " + g_cine->_objectTable[objIdx].name);
} else {