Merge pull request #426 from sunmax/master

PS2: Pull request to master for latest PS2 code

2 files changed, 15 insertions, 0 deletions

diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index 65840ae174..8498e50b8d 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -217,6 +217,11 @@ void MainMenuDialog::reflowLayout() {
 void MainMenuDialog::save() {
 	int slot = _saveDialog->runModalWithCurrentTarget();
 
+	#if defined(__PLAYSTATION2__) && defined(DYNAMIC_MODULES)
+	char pokeme[32];
+	snprintf(pokeme,32,"hack");
+	#endif
+
 	if (slot >= 0) {
 		Common::String result(_saveDialog->getResultString());
 		if (result.empty()) {
diff --git a/engines/sword25/util/lua/loslib.cpp b/engines/sword25/util/lua/loslib.cpp
index 25bfa2d1b5..055dfdf19e 100644
--- a/engines/sword25/util/lua/loslib.cpp
+++ b/engines/sword25/util/lua/loslib.cpp
@@ -113,6 +113,9 @@ static int getfield (lua_State *L, const char *key, int d) {
 
 
 static int os_date (lua_State *L) {
+  #ifdef __PLAYSTATION2__ // missing: gmtime & strftime
+  lua_pushnil(L);
+  #else
   const char *s = luaL_optstring(L, 1, "%c");
   // FIXME: Rewrite the code below to use OSystem::getTimeAndDate
   // Alternatively, remove it, if sword25 does not use it.
@@ -160,6 +163,7 @@ static int os_date (lua_State *L) {
     }
     luaL_pushresult(&b);
   }
+  #endif
   return 1;
 }
 
@@ -167,6 +171,9 @@ static int os_date (lua_State *L) {
 static int os_time (lua_State *L) {
   // FIXME: Rewrite the code below to use OSystem::getTimeAndDate.
   // Alternatively, remove it, if sword25 does not use it.
+  #ifdef __PLAYSTATION2__ // missing: mktime
+  lua_pushnil(L);
+  #else
   time_t t;
   if (lua_isnoneornil(L, 1))  /* called without args? */
     t = time(NULL);  /* get current time */
@@ -187,6 +194,7 @@ static int os_time (lua_State *L) {
     lua_pushnil(L);
   else
     lua_pushnumber(L, (lua_Number)t);
+  #endif
   return 1;
 }
 
@@ -195,8 +203,10 @@ static int os_difftime (lua_State *L) {
   // FIXME: difftime is not portable, unfortunately.
   // So we either have to replace this code, or just remove it,
   // depending on whether sword25 actually uses it.
+  #ifndef __PLAYSTATION2__ // missing: difftime
   lua_pushnumber(L, difftime((time_t)(luaL_checknumber(L, 1)),
                              (time_t)(luaL_optnumber(L, 2, 0))));
+  #endif
   return 1;
 }