libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-05 16:21:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

GRIM: Add return to launcher support.

Browse Source 
Also fix a memory leak, and reinitialize a global var in lua
This commit is contained in:
Bastien Bouclet 2012-01-31 21:39:34 +01:00
parent 99520661cb
commit 00d756433f
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
View File

@ -75,6 +75,8 @@ SurfaceSdlGraphicsManager::~SurfaceSdlGraphicsManager() {
// Unregister the event observer // Unregister the event observer
if (g_system->getEventManager()->getEventDispatcher() != NULL) if (g_system->getEventManager()->getEventDispatcher() != NULL)
g_system->getEventManager()->getEventDispatcher()->unregisterObserver(this); g_system->getEventManager()->getEventDispatcher()->unregisterObserver(this);
closeOverlay();
} }
void SurfaceSdlGraphicsManager::initEventObserver() { void SurfaceSdlGraphicsManager::initEventObserver() {

13
engines/grim/grim.cpp
View File

@ -38,6 +38,7 @@
#endif #endif
#include "common/archive.h" #include "common/archive.h"
#include "common/debug-channels.h"
#include "common/events.h" #include "common/events.h"
#include "common/file.h" #include "common/file.h"
#include "common/fs.h" #include "common/fs.h"
@ -193,6 +194,8 @@ GrimEngine::~GrimEngine() {
delete g_driver; delete g_driver;
g_driver = NULL; g_driver = NULL;
delete _iris; delete _iris;
DebugMan.clearAllDebugChannels();
} }
void GrimEngine::clearPools() { void GrimEngine::clearPools() {
@ -583,6 +586,9 @@ void GrimEngine::mainLoop() {
resetShortFrame = !resetShortFrame; resetShortFrame = !resetShortFrame;
} }
if (shouldQuit())
return;
if (_savegameLoadRequest) { if (_savegameLoadRequest) {
savegameRestore(); savegameRestore();
} }
@ -647,9 +653,6 @@ void GrimEngine::mainLoop() {
if (type == Common::EVENT_KEYDOWN || type == Common::EVENT_KEYUP) { if (type == Common::EVENT_KEYDOWN || type == Common::EVENT_KEYUP) {
handleControls(type, event.kbd.keycode, event.kbd.flags, event.kbd.ascii); handleControls(type, event.kbd.keycode, event.kbd.flags, event.kbd.ascii);
} }
// Check for "Hard" quit"
if (type == Common::EVENT_QUIT)
return;
if (type == Common::EVENT_SCREEN_CHANGED) if (type == Common::EVENT_SCREEN_CHANGED)
_refreshDrawNeeded = true; _refreshDrawNeeded = true;
@ -1054,4 +1057,8 @@ void GrimEngine::clearEventQueue() {
} }
} }
bool GrimEngine::hasFeature(EngineFeature f) const {
return f == kSupportsRTL;
}
} // end of namespace Grim } // end of namespace Grim

3
engines/grim/grim.h
View File

@ -152,6 +152,9 @@ public:
void changeHardwareState(); void changeHardwareState();
// Engine APIs
bool hasFeature(EngineFeature f) const;
Common::StringArray _listFiles; Common::StringArray _listFiles;
Common::StringArray::const_iterator _listFilesIter; Common::StringArray::const_iterator _listFilesIter;

1
engines/grim/lua/lauxlib.cpp
View File

@ -82,6 +82,7 @@ void lua_removelibslists() {
luaM_free(list); luaM_free(list);
list = nextList; list = nextList;
} }
list_of_libs = NULL;
} }
void luaL_openlib(luaL_reg *l, int32 n) { void luaL_openlib(luaL_reg *l, int32 n) {