libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-03 00:35:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KYRA: revert d7e700f370c258a5f4786d972af3666b93b71f94

Browse Source 
The GMM mouse cursor bug has now been fixed inside the GMM and CursorMan code.
This commit is contained in:
athrxx 2011-06-24 17:17:20 +02:00
parent 1a05efa8ed
commit 3f2b5b9e8b
10 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/kyra/kyra_hof.cpp
View File

@ -503,14 +503,6 @@ void KyraEngine_HoF::runLoop() {
int inputFlag = checkInput(_buttonList, true);
removeInputTop();
if (_updateHandItemCursor) {
// This works around an issue which would occur when setHandItem(_itemInHand)
// was called from inside loadGameState(). When loading via GMM the
// mouse cursor would not be set correctly.
_updateHandItemCursor = false;
setHandItem(_itemInHand);
}
update();
if (inputFlag == 198 || inputFlag == 199) {

8
engines/kyra/kyra_lok.cpp
View File

@ -821,14 +821,6 @@ void KyraEngine_LoK::updateMousePointer(bool forceUpdate) {
newY = 4;
}
if (_updateHandItemCursor) {
// This works around an issue which would occur when setHandItem(_itemInHand)
// was called from inside loadGameState(). When loading via GMM the
// mouse cursor would not be set correctly.
_updateHandItemCursor = false;
setHandItem(_itemInHand);
}
if ((newMouseState && _mouseState != newMouseState) || (newMouseState && forceUpdate)) {
_mouseState = newMouseState;
_screen->hideMouse();

8
engines/kyra/kyra_mr.cpp
View File

@ -908,14 +908,6 @@ void KyraEngine_MR::runLoop() {
int inputFlag = checkInput(_mainButtonList, true);
removeInputTop();
if (_updateHandItemCursor) {
// This works around an issue which would occur when setHandItem(_itemInHand)
// was called from inside loadGameState(). When loading via GMM the
// mouse cursor would not be set correctly.
_updateHandItemCursor = false;
setHandItem(_itemInHand);
}
update();
_timer->update();

1
engines/kyra/kyra_v1.cpp
View File

@ -56,7 +56,6 @@ KyraEngine_v1::KyraEngine_v1(OSystem *system, const GameFlags &flags)
_gameToLoad = -1;
_mouseState = -1;
_updateHandItemCursor = false;
_deathHandler = -1;
memset(_flagsTable, 0, sizeof(_flagsTable));

3
engines/kyra/kyra_v1.h
View File

@ -343,9 +343,6 @@ protected:
virtual void setHandItem(Item item) = 0;
virtual void removeHandItem() = 0;
void setDelayedCursorUpdate() { _updateHandItemCursor = true; }
bool _updateHandItemCursor;
// game flags
uint8 _flagsTable[100]; // TODO: check this value

8
engines/kyra/lol.cpp
View File

@ -935,14 +935,6 @@ void LoLEngine::runLoop() {
checkFloatingPointerRegions();
gui_updateInput();
if (_updateHandItemCursor) {
// This works around an issue which would occur when setHandItem(_itemInHand)
// was called from inside loadGameState(). When loading via GMM the
// mouse cursor would not be set correctly.
_updateHandItemCursor = false;
setHandItem(_itemInHand);
}
update();
if (_sceneUpdateRequired)

2
engines/kyra/saveload_hof.cpp
View File

@ -306,7 +306,7 @@ Common::Error KyraEngine_HoF::loadGameState(int slot) {
_mainCharacter.facing = 4;
enterNewScene(_mainCharacter.sceneId, _mainCharacter.facing, 0, 0, 1);
setDelayedCursorUpdate();
setHandItem(_itemInHand);
if (_lastMusicCommand >= 0 && !_unkSceneScreenFlag1)
snd_playWanderScoreViaMap(_lastMusicCommand, 1);

2
engines/kyra/saveload_lok.cpp
View File

@ -170,7 +170,7 @@ Common::Error KyraEngine_LoK::loadGameState(int slot) {
_screen->copyRegion(8, 8, 8, 8, 304, 212, 10, 0);
}
setDelayedCursorUpdate();
setHandItem(_itemInHand);
// Will-O-Wisp uses a different shape size than Brandon's usual
// shape, thus we need to setup the correct size depending on

2
engines/kyra/saveload_lol.cpp
View File

@ -257,7 +257,7 @@ Common::Error LoLEngine::loadGameState(int slot) {
int t = _credits;
_credits = 0;
giveCredits(t, 0);
setDelayedCursorUpdate();
setHandItem(_itemInHand);
loadLevel(_currentLevel);
gui_drawPlayField();
timerSpecialCharacterUpdate(0);

2
engines/kyra/saveload_mr.cpp
View File

@ -305,7 +305,7 @@ Common::Error KyraEngine_MR::loadGameState(int slot) {
_goodConsciencePosition = false;
enterNewScene(_mainCharacter.sceneId, _mainCharacter.facing, 0, 0, 1);
setDelayedCursorUpdate();
setHandItem(_itemInHand);
if (_lastMusicCommand >= 0 && !_unkSceneScreenFlag1)
snd_playWanderScoreViaMap(_lastMusicCommand, 1);