# HG changeset patch
# User koda
# Date 1287246928 -7200
# Node ID 9660600e43cbabe5812aca625445f720231c57e4
# Parent 9df7b4812da9c0a0890873630283c297a138fa2c
fix some glitches
diff -r 9df7b4812da9 -r 9660600e43cb project_files/HedgewarsMobile/Classes/AmmoMenuViewController.h
--- a/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.h Fri Oct 15 01:10:59 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.h Sat Oct 16 18:35:28 2010 +0200
@@ -27,6 +27,7 @@
NSArray *imagesArray;
uint8_t *delay;
+ BOOL *shouldUpdateImage;
CGPoint startingPoint;
BOOL isVisible;
}
diff -r 9df7b4812da9 -r 9660600e43cb project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m
--- a/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m Fri Oct 15 01:10:59 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m Sat Oct 16 18:35:28 2010 +0200
@@ -51,9 +51,11 @@
self.view.autoresizingMask = UIViewAutoresizingNone;
self.isVisible = NO;
- delay = (uint8_t *) calloc(HW_getNumberOfWeapons(), sizeof(uint8_t));
+ delay = (uint8_t *)calloc(HW_getNumberOfWeapons(), sizeof(uint8_t));
HW_getAmmoDelays(delay);
+ shouldUpdateImage = (BOOL *)calloc(HW_getNumberOfWeapons(), sizeof(BOOL));
+
[super viewDidLoad];
}
@@ -175,18 +177,18 @@
if (delay[i]-turns >= 0) {
button.layer.borderColor = [[UIColor lightGrayColor] CGColor];
[button setTitle:[NSString stringWithFormat:@" %d ",delay[i]-turns+1] forState:UIControlStateNormal];
- if (button.currentBackgroundImage == nil) {
+ if (button.currentBackgroundImage == nil || shouldUpdateImage[i] == NO) {
UIImage *img = [self.imagesArray objectAtIndex:i];
[button setBackgroundImage:[img convertToGrayScale] forState:UIControlStateNormal];
- button.imageView.tag = 10000;
+ shouldUpdateImage[i] = YES;
}
} else {
button.layer.borderColor = [UICOLOR_HW_YELLOW_TEXT CGColor];
[button setTitle:nil forState:UIControlStateNormal];
- if (button.currentBackgroundImage == nil || button.imageView.tag == 10000) {
+ if (button.currentBackgroundImage == nil || shouldUpdateImage[i] == YES) {
UIImage *img = [self.imagesArray objectAtIndex:i];
[button setBackgroundImage:img forState:UIControlStateNormal];
- button.imageView.tag = 0;
+ shouldUpdateImage[i] = NO;
}
}
button.enabled = YES;
@@ -195,6 +197,7 @@
[button setBackgroundImage:nil forState:UIControlStateNormal];
button.layer.borderColor = [[UIColor darkGrayColor] CGColor];
button.enabled = NO;
+ shouldUpdateImage[i] = NO;
}
}
} else {
@@ -274,6 +277,8 @@
self.buttonsArray = nil;
free(delay);
delay = NULL;
+ free(shouldUpdateImage);
+ shouldUpdateImage = NULL;
MSG_DIDUNLOAD();
[super viewDidUnload];
}
diff -r 9df7b4812da9 -r 9660600e43cb project_files/HedgewarsMobile/Classes/GameConfigViewController.m
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Fri Oct 15 01:10:59 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sat Oct 16 18:35:28 2010 +0200
@@ -256,7 +256,7 @@
[self.imgContainer removeFromSuperview];
self.imgContainer = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 40)];
- for (int i = 0; i < 1 + random()%40; i++) {
+ for (int i = 0; i < 1 + random()%20; i++) {
NSString *hat = [hatArray objectAtIndex:random()%numberOfHats];
NSString *hatFile = [[NSString alloc] initWithFormat:@"%@/%@", HATS_DIRECTORY(), hat];
@@ -266,7 +266,10 @@
[hatSprite release];
UIImageView *hog = [[UIImageView alloc] initWithImage:hogWithHat];
- hog.frame = CGRectMake(10*(i+1)+random()%30, 30, 32, 32);
+ int x = 15*(i+1)+random()%40;
+ if (x + 32 > 300)
+ x = i*10;
+ hog.frame = CGRectMake(x, 30, 32, 32);
[self.imgContainer addSubview:hog];
[hog release];
}
diff -r 9df7b4812da9 -r 9660600e43cb project_files/HedgewarsMobile/Classes/GameSetup.m
--- a/project_files/HedgewarsMobile/Classes/GameSetup.m Fri Oct 15 01:10:59 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameSetup.m Sat Oct 16 18:35:28 2010 +0200
@@ -52,7 +52,7 @@
// if path is empty it means that you have to create a new file, otherwise read from that file
if ([path isEqualToString:@""] == YES) {
NSDateFormatter *outputFormatter = [[NSDateFormatter alloc] init];
- [outputFormatter setDateFormat:@"yyyy.MM.dd '@' HH-mm"];
+ [outputFormatter setDateFormat:@"yyyy-MM-dd '@' HH.mm"];
NSString *newDateString = [outputFormatter stringFromDate:[NSDate date]];
self.savePath = [SAVES_DIRECTORY() stringByAppendingFormat:@"%@.hws", newDateString];
[outputFormatter release];
@@ -416,8 +416,7 @@
case 'q':
// game ended, can remove the savefile
[[NSFileManager defaultManager] removeItemAtPath:self.savePath error:nil];
- // so update the relative viewcontroler and the overlay
- [[NSNotificationCenter defaultCenter] postNotificationName:@"removedSave" object:nil];
+ //[[NSNotificationCenter defaultCenter] postNotificationName:@"removedSave" object:nil];
// and remove + disable the overlay
[[NSNotificationCenter defaultCenter] postNotificationName:@"remove overlay" object:nil];
setGameRunning(NO);
diff -r 9df7b4812da9 -r 9660600e43cb project_files/HedgewarsMobile/Classes/MapConfigViewController.m
--- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Fri Oct 15 01:10:59 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Sat Oct 16 18:35:28 2010 +0200
@@ -467,7 +467,7 @@
-(void) didReceiveMemoryWarning {
self.dataSourceArray = nil;
- self.lastIndexPath = nil;
+ //self.lastIndexPath = nil;
MSG_MEMCLEAN();
[super didReceiveMemoryWarning];
diff -r 9df7b4812da9 -r 9660600e43cb project_files/HedgewarsMobile/Classes/OverlayViewController.m
--- a/project_files/HedgewarsMobile/Classes/OverlayViewController.m Fri Oct 15 01:10:59 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.m Sat Oct 16 18:35:28 2010 +0200
@@ -119,7 +119,6 @@
isAttacking = NO;
wasVisible = NO;
isPopoverVisible = NO; // it is called "popover" even on the iphone
- self.view.alpha = 0;
}
return self;
}
@@ -128,6 +127,7 @@
CGRect screenRect = [[UIScreen mainScreen] bounds];
self.view.frame = CGRectMake(0, 0, screenRect.size.height, screenRect.size.width);
self.view.center = CGPointMake(self.view.frame.size.height/2, self.view.frame.size.width/2);
+ self.view.alpha = 0;
// detrmine the quanitiy and direction of the rotation
if (self.interfaceOrientation == UIInterfaceOrientationLandscapeLeft) {
@@ -263,6 +263,9 @@
-(void) viewDidUnload {
// only objects initialized in viewDidLoad should be here
[[NSNotificationCenter defaultCenter] removeObserver:self];
+ [NSObject cancelPreviousPerformRequestsWithTarget:self
+ selector:@selector(unsetPreciseStatus)
+ object:nil];
dimTimer = nil;
self.helpPage = nil;
[self dismissPopover];
diff -r 9df7b4812da9 -r 9660600e43cb project_files/HedgewarsMobile/Classes/SavedGamesViewController.m
--- a/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Fri Oct 15 01:10:59 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Sat Oct 16 18:35:28 2010 +0200
@@ -41,16 +41,12 @@
-(void) viewDidLoad {
self.tableView.backgroundView = nil;
- [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(viewWillAppear:)
- name:@"removedSave"
- object:nil];
[super viewDidLoad];
}
-(void) viewWillAppear:(BOOL)animated {
+ [self updateTable];
[super viewWillAppear:animated];
- [self updateTable];
}
#pragma mark -
@@ -198,11 +194,12 @@
NSString *filePath = [NSString stringWithFormat:@"%@/%@",SAVES_DIRECTORY(),[self.listOfSavegames objectAtIndex:[indexPath row]]];
NSDictionary *allDataNecessary = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSDictionary dictionary],@"game_dictionary",
filePath,@"savefile",
[NSNumber numberWithBool:NO],@"netgame",
+ [NSDictionary dictionaryWithObject:[NSNumber numberWithInt:self.interfaceOrientation] forKey:@"orientation"],@"game_dictionary",
nil];
[[SDLUIKitDelegate sharedAppDelegate] startSDLgame:allDataNecessary];
+ [self.parentViewController dismissModalViewControllerAnimated:NO];
}
#pragma mark -
diff -r 9df7b4812da9 -r 9660600e43cb project_files/HedgewarsMobile/Classes/UIImageExtra.m
--- a/project_files/HedgewarsMobile/Classes/UIImageExtra.m Fri Oct 15 01:10:59 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/UIImageExtra.m Sat Oct 16 18:35:28 2010 +0200
@@ -138,9 +138,9 @@
UIImage *newImage = [UIImage imageWithCGImage:imageRef];
// Release colorspace, context and bitmap information
- CGColorSpaceRelease(colorSpace);
+ CFRelease(imageRef);
CGContextRelease(context);
- CFRelease(imageRef);
+ CGColorSpaceRelease(colorSpace);
// Return the new grayscale image
return newImage;
diff -r 9df7b4812da9 -r 9660600e43cb project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Fri Oct 15 01:10:59 2010 +0200
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sat Oct 16 18:35:28 2010 +0200
@@ -2147,7 +2147,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\nmkdir ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/btn*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/ammopic.png ${PROJECT_DIR}/Data/Graphics/Btn/iconAmmo.png\ncp ${PROJECT_DIR}/../../QTfrontend/res/icon*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp -R ${PROJECT_DIR}/../../QTfrontend/res/botlevels ${PROJECT_DIR}/Data/Graphics/Hedgehog/botlevels\n\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\nfind ${PROJECT_DIR}/Data -name *.xcf -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#delete dummy maps and hats\nrm -rf ${PROJECT_DIR}/Data/Maps/{test*,Ruler}\nrm -rf ${PROJECT_DIR}/Data/Hats/{TeamCap,TeamHeadband,TeamHair}\n\n#copy mono audio\ncp -R ${PROJECT_DIR}/audio/* ${PROJECT_DIR}/Data/\n\n#the following ones must be removed when their support is implemented\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,FlightJoust}\n\n#move Lua maps in Missions\nmkdir ${PROJECT_DIR}/Data/Missions/Maps/\nmv ${PROJECT_DIR}/Data/Maps/{Basketball,Knockball} ${PROJECT_DIR}/Data/Missions/Maps/\n\n#reduce the number of flakes for City\nawk '{if ($1 == 1500) $1=40; print $0}' < ${PROJECT_DIR}/Data/Themes/City/theme.cfg > /tmp/tempfile\nmv /tmp/tempfile ${PROJECT_DIR}/Data/Themes/City/theme.cfg\n\n#remove Isalnd from the list of Themes\nawk '{if ($1 != \"Island\") print $0}' < ${PROJECT_DIR}/Data/Themes/themes.cfg > /tmp/tempfile && mv /tmp/tempfile ${PROJECT_DIR}/Data/Themes/themes.cfg\n\n#remove Isalnd from the Maps and themes\nrm -rf ${PROJECT_DIR}/Data/Themes/Island\nawk '{if ($1 == \"Island\") print \"Nature\"}' < ${PROJECT_DIR}/Data/Maps/Cave/map.cfg > /tmp/tempfile && mv /tmp/tempfile ${PROJECT_DIR}/Data/Maps/Cave/map.cfg\nawk '{if ($1 == \"Island\") print \"Nature\"}' < ${PROJECT_DIR}/Data/Maps/Lonely_Island/map.cfg > /tmp/tempfile && mv /tmp/tempfile ${PROJECT_DIR}/Data/Maps/Lonely_Island/map.cfg\nawk '{if ($1 == \"Island\") print \"Nature\"}' < ${PROJECT_DIR}/Data/Maps/PirateFlag/map.cfg > /tmp/tempfile && mv /tmp/tempfile ${PROJECT_DIR}/Data/Maps/PirateFlag/map.cfg\n\n#delete the Classic voice\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/Classic\n\n#delete useless fonts\nrm -rf ${PROJECT_DIR}/Data/Fonts/{wqy-zenhei.ttc,DroidSansFallback.ttf}\n\n#delete all names, reserved hats\nrm -rf ${PROJECT_DIR}/Data/Names/\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/\n";
+ shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\nmkdir ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/btn*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/ammopic.png ${PROJECT_DIR}/Data/Graphics/Btn/iconAmmo.png\ncp ${PROJECT_DIR}/../../QTfrontend/res/icon*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp -R ${PROJECT_DIR}/../../QTfrontend/res/botlevels ${PROJECT_DIR}/Data/Graphics/Hedgehog/botlevels\n\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.svgz -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\nfind ${PROJECT_DIR}/Data -name *.xcf -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#delete dummy maps and hats\nrm -rf ${PROJECT_DIR}/Data/Maps/{test*,Ruler}\nrm -rf ${PROJECT_DIR}/Data/Hats/{TeamCap,TeamHeadband,TeamHair}\n\n#copy mono audio\ncp -R ${PROJECT_DIR}/audio/* ${PROJECT_DIR}/Data/\n\n#the following ones must be removed when their support is implemented\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,FlightJoust}\n\n#move Lua maps in Missions\nmkdir ${PROJECT_DIR}/Data/Missions/Maps/\nmv ${PROJECT_DIR}/Data/Maps/{Basketball,Knockball} ${PROJECT_DIR}/Data/Missions/Maps/\n\n#reduce the number of flakes for City\nawk '{if ($1 == 1500) $1=40; print $0}' < ${PROJECT_DIR}/Data/Themes/City/theme.cfg > /tmp/tempfile\nmv /tmp/tempfile ${PROJECT_DIR}/Data/Themes/City/theme.cfg\n\n#remove Isalnd from the list of Themes\nawk '{if ($1 != \"Island\") print $0}' < ${PROJECT_DIR}/Data/Themes/themes.cfg > /tmp/tempfile && mv /tmp/tempfile ${PROJECT_DIR}/Data/Themes/themes.cfg\n\n#remove Isalnd from the Maps and themes\nrm -rf ${PROJECT_DIR}/Data/Themes/Island\nawk '{if ($1 == \"Island\") print \"Nature\"}' < ${PROJECT_DIR}/Data/Maps/Cave/map.cfg > /tmp/tempfile && mv /tmp/tempfile ${PROJECT_DIR}/Data/Maps/Cave/map.cfg\nawk '{if ($1 == \"Island\") print \"Nature\"}' < ${PROJECT_DIR}/Data/Maps/Lonely_Island/map.cfg > /tmp/tempfile && mv /tmp/tempfile ${PROJECT_DIR}/Data/Maps/Lonely_Island/map.cfg\nawk '{if ($1 == \"Island\") print \"Nature\"}' < ${PROJECT_DIR}/Data/Maps/PirateFlag/map.cfg > /tmp/tempfile && mv /tmp/tempfile ${PROJECT_DIR}/Data/Maps/PirateFlag/map.cfg\n\n#delete the Classic voice\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/Classic\n\n#delete useless fonts\nrm -rf ${PROJECT_DIR}/Data/Fonts/{wqy-zenhei.ttc,DroidSansFallback.ttf}\n\n#delete all names, reserved hats\nrm -rf ${PROJECT_DIR}/Data/Names/\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/\n";
showEnvVarsInLog = 0;
};
9283011B0F10CB2D00CC5A3C /* Build libfpc.a */ = {
diff -r 9df7b4812da9 -r 9660600e43cb project_files/HedgewarsMobile/Resources/Settings/credits.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/credits.plist Fri Oct 15 01:10:59 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/Settings/credits.plist Sat Oct 16 18:35:28 2010 +0200
@@ -71,7 +71,7 @@
Maze maps
- Main graphics and art director
+ Graphics
diff -r 9df7b4812da9 -r 9660600e43cb project_files/HedgewarsMobile/SDL.patch
--- a/project_files/HedgewarsMobile/SDL.patch Fri Oct 15 01:10:59 2010 +0200
+++ b/project_files/HedgewarsMobile/SDL.patch Sat Oct 16 18:35:28 2010 +0200
@@ -1,48 +1,7 @@
-diff -r f50c7996d925 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
---- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Wed Sep 29 21:24:50 2010 -0700
-+++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sun Oct 03 00:21:37 2010 +0200
-@@ -106,6 +106,7 @@
- 04F2AF561104ABD200D6DDF7 /* SDL_assert.c in Sources */ = {isa = PBXBuildFile; fileRef = 04F2AF551104ABD200D6DDF7 /* SDL_assert.c */; };
- 56ED04E1118A8EE200A56AA6 /* SDL_power.c in Sources */ = {isa = PBXBuildFile; fileRef = 56ED04E0118A8EE200A56AA6 /* SDL_power.c */; };
- 56ED04E3118A8EFD00A56AA6 /* SDL_syspower.m in Sources */ = {isa = PBXBuildFile; fileRef = 56ED04E2118A8EFD00A56AA6 /* SDL_syspower.m */; };
-+ 61F7E7F4125543DA00DE6C14 /* SDL_uikitappdelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FD689FCC0E26E9D400F90B21 /* SDL_uikitappdelegate.m */; };
- FD24846D0E5655AE0021E198 /* SDL_uikitkeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = FD24846B0E5655AE0021E198 /* SDL_uikitkeyboard.h */; };
- FD3F495C0DEA5B2100C5B771 /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8CC0DD52EB400FB1D6B /* begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
- FD3F495D0DEA5B2100C5B771 /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8CD0DD52EB400FB1D6B /* close_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
-@@ -192,8 +193,6 @@
- FD689F250E26E5D900F90B21 /* SDL_uikitwindow.m in Sources */ = {isa = PBXBuildFile; fileRef = FD689F150E26E5D900F90B21 /* SDL_uikitwindow.m */; };
- FD689F260E26E5D900F90B21 /* SDL_uikitopenglview.h in Headers */ = {isa = PBXBuildFile; fileRef = FD689F160E26E5D900F90B21 /* SDL_uikitopenglview.h */; };
- FD689F270E26E5D900F90B21 /* SDL_uikitopenglview.m in Sources */ = {isa = PBXBuildFile; fileRef = FD689F170E26E5D900F90B21 /* SDL_uikitopenglview.m */; };
-- FD689FCE0E26E9D400F90B21 /* SDL_uikitappdelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FD689FCC0E26E9D400F90B21 /* SDL_uikitappdelegate.m */; };
-- FD689FCF0E26E9D400F90B21 /* SDL_uikitappdelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = FD689FCD0E26E9D400F90B21 /* SDL_uikitappdelegate.h */; };
- FD6C83B60DEA66E500ABEE55 /* SDL_systimer.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99BA2D0DD52EDC00FB1D6B /* SDL_systimer.h */; };
- FD8BD7AC0E27DCA400B52CD5 /* SDL_opengles.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8BD7AB0E27DCA400B52CD5 /* SDL_opengles.h */; settings = {ATTRIBUTES = (Public, ); }; };
- FD8BD8250E27E25900B52CD5 /* SDL_sysloadso.c in Sources */ = {isa = PBXBuildFile; fileRef = FD8BD8190E27E25900B52CD5 /* SDL_sysloadso.c */; };
-@@ -1186,7 +1185,6 @@
- FD689F200E26E5D900F90B21 /* SDL_uikitvideo.h in Headers */,
- FD689F240E26E5D900F90B21 /* SDL_uikitwindow.h in Headers */,
- FD689F260E26E5D900F90B21 /* SDL_uikitopenglview.h in Headers */,
-- FD689FCF0E26E9D400F90B21 /* SDL_uikitappdelegate.h in Headers */,
- FD8BD7AC0E27DCA400B52CD5 /* SDL_opengles.h in Headers */,
- FDC656490E560DF800311C8E /* jumphack.h in Headers */,
- FD24846D0E5655AE0021E198 /* SDL_uikitkeyboard.h in Headers */,
-@@ -1347,6 +1345,7 @@
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
-+ 61F7E7F4125543DA00DE6C14 /* SDL_uikitappdelegate.m in Sources */,
- 006E9852119550FB001DE610 /* audio.c in Sources */,
- 006E9853119550FB001DE610 /* common.c in Sources */,
- 006E9859119550FB001DE610 /* platform.c in Sources */,
-@@ -1429,7 +1428,6 @@
- FD689F230E26E5D900F90B21 /* SDL_uikitview.m in Sources */,
- FD689F250E26E5D900F90B21 /* SDL_uikitwindow.m in Sources */,
- FD689F270E26E5D900F90B21 /* SDL_uikitopenglview.m in Sources */,
-- FD689FCE0E26E9D400F90B21 /* SDL_uikitappdelegate.m in Sources */,
- FD8BD8250E27E25900B52CD5 /* SDL_sysloadso.c in Sources */,
- FDC656480E560DF800311C8E /* jumphack.c in Sources */,
- 0495E68C0E97408800152DFE /* SDL_renderer_gl.c in Sources */,
-@@ -1549,15 +1547,19 @@
+diff -r c0021a587dc7 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
+--- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sun Oct 10 15:45:58 2010 -0700
++++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sat Oct 16 18:35:03 2010 +0200
+@@ -1549,15 +1549,19 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -54,9 +13,8 @@
+ GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = NO;
-- IPHONEOS_DEPLOYMENT_TARGET = 3.1;
+ HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\"";
-+ IPHONEOS_DEPLOYMENT_TARGET = 3.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 3.1;
ONLY_ACTIVE_ARCH = NO;
PREBINDING = NO;
- SDKROOT = iphoneos3.2;
@@ -64,7 +22,7 @@
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
-@@ -1566,14 +1568,18 @@
+@@ -1566,14 +1570,19 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -74,21 +32,21 @@
GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_OPTIMIZATION_LEVEL = 2;
+ GCC_THUMB_SUPPORT = NO;
++ GCC_UNROLL_LOOPS = YES;
+ GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = NO;
-- IPHONEOS_DEPLOYMENT_TARGET = 3.1;
+ HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\"";
-+ IPHONEOS_DEPLOYMENT_TARGET = 3.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 3.1;
PREBINDING = NO;
- SDKROOT = iphoneos3.2;
+ SDKROOT = iphoneos4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
-diff -r f50c7996d925 Xcode-iPhoneOS/SDL/testsdl-Info.plist
---- a/Xcode-iPhoneOS/SDL/testsdl-Info.plist Wed Sep 29 21:24:50 2010 -0700
-+++ b/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sun Oct 03 00:21:37 2010 +0200
+diff -r c0021a587dc7 Xcode-iPhoneOS/SDL/testsdl-Info.plist
+--- a/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sun Oct 10 15:45:58 2010 -0700
++++ b/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sat Oct 16 18:35:03 2010 +0200
@@ -16,7 +16,5 @@
????
CFBundleVersion
@@ -97,9 +55,9 @@
- MainWindow
-diff -r f50c7996d925 include/SDL_config_iphoneos.h
---- a/include/SDL_config_iphoneos.h Wed Sep 29 21:24:50 2010 -0700
-+++ b/include/SDL_config_iphoneos.h Sun Oct 03 00:21:37 2010 +0200
+diff -r c0021a587dc7 include/SDL_config_iphoneos.h
+--- a/include/SDL_config_iphoneos.h Sun Oct 10 15:45:58 2010 -0700
++++ b/include/SDL_config_iphoneos.h Sat Oct 16 18:35:03 2010 +0200
@@ -98,6 +98,8 @@
#define HAVE_COS 1
#define HAVE_COSF 1
@@ -135,9 +93,24 @@
+#define SDL_VIEW_TAG 456987
+
#endif /* _SDL_config_iphoneos_h */
-diff -r f50c7996d925 src/video/SDL_renderer_gles.c
---- a/src/video/SDL_renderer_gles.c Wed Sep 29 21:24:50 2010 -0700
-+++ b/src/video/SDL_renderer_gles.c Sun Oct 03 00:21:37 2010 +0200
+diff -r c0021a587dc7 src/SDL_fatal.c
+--- a/src/SDL_fatal.c Sun Oct 10 15:45:58 2010 -0700
++++ b/src/SDL_fatal.c Sat Oct 16 18:35:03 2010 +0200
+@@ -38,9 +38,9 @@
+ static void
+ SDL_Parachute(int sig)
+ {
+- signal(sig, SIG_DFL);
++ /*signal(sig, SIG_DFL);
+ SDL_Quit();
+- raise(sig);
++ raise(sig);*/
+ }
+
+ static const int SDL_fatal_signals[] = {
+diff -r c0021a587dc7 src/video/SDL_renderer_gles.c
+--- a/src/video/SDL_renderer_gles.c Sun Oct 10 15:45:58 2010 -0700
++++ b/src/video/SDL_renderer_gles.c Sat Oct 16 18:35:03 2010 +0200
@@ -324,6 +324,9 @@
data->glDisable(GL_CULL_FACE);
data->updateSize = SDL_TRUE;
@@ -219,9 +192,9 @@
}
data->glDisable(GL_TEXTURE_2D);
-diff -r f50c7996d925 src/video/SDL_video.c
---- a/src/video/SDL_video.c Wed Sep 29 21:24:50 2010 -0700
-+++ b/src/video/SDL_video.c Sun Oct 03 00:21:37 2010 +0200
+diff -r c0021a587dc7 src/video/SDL_video.c
+--- a/src/video/SDL_video.c Sun Oct 10 15:45:58 2010 -0700
++++ b/src/video/SDL_video.c Sat Oct 16 18:35:03 2010 +0200
@@ -1416,9 +1416,9 @@
SDL_MinimizeWindow(window);
}
@@ -234,21 +207,23 @@
if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN))
&& _this->SetWindowGrab) {
_this->SetWindowGrab(_this, window);
-diff -r f50c7996d925 src/video/uikit/SDL_uikitopengles.m
---- a/src/video/uikit/SDL_uikitopengles.m Wed Sep 29 21:24:50 2010 -0700
-+++ b/src/video/uikit/SDL_uikitopengles.m Sun Oct 03 00:21:37 2010 +0200
-@@ -114,7 +114,7 @@
+diff -r c0021a587dc7 src/video/uikit/SDL_uikitopengles.m
+--- a/src/video/uikit/SDL_uikitopengles.m Sun Oct 10 15:45:58 2010 -0700
++++ b/src/video/uikit/SDL_uikitopengles.m Sat Oct 16 18:35:03 2010 +0200
+@@ -114,8 +114,8 @@
bBits: _this->gl_config.blue_size \
aBits: _this->gl_config.alpha_size \
depthBits: _this->gl_config.depth_size];
-
+- data->view = view;
+ view.tag = SDL_VIEW_TAG;
- data->view = view;
++ data->view = view;
/* add the view to our window */
-diff -r f50c7996d925 src/video/uikit/SDL_uikitview.m
---- a/src/video/uikit/SDL_uikitview.m Wed Sep 29 21:24:50 2010 -0700
-+++ b/src/video/uikit/SDL_uikitview.m Sun Oct 03 00:21:37 2010 +0200
+ [uiwindow addSubview: view ];
+diff -r c0021a587dc7 src/video/uikit/SDL_uikitview.m
+--- a/src/video/uikit/SDL_uikitview.m Sun Oct 10 15:45:58 2010 -0700
++++ b/src/video/uikit/SDL_uikitview.m Sat Oct 16 18:35:03 2010 +0200
@@ -35,9 +35,6 @@
@implementation SDL_uikitview
@@ -360,9 +335,9 @@
if (NULL == view) {
SDL_SetError("Window has no view");
-diff -r f50c7996d925 src/video/uikit/SDL_uikitwindow.m
---- a/src/video/uikit/SDL_uikitwindow.m Wed Sep 29 21:24:50 2010 -0700
-+++ b/src/video/uikit/SDL_uikitwindow.m Sun Oct 03 00:21:37 2010 +0200
+diff -r c0021a587dc7 src/video/uikit/SDL_uikitwindow.m
+--- a/src/video/uikit/SDL_uikitwindow.m Sun Oct 10 15:45:58 2010 -0700
++++ b/src/video/uikit/SDL_uikitwindow.m Sat Oct 16 18:35:03 2010 +0200
@@ -144,7 +144,10 @@
if (SDL_UIKit_supports_multiple_displays) {
[uiwindow setScreen:uiscreen];
@@ -375,9 +350,9 @@
if (SetupWindowData(_this, window, uiwindow, SDL_TRUE) < 0) {
[uiwindow release];
return -1;
-diff -r f50c7996d925 src/video/uikit/keyinfotable.h
---- a/src/video/uikit/keyinfotable.h Wed Sep 29 21:24:50 2010 -0700
-+++ b/src/video/uikit/keyinfotable.h Sun Oct 03 00:21:37 2010 +0200
+diff -r c0021a587dc7 src/video/uikit/keyinfotable.h
+--- a/src/video/uikit/keyinfotable.h Sun Oct 10 15:45:58 2010 -0700
++++ b/src/video/uikit/keyinfotable.h Sat Oct 16 18:35:03 2010 +0200
@@ -54,7 +54,7 @@
/* 10 */ { SDL_SCANCODE_UNKNOWN, 0 },
/* 11 */ { SDL_SCANCODE_UNKNOWN, 0 },