diff options
| -rw-r--r-- | backends/platform/psp/osys_psp.cpp | 5 | ||||
| -rw-r--r-- | backends/platform/psp/osys_psp.h | 4 | ||||
| -rw-r--r-- | common/system.cpp | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index 480b0f31bf..c3e3e3545b 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -637,6 +637,11 @@ void OSystem_PSP::quit() { sceKernelExitGame(); } +void OSystem_PSP::getTimeAndDate(struct tm &t) const { + time_t curTime = time(0); + t = *localtime(&curTime); +} + void OSystem_PSP::setWindowCaption(const char *caption) { } diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index d3e04289ae..a59e927b97 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -26,6 +26,8 @@ #include "common/scummsys.h" #include "common/system.h" #include "graphics/surface.h" +#include "backends/fs/psp/psp-fs-factory.h" + #include <SDL.h> @@ -135,6 +137,8 @@ public: Common::SaveFileManager *getSavefileManager() { return _savefile; } Audio::Mixer *getMixer() { return _mixer; } Common::TimerManager *getTimerManager() { return _timer; } + FilesystemFactory *getFilesystemFactory() { return &PSPFilesystemFactory::instance(); } + void getTimeAndDate(struct tm &t) const; virtual void quit(); diff --git a/common/system.cpp b/common/system.cpp index 6328f392b8..8c9ca46da6 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -146,12 +146,10 @@ void OSystem::getTimeAndDate(struct tm &t) const { #include "backends/fs/palmos/palmos-fs-factory.h" #elif defined(__PLAYSTATION2__) #include "backends/fs/ps2/ps2-fs-factory.h" -#elif defined(__PSP__) - #include "backends/fs/psp/psp-fs-factory.h" #endif FilesystemFactory *OSystem::getFilesystemFactory() { - #if defined(__amigaos4__) || defined(__DC__) || defined(__SYMBIAN32__) || defined(UNIX) || defined(WIN32) + #if defined(__amigaos4__) || defined(__DC__) || defined(__SYMBIAN32__) || defined(UNIX) || defined(WIN32) || defined(__PSP__) // These ports already implement this function, so it should never be called. return 0; #elif defined(__DS__) @@ -162,8 +160,6 @@ FilesystemFactory *OSystem::getFilesystemFactory() { return &PalmOSFilesystemFactory::instance(); #elif defined(__PLAYSTATION2__) return &Ps2FilesystemFactory::instance(); - #elif defined(__PSP__) - return &PSPFilesystemFactory::instance(); #else #error Unknown and unsupported backend in OSystem::getFilesystemFactory #endif |