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

GROOVIE: unset _waitingForInput and cleanup

Browse Source 
Unset _waitingForInput to make the game more responsive. Also some cleanup of old commented out code.
This commit is contained in:
Die4Ever 2021-09-14 01:01:29 -05:00 committed by Filippos Karapetis
parent b09a330921
commit 9b490a0864
3 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/groovie/groovie.cpp
View File

@ -321,6 +321,11 @@ Common::Error GroovieEngine::run() {
_system->delayMillis(10);
tmr += 10;
// the script doesn't unset _waitingForInput
// so we unset it here in order to let the script run as many steps as it needs to
// this makes the game more responsive
_waitingForInput = false;
}
// Everything's fine, execute another script step

1
engines/groovie/music.cpp
View File

@ -190,6 +190,7 @@ bool MusicPlayer::play(uint32 fileref, bool loop) {
void MusicPlayer::stop() {
_backgroundFileRef = 0;
setBackgroundDelay(0);
unload();
}

30
engines/groovie/script.cpp
View File

@ -1462,27 +1462,21 @@ void Script::o_copyrecttobg() { // 0x37
right = 640 - 1;
}
uint16 i, width = right - left, height = bottom - top;
uint16 width = right - left, height = bottom - top;
uint32 offset = 0;
byte *fg, *bg;
uint32 pitch = _vm->_graphicsMan->_foreground.pitch;
debugC(1, kDebugScript, "Groovie::Script: COPYRECT((%d,%d)->(%d,%d))", left, top, right, bottom);
debugC(2, kDebugVideo, "Groovie::Script: @0x%04X: COPYRECT((%d,%d)->(%d,%d))",_currentInstruction-9, left, top, right, bottom);
fg = (byte *)_vm->_graphicsMan->_foreground.getBasePtr(left, top - baseTop);
bg = (byte *)_vm->_graphicsMan->_background.getBasePtr(left, top - baseTop);
for (i = 0; i < height; i++) {
byte *fg = (byte *)_vm->_graphicsMan->_foreground.getBasePtr(left, top - baseTop);
byte *bg = (byte *)_vm->_graphicsMan->_background.getBasePtr(left, top - baseTop);
for (uint16 i = 0; i < height; i++) {
memcpy(bg + offset, fg + offset, width * _vm->_graphicsMan->_foreground.format.bytesPerPixel);
offset += pitch;
}
// _vm->_graphicsMan->_background.copyFrom(_vm->_graphicsMan->_foreground);
//{
// Graphics::Surface *_bg = &_vm->_graphicsMan->_background;
// _vm->_system->copyRectToScreen(_bg->getPixels(), _bg->pitch, 0, (_vm->_system->getHeight() - _bg->h) / 2, _bg->w, _bg->h);
//}
_vm->_system->copyRectToScreen(_vm->_graphicsMan->_background.getBasePtr(left, top - baseTop), pitch, left, top, width, height);
_vm->_system->copyRectToScreen(bg, pitch, left, top, width, height);
_vm->_graphicsMan->change();
}
@ -1895,14 +1889,12 @@ void Script::o2_midicontrol() {
uint16 arg1 = readScript16bits();
uint16 arg2 = readScript16bits();
// TODO: see if we need to revisit the commented code here, maybe @Alphard-o can help
switch (arg1) {
case 0:
// Stop Playback
debugC(1, kDebugScript, "Groovie::Script: MIDI %d:Stop: %d", arg1, arg2);
_vm->_musicPlayer->stop();
_vm->_soundQueue.stopAll();
//_vm->_musicPlayer->setBackgroundDelay(0);
break;
case 1:
@ -1910,8 +1902,6 @@ void Script::o2_midicontrol() {
debugC(1, kDebugScript, "Groovie::Script: MIDI %d: Play song %d", arg1, arg2);
_vm->_musicPlayer->playSong(arg2);
_vm->_musicPlayer->setUserVolume(100);
//_vm->_musicPlayer->setBackgroundSong(arg2);
//_vm->_musicPlayer->startBackground();
break;
case 3:
@ -1975,13 +1965,10 @@ void Script::o2_vdxtransition() {
void Script::o2_savescreen() {
uint16 val = readScript16bits();
// TODO: Parameter and cleanup
// TODO: Parameter
if (val)
warning("Groovie::Script: o2_copyscreentobg: Param is %d", val);
// Graphics::Surface *screen = _vm->_system->lockScreen();
// _vm->_graphicsMan->_background.copyFrom(screen->getSubArea(Common::Rect(0, 80, 640, 320)));
// _vm->_system->unlockScreen();
_vm->_graphicsMan->saveScreen();
debugC(1, kDebugScript, "Groovie::Script: CopyScreenToBG3: 0x%04X", val);
@ -1991,13 +1978,10 @@ void Script::o2_savescreen() {
void Script::o2_restorescreen() {
uint16 val = readScript16bits();
// TODO: Parameter and cleanup
// TODO: Parameter
if (val)
warning("Groovie::Script: o2_copybgtoscreen: Param is %d", val);
// Graphics::Surface *screen = _vm->_system->lockScreen();
// _vm->_graphicsMan->_background.copyRectToSurface(*screen, 0, 80, Common::Rect(0, 0, 640, 320 - 80));
// _vm->_system->unlockScreen();
_vm->_graphicsMan->restoreScreen();
debugC(1, kDebugScript, "Groovie::Script: CopyBG3ToScreen: 0x%04X", val);