# HG changeset patch # User koda # Date 1283558964 -7200 # Node ID fd6c20cd90e33fa5e4f03e1c1f220b3eb14d169a # Parent cca9bfb88a24eec9394431b29ad885c1880c39a3 typos, reduced sound size and last minute fixes diff -r cca9bfb88a24 -r fd6c20cd90e3 hedgewars/uConsole.pas --- a/hedgewars/uConsole.pas Fri Sep 03 02:03:44 2010 +0200 +++ b/hedgewars/uConsole.pas Sat Sep 04 02:09:24 2010 +0200 @@ -112,7 +112,7 @@ procedure WriteLnToConsole(s: shortstring); begin -{$IFNDEF NOCOSOLE} +{$IFNDEF NOCONSOLE} WriteToConsole(s); WriteLn; inc(CurrLine); diff -r cca9bfb88a24 -r fd6c20cd90e3 hedgewars/uSound.pas --- a/hedgewars/uSound.pas Fri Sep 03 02:03:44 2010 +0200 +++ b/hedgewars/uSound.pas Sat Sep 04 02:09:24 2010 +0200 @@ -77,13 +77,20 @@ procedure InitSound; var i: TSound; + channels: LongInt; begin if not isSoundEnabled then exit; WriteToConsole('Init sound...'); isSoundEnabled:= SDL_InitSubSystem(SDL_INIT_AUDIO) >= 0; +{$IFDEF IPHONEOS} + channels:= 1; +{$ELSE} + channels:= 2; +{$ENDIF} + if isSoundEnabled then - isSoundEnabled:= Mix_OpenAudio(44100, $8010, 2, 1024) = 0; + isSoundEnabled:= Mix_OpenAudio(44100, $8010, channels, 1024) = 0; {$IFDEF SDL_MIXER_NEWER} WriteToConsole('Init SDL_mixer... '); diff -r cca9bfb88a24 -r fd6c20cd90e3 project_files/HedgewarsMobile/Classes/GameSetup.m --- a/project_files/HedgewarsMobile/Classes/GameSetup.m Fri Sep 03 02:03:44 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameSetup.m Sat Sep 04 02:09:24 2010 +0200 @@ -402,7 +402,7 @@ gameArgs[ 1] = [wSize UTF8String]; //cScreenHeight gameArgs[ 2] = [hSize UTF8String]; //cScreenWidth gameArgs[ 3] = [[[NSNumber numberWithInteger:tmpQuality] stringValue] UTF8String]; //quality - gameArgs[ 4] = [localeString UTF8String]; //cLocaleFName + gameArgs[ 4] = "en.txt";//[localeString UTF8String]; //cLocaleFName gameArgs[ 5] = [username UTF8String]; //UserNick gameArgs[ 6] = [[[self.systemSettings objectForKey:@"sound"] stringValue] UTF8String]; //isSoundEnabled gameArgs[ 7] = [[[self.systemSettings objectForKey:@"music"] stringValue] UTF8String]; //isMusicEnabled diff -r cca9bfb88a24 -r fd6c20cd90e3 project_files/HedgewarsMobile/Classes/MainMenuViewController.m --- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Fri Sep 03 02:03:44 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Sat Sep 04 02:09:24 2010 +0200 @@ -47,7 +47,7 @@ char *ver; HW_versionInfo(NULL, &ver); NSString *versionNumber = [[NSString alloc] initWithCString:ver]; - self.versionLabel.text = versionNumber; + self.versionLabel.text = @"";//versionNumber; [versionNumber release]; // listen to request to remove the modalviewcontroller diff -r cca9bfb88a24 -r fd6c20cd90e3 project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m --- a/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m Fri Sep 03 02:03:44 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m Sat Sep 04 02:09:24 2010 +0200 @@ -199,6 +199,7 @@ if (row == 0) { editableCell.textField.text = self.schemeName; } else { + editableCell.minimumCharacters = 0; editableCell.textField.font = [UIFont systemFontOfSize:[UIFont labelFontSize]]; editableCell.textField.text = [self.schemeDictionary objectForKey:@"description"]; editableCell.textField.placeholder = NSLocalizedString(@"You can add a description if you wish",@""); diff -r cca9bfb88a24 -r fd6c20cd90e3 project_files/HedgewarsMobile/Classes/SingleTeamViewController.m --- a/project_files/HedgewarsMobile/Classes/SingleTeamViewController.m Fri Sep 03 02:03:44 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SingleTeamViewController.m Sat Sep 04 02:09:24 2010 +0200 @@ -248,7 +248,7 @@ case 3: // flags accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@.png", FLAGS_DIRECTORY(),[teamDictionary objectForKey:@"flag"]]]; - cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(32, 32)]; + cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(27, 19)]; [accessoryImage release]; break; case 4: // level diff -r cca9bfb88a24 -r fd6c20cd90e3 project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m --- a/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m Fri Sep 03 02:03:44 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m Sat Sep 04 02:09:24 2010 +0200 @@ -189,6 +189,7 @@ if (row == 0) { editableCell.textField.text = self.weaponName; } else { + editableCell.minimumCharacters = 0; editableCell.textField.font = [UIFont systemFontOfSize:[UIFont labelFontSize]]; editableCell.textField.text = self.description; editableCell.textField.placeholder = NSLocalizedString(@"You can add a description if you wish",@""); diff -r cca9bfb88a24 -r fd6c20cd90e3 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Fri Sep 03 02:03:44 2010 +0200 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sat Sep 04 02:09:24 2010 +0200 @@ -2027,7 +2027,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*,KnockBall,Ruler,BasketBall}\nrm -rf ${PROJECT_DIR}/Data/Hats/{TeamCap,TeamHeadband,TeamHair}\n\n\n#the following ones must be removed when their support is implemented\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,FlightJoust}\nrm -rf ${PROJECT_DIR}/Data/Themes/{City,Island}\n\ncp -R ${PROJECT_DIR}/audio/ ${PROJECT_DIR}/Data/\n\n#delete some voices\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/Classic\n#rm -rf ${PROJECT_DIR}/Data/Sounds/voices/{Classic,British,Mobster,Pirate,Robot,Russian,Singer,Surfer}\n\n#delete all names, missions, reserved hats\nrm -rf ${PROJECT_DIR}/Data/Names/\nrm -rf ${PROJECT_DIR}/Data/Missions/\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 *.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*,KnockBall,Ruler,BasketBall}\nrm -rf ${PROJECT_DIR}/Data/Hats/{TeamCap,TeamHeadband,TeamHair}\n\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}\nrm -rf ${PROJECT_DIR}/Data/Themes/{City,Island}\n\n#delete some voices\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/Classic\n#rm -rf ${PROJECT_DIR}/Data/Sounds/voices/{Classic,British,Mobster,Pirate,Robot,Russian,Singer,Surfer}\n\n#delete all names, missions, reserved hats\nrm -rf ${PROJECT_DIR}/Data/Names/\nrm -rf ${PROJECT_DIR}/Data/Missions/\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/\n"; showEnvVarsInLog = 0; }; 9283011B0F10CB2D00CC5A3C /* Build libfpc.a */ = { @@ -2238,7 +2238,7 @@ "PROVISIONING_PROFILE[sdk=iphoneos*]" = "450C4020-346A-4F44-8DDE-E71300796C94"; SDKROOT = iphoneos4.0; TARGETED_DEVICE_FAMILY = 2; - VALIDATE_PRODUCT = NO; + VALIDATE_PRODUCT = YES; VALID_ARCHS = "armv7 armv6"; }; name = DistributionAppStore; @@ -2331,7 +2331,7 @@ "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos4.0; TARGETED_DEVICE_FAMILY = 2; - VALIDATE_PRODUCT = NO; + VALIDATE_PRODUCT = YES; VALID_ARCHS = "armv7 armv6"; }; name = DistributionAdHoc;