[Scummvm-cvs-logs] SF.net SVN: scummvm: [30342] scummvm/branches/branch-0-11-0/backends/ platform/gp2x

djwillis at users.sourceforge.net djwillis at users.sourceforge.net
Tue Jan 8 11:04:05 CET 2008


Revision: 30342
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30342&view=rev
Author:   djwillis
Date:     2008-01-08 02:04:05 -0800 (Tue, 08 Jan 2008)

Log Message:
-----------
Update a few files with changes in the preview 3 GP2X release.

Modified Paths:
--------------
    scummvm/branches/branch-0-11-0/backends/platform/gp2x/build/bundle.sh
    scummvm/branches/branch-0-11-0/backends/platform/gp2x/events.cpp
    scummvm/branches/branch-0-11-0/backends/platform/gp2x/gp2x.cpp

Modified: scummvm/branches/branch-0-11-0/backends/platform/gp2x/build/bundle.sh
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/gp2x/build/bundle.sh	2008-01-08 06:20:21 UTC (rev 30341)
+++ scummvm/branches/branch-0-11-0/backends/platform/gp2x/build/bundle.sh	2008-01-08 10:04:05 UTC (rev 30342)
@@ -38,7 +38,7 @@
 echo Building ZIP bundle.
 if [ -f /usr/bin/zip ]
 	then
-		rm ./"gp2xkernel-open2x-`date '+%Y-%m-%d'`.zip"
+		rm ./"scummvm-gp2x-`date '+%Y-%m-%d'`.zip"
 		cd "scummvm-gp2x-`date '+%Y-%m-%d'`"
 		zip -r -9 "../scummvm-gp2x-`date '+%Y-%m-%d'`.zip" *
 		echo You should have a "scummvm-gp2x-`date '+%Y-%m-%d'`.zip" for the GP2X port ready to go.

Modified: scummvm/branches/branch-0-11-0/backends/platform/gp2x/events.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/gp2x/events.cpp	2008-01-08 06:20:21 UTC (rev 30341)
+++ scummvm/branches/branch-0-11-0/backends/platform/gp2x/events.cpp	2008-01-08 10:04:05 UTC (rev 30342)
@@ -308,33 +308,6 @@
 		case SDL_KEYDOWN:{
 			b = event.kbd.flags = SDLModToOSystemKeyFlags(SDL_GetModState());
 
-			// Alt-Return and Alt-Enter toggle full screen mode
-			if (b == Common::KBD_ALT && (ev.key.keysym.sym == SDLK_RETURN
-			                  || ev.key.keysym.sym == SDLK_KP_ENTER)) {
-				setFullscreenMode(!_fullscreen);
-				break;
-			}
-
-			// Alt-S: Create a screenshot
-			if (b == Common::KBD_ALT && ev.key.keysym.sym == 's') {
-				char filename[20];
-
-				for (int n = 0;; n++) {
-					SDL_RWops *file;
-
-					sprintf(filename, "scummvm%05d.bmp", n);
-					file = SDL_RWFromFile(filename, "r");
-					if (!file)
-						break;
-					SDL_RWclose(file);
-				}
-				if (saveScreenshot(filename))
-					printf("Saved '%s'\n", filename);
-				else
-					printf("Could not save screenshot!\n");
-				break;
-			}
-
 			const bool event_complete = remapKey(ev,event);
 
 			if (event_complete)
@@ -428,6 +401,7 @@
 					case GP2X_BUTTON_L:
 						GP2X_BUTTON_STATE_L = TRUE;
 						break;
+
 					case GP2X_BUTTON_R:
 						if (GP2X_BUTTON_STATE_L == TRUE) {
 							event.kbd.keycode = Common::KEYCODE_0;
@@ -437,6 +411,7 @@
 							event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
 						}
 						break;
+
 					case GP2X_BUTTON_SELECT:
 						if (GP2X_BUTTON_STATE_L == TRUE) {
 							event.type = Common::EVENT_QUIT;
@@ -445,17 +420,16 @@
 							event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0);
 						}
 						break;
+
 					case GP2X_BUTTON_A:
 						if (GP2X_BUTTON_STATE_L == TRUE) {
 							event.type = Common::EVENT_PREDICTIVE_DIALOG;
 						} else {
-						event.kbd.keycode = Common::KEYCODE_PERIOD;
-						event.kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0);
+							event.kbd.keycode = Common::KEYCODE_PERIOD;
+							event.kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0);
 						}
-//						event.kbd.keycode = Common::KEYCODE_PERIOD;
-//						event.kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0);
-
 						break;
+
 					case GP2X_BUTTON_Y:
 						if (GP2X_BUTTON_STATE_L == TRUE) {
 							setZoomOnMouse();
@@ -468,6 +442,7 @@
 						event.kbd.keycode = Common::KEYCODE_RETURN;
 						event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0);
 						break;
+
 					case JOY_BUT_ZERO:
 						event.kbd.keycode = Common::KEYCODE_0;
 						event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0);
@@ -490,28 +465,31 @@
 					//		break;
 					//	}
 					//	break;
+
 					case GP2X_BUTTON_VOLUP:
-						if (GP2X_BUTTON_STATE_L == TRUE) {
-							displayMessageOnOSD("Setting CPU Speed at 230MHz");
-							GP2X_setCpuspeed(200);
+						//if (GP2X_BUTTON_STATE_L == TRUE) {
+						//	displayMessageOnOSD("Setting CPU Speed at 230MHz");
+						//	GP2X_setCpuspeed(200);
 							//event.kbd.keycode = Common::KEYCODE_PLUS;
 							//event.kbd.ascii = mapKey(SDLK_PLUS, ev.key.keysym.mod, 0);
-						} else {
+						//} else {
 							GP2X_mixer_move_volume(1);
 							displayMessageOnOSD("Increasing Volume");
-						}
+						//}
 						break;
+
 					case GP2X_BUTTON_VOLDOWN:
-						if (GP2X_BUTTON_STATE_L == TRUE) {
-							displayMessageOnOSD("Setting CPU Speed at 60MHz");
-							GP2X_setCpuspeed(60);
+						//if (GP2X_BUTTON_STATE_L == TRUE) {
+						//	displayMessageOnOSD("Setting CPU Speed at 60MHz");
+						//	GP2X_setCpuspeed(60);
 							//event.kbd.keycode = Common::KEYCODE_MINUS;
 							//event.kbd.ascii = mapKey(SDLK_MINUS, ev.key.keysym.mod, 0);
-						} else {
+						//} else {
 							GP2X_mixer_move_volume(0);
 							displayMessageOnOSD("Decreasing Volume");
-						}
+						//}
 						break;
+
 				}
 			}
 			return true;
@@ -536,29 +514,37 @@
 						event.kbd.keycode = Common::KEYCODE_ESCAPE;
 						event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0);
 						break;
+
 					case GP2X_BUTTON_A:
 						event.kbd.keycode = Common::KEYCODE_PERIOD;
 						event.kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0);
 						break;
+
 					case GP2X_BUTTON_Y:
-//						event.kbd.keycode = Common::KEYCODE_SPACE;
-//						event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
+						event.kbd.keycode = Common::KEYCODE_SPACE;
+						event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
 						break;
+
 					case GP2X_BUTTON_START:
 						event.kbd.keycode = Common::KEYCODE_RETURN;
 						event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0);
 						break;
+
 					case GP2X_BUTTON_L:
 						GP2X_BUTTON_STATE_L = FALSE;
 						break;
+
 					case GP2X_BUTTON_R:
 						event.kbd.keycode = Common::KEYCODE_F5;
 						event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
 						break;
+
 					case GP2X_BUTTON_VOLUP:
 						break;
+
 					case GP2X_BUTTON_VOLDOWN:
 						break;
+
 				}
 			}
 			return true;

Modified: scummvm/branches/branch-0-11-0/backends/platform/gp2x/gp2x.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/gp2x/gp2x.cpp	2008-01-08 06:20:21 UTC (rev 30341)
+++ scummvm/branches/branch-0-11-0/backends/platform/gp2x/gp2x.cpp	2008-01-08 10:04:05 UTC (rev 30342)
@@ -32,6 +32,7 @@
 #include "backends/platform/gp2x/gp2x-hw.h"
 #include "backends/platform/gp2x/gp2x-mem.h"
 #include "common/config-manager.h"
+#include "common/file.h"
 #include "common/util.h"
 #include "base/main.h"
 
@@ -117,6 +118,21 @@
 
 	ConfMan.registerDefault("savepath", savePath);
 
+	// Setup default extra data path for engine data files to be workingdir/engine-data
+
+	char enginedataPath[PATH_MAX+1];
+
+	strcpy(enginedataPath, workDirName);
+	strcat(enginedataPath, "/engine-data");
+	printf("Current engine-data directory: %s\n", enginedataPath);
+	//struct stat sb;
+	if (stat(enginedataPath, &sb) == -1)
+		if (errno == ENOENT) // Create the dir if it does not exist
+			if (mkdir(enginedataPath, 0755) != 0)
+				warning("mkdir for '%s' failed!", enginedataPath);
+
+	Common::File::addDefaultDirectory(enginedataPath);
+
 	// Note: Review and clean this, it's OTT at the moment.
 
 	#if defined(DUMP_STDOUT)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list