[Scummvm-cvs-logs] SF.net SVN: scummvm:[52879] scummvm/branches/branch-1-2-0

[vinterstum at users.sourceforge.net]

Revision: 52879
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52879&view=rev
Author:   vinterstum
Date:     2010-09-25 13:01:48 +0000 (Sat, 25 Sep 2010)

Log Message:
-----------
IPHONE: Fixed suspend mode, corrected some formatting and copying all icons when creating package.

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/backends/platform/iphone/iphone_main.m
    scummvm/branches/branch-1-2-0/backends/platform/iphone/osys_video.cpp
    scummvm/branches/branch-1-2-0/dists/iphone/Info.plist
    scummvm/branches/branch-1-2-0/ports.mk

Modified: scummvm/branches/branch-1-2-0/backends/platform/iphone/iphone_main.m
===================================================================
--- scummvm/branches/branch-1-2-0/backends/platform/iphone/iphone_main.m	2010-09-25 12:59:35 UTC (rev 52878)
+++ scummvm/branches/branch-1-2-0/backends/platform/iphone/iphone_main.m	2010-09-25 13:01:48 UTC (rev 52879)
@@ -103,15 +103,26 @@
 	[NSThread detachNewThreadSelector:@selector(mainLoop:) toTarget:self withObject:nil];
 }
 
+- (void)applicationDidResume
+{
+}
+
+- (void)applicationWillSuspend
+{
+}
+
+- (void)applicationWillTerminate
+{
+}
+
 - (void)applicationSuspend:(struct __GSEvent *)event {
 	//[self setApplicationBadge:NSLocalizedString(@"ON", nil)];
 	[_view applicationSuspend];
 }
 
 - (void)applicationResume:(struct __GSEvent *)event {
-	[self removeApplicationBadge];
 	[_view applicationResume];
-
+	
 	// Workaround, need to "hide" and unhide the statusbar to properly remove it,
 	// since the Springboard has put it back without apparently flagging our application.
     [self setStatusBarHidden:YES animated:YES];

Modified: scummvm/branches/branch-1-2-0/backends/platform/iphone/osys_video.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/backends/platform/iphone/osys_video.cpp	2010-09-25 12:59:35 UTC (rev 52878)
+++ scummvm/branches/branch-1-2-0/backends/platform/iphone/osys_video.cpp	2010-09-25 13:01:48 UTC (rev 52879)
@@ -283,16 +283,19 @@
 			srcY -= top;
 			top = 0;
 		}
-			//int right = left + _mouseWidth;
+
 		int bottom = top + _mouseHeight;
 		if (bottom > _screenWidth)
 			bottom = _screenWidth;
-			int displayWidth = _mouseWidth;
+
+		int displayWidth = _mouseWidth;
 		if (_mouseWidth + left > _screenWidth)
 			displayWidth = _screenWidth - left;
-			int displayHeight = _mouseHeight;
+
+		int displayHeight = _mouseHeight;
 		if (_mouseHeight + top > _screenHeight)
 			displayHeight = _screenHeight - top;
+
 		byte *src = &_mouseBuf[srcY * _mouseWidth + srcX];
 		uint16 *dst = &_fullscreen[top * _screenWidth + left];
 		for (int y = displayHeight; y > srcY; y--) {

Modified: scummvm/branches/branch-1-2-0/dists/iphone/Info.plist
===================================================================
--- scummvm/branches/branch-1-2-0/dists/iphone/Info.plist	2010-09-25 12:59:35 UTC (rev 52878)
+++ scummvm/branches/branch-1-2-0/dists/iphone/Info.plist	2010-09-25 13:01:48 UTC (rev 52879)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -15,11 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.2.0pre</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.2.0pre</string>
 	<key>CFBundleVersion</key>
 	<string>svn</string>
 	<key>CFBundleIconFile</key>
@@ -28,6 +26,7 @@
 	<array>
 		<string>icon.png</string>
 		<string>icon-72.png</string>
+		<string>icon4.png</string>
 	</array>
 	<key>UIPrerenderedIcon</key>
 	<true/>

Modified: scummvm/branches/branch-1-2-0/ports.mk
===================================================================
--- scummvm/branches/branch-1-2-0/ports.mk	2010-09-25 12:59:35 UTC (rev 52878)
+++ scummvm/branches/branch-1-2-0/ports.mk	2010-09-25 13:01:48 UTC (rev 52879)
@@ -65,8 +65,7 @@
 	ldid -S scummvm
 	chmod 755 scummvm
 	cp scummvm $(bundle_name)/ScummVM
-	cp $(srcdir)/dists/iphone/icon.png $(bundle_name)/
-	cp $(srcdir)/dists/iphone/icon-72.png $(bundle_name)/	
+	cp $(srcdir)/dists/iphone/icon*.png $(bundle_name)/
 	cp $(srcdir)/dists/iphone/Default.png $(bundle_name)/
 
 # Location of static libs for the iPhone


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