diff -r be5d40bb1e86 -r d773867f93db project_files/HedgewarsMobile/Classes/InGameMenuViewController.m --- a/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m Thu Nov 03 03:58:24 2011 +0100 +++ b/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m Thu Nov 03 05:09:05 2011 +0100 @@ -45,7 +45,6 @@ NSArray *array = [[NSArray alloc] initWithObjects: NSLocalizedString(@"Show Help", @""), NSLocalizedString(@"Tag", @""), -// NSLocalizedString(@"Snapshot",@""), NSLocalizedString(@"End Game", @""), nil]; self.menuList = array; @@ -89,27 +88,6 @@ } SDL_iPhoneKeyboardHide((SDL_Window *)HW_getSDLWindow()); - - /* - if (shouldTakeScreenshot) { - UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Please wait" - message:nil - delegate:nil - cancelButtonTitle:nil - otherButtonTitles:nil]; - [alert show]; - UIActivityIndicatorView *indicator = [[UIActivityIndicatorView alloc] - initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; - indicator.center = CGPointMake(alert.bounds.size.width / 2, alert.bounds.size.height - 45); - [indicator startAnimating]; - [alert addSubview:indicator]; - [indicator release]; - - // all these hacks because of the PAUSE caption on top of everything... - [self performSelector:@selector(saveCurrentScreenToPhotoAlbum:) withObject:alert afterDelay:0.3]; - } - */ - shouldTakeScreenshot = NO; } #pragma mark - @@ -120,7 +98,6 @@ -(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { return 3; -// return 4; } -(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { @@ -141,7 +118,6 @@ -(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { UIActionSheet *actionSheet; -// UIAlertView *alert; switch ([indexPath row]) { case 0: @@ -154,19 +130,6 @@ break; case 2: -/* - alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Going to take a screenshot",@"") - message:NSLocalizedString(@"The game snapshot will be placed in your Photo Album and it will be taken as soon as the pause menu is dismissed",@"") - delegate:nil - cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"") - otherButtonTitles:nil]; - [alert show]; - [alert release]; - shouldTakeScreenshot = YES; - - break; - case 3: -*/ actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Are you reeeeeally sure?", @"") delegate:self cancelButtonTitle:NSLocalizedString(@"Well, maybe not...", @"") @@ -193,63 +156,4 @@ } } -//TODO: check this is still needed since we switched to SDL_GL_CreateContext() -/* -#pragma mark - -#pragma mark save screenshot -//by http://www.bit-101.com/blog/?p=1861 -// callback for CGDataProviderCreateWithData -void releaseData(void *info, const void *data, size_t dataSize) { - DLog(@"freeing raw data\n"); - free((void *)data); -} - -// callback for UIImageWriteToSavedPhotosAlbum --(void) image:(UIImage *)image didFinishSavingWithError:(NSError *)error contextInfo:(void *)contextInfo { - DLog(@"Save finished\n"); - [image release]; - UIAlertView *alert = (UIAlertView *)contextInfo; - [alert dismissWithClickedButtonIndex:0 animated:YES]; - [alert release]; -} - -// the resolution of the buffer is always equal to the hardware device even if scaled --(void) saveCurrentScreenToPhotoAlbum:(UIAlertView *)alert { - CGRect screenRect = [[UIScreen mainScreen] bounds]; - int width = screenRect.size.width; - int height = screenRect.size.height; - - NSInteger size = width * height * 4; - GLubyte *buffer = (GLubyte *) malloc(size * sizeof(GLubyte)); - GLubyte *buffer_flipped = (GLubyte *) malloc(size * sizeof(GLubyte)); - - glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, buffer); - HW_screenshot(); - // flip the data as glReadPixels here reads upside down - for(int y = 0; y