mirror of
https://github.com/libretro/scummvm.git
synced 2025-03-05 01:38:36 +00:00
fixed item descriptions
svn-id: r8913
This commit is contained in:
parent
226543582e
commit
693ea1d6f2
@ -2315,9 +2315,7 @@ bool SkyLogic::fnLookAt(uint32 a, uint32 b, uint32 c) {
|
||||
fnNoHuman(0, 0, 0);
|
||||
_skyMouse->lockMouse();
|
||||
|
||||
//waitRelative(0);
|
||||
_skyMouse->waitMouseNotPressed();
|
||||
//waitRelative(40);
|
||||
|
||||
_skyMouse->unlockMouse();
|
||||
fnAddHuman(0, 0, 0);
|
||||
|
@ -167,7 +167,17 @@ void SkyMouse::drawNewMouse() {
|
||||
}
|
||||
|
||||
void SkyMouse::waitMouseNotPressed(void) {
|
||||
while (_mouseB) ;
|
||||
|
||||
bool mousePressed = true;
|
||||
OSystem::Event event;
|
||||
while (mousePressed) {
|
||||
_system->delay_msecs(20);
|
||||
while (_system->poll_event(&event)) {
|
||||
if ((event.event_code == OSystem::EVENT_LBUTTONUP) ||
|
||||
(event.event_code == OSystem::EVENT_QUIT))
|
||||
mousePressed = false;
|
||||
}
|
||||
}
|
||||
_bMouseB = 0;
|
||||
}
|
||||
|
||||
|
@ -197,7 +197,6 @@ void SkyScreen::recreate(void) {
|
||||
void SkyScreen::flip(void) {
|
||||
|
||||
SkyState::_systemVars.mouseFlag |= MF_NO_UPDATE;
|
||||
// drawMouseToBackScreen();
|
||||
uint8 *screenPos = _currentScreen;
|
||||
uint8 *backPos = _backScreen;
|
||||
uint32 copyX, copyWidth;
|
||||
@ -230,7 +229,7 @@ void SkyScreen::flip(void) {
|
||||
backPos += (GRID_H - 1) * GAME_SCREEN_WIDTH;
|
||||
}
|
||||
SkyState::_systemVars.mouseFlag &= ~MF_NO_UPDATE;
|
||||
// _skyMouse->restoreDataToBackScreen();
|
||||
_system->update_screen();
|
||||
}
|
||||
|
||||
void SkyScreen::fnDrawScreen(uint32 palette, uint32 scroll) {
|
||||
|
@ -192,9 +192,10 @@ void SkyState::go() {
|
||||
_skyScreen->recreate();
|
||||
_skyScreen->spriteEngine();
|
||||
_skyScreen->flip();
|
||||
if (_paintGrid)
|
||||
if (_paintGrid) {
|
||||
_skyScreen->showGrid(_skyLogic->_skyGrid->giveGrid(SkyLogic::_scriptVariables[SCREEN]));
|
||||
_system->update_screen();
|
||||
_system->update_screen();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user