project_files/HedgewarsMobile/SDL.patch
author koda
Sat, 04 Dec 2010 08:52:57 +0100
changeset 4454 42bfc1a70968
parent 4362 8dae325dc625
child 4773 69f8431a5d20
permissions -rw-r--r--
more retina support and multitasking support
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4454
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
     1
diff -r d716dff4b13e Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
     2
--- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj	Thu Dec 02 11:56:23 2010 -0800
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
     3
+++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj	Thu Dec 02 22:38:57 2010 +0100
4362
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
     4
@@ -1262,7 +1262,14 @@
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
     5
 			isa = PBXProject;
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
     6
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SDLiPhoneOS" */;
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
     7
 			compatibilityVersion = "Xcode 3.1";
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
     8
+			developmentRegion = English;
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
     9
 			hasScannedForEncodings = 1;
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
    10
+			knownRegions = (
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
    11
+				English,
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
    12
+				Japanese,
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
    13
+				French,
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
    14
+				German,
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
    15
+			);
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
    16
 			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
    17
 			projectDirPath = "";
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
    18
 			projectRoot = ../..;
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
    19
@@ -1549,15 +1556,19 @@
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    20
 			isa = XCBuildConfiguration;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    21
 			buildSettings = {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    22
 				ALWAYS_SEARCH_USER_PATHS = NO;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    23
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    24
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    25
 				GCC_C_LANGUAGE_STANDARD = c99;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    26
 				GCC_DEBUGGING_SYMBOLS = full;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    27
+				GCC_THUMB_SUPPORT = NO;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    28
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    29
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    30
 				GCC_WARN_UNUSED_VARIABLE = NO;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    31
+				HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\"";
3978
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
    32
 				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    33
 				ONLY_ACTIVE_ARCH = NO;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    34
 				PREBINDING = NO;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    35
-				SDKROOT = iphoneos3.2;
4362
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
    36
+				SDKROOT = iphoneos;
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    37
 				TARGETED_DEVICE_FAMILY = "1,2";
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    38
 			};
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    39
 			name = Debug;
4362
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
    40
@@ -1566,14 +1577,19 @@
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    41
 			isa = XCBuildConfiguration;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    42
 			buildSettings = {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    43
 				ALWAYS_SEARCH_USER_PATHS = NO;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    44
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    45
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    46
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    47
 				GCC_C_LANGUAGE_STANDARD = c99;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    48
+				GCC_OPTIMIZATION_LEVEL = 2;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    49
+				GCC_THUMB_SUPPORT = NO;
3978
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
    50
+				GCC_UNROLL_LOOPS = YES;
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    51
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    52
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    53
 				GCC_WARN_UNUSED_VARIABLE = NO;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    54
+				HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../include\"";
3978
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
    55
 				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    56
 				PREBINDING = NO;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    57
-				SDKROOT = iphoneos3.2;
4362
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
    58
+				SDKROOT = iphoneos;
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    59
 				TARGETED_DEVICE_FAMILY = "1,2";
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    60
 			};
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    61
 			name = Release;
4454
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
    62
diff -r d716dff4b13e Xcode-iPhoneOS/SDL/testsdl-Info.plist
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
    63
--- a/Xcode-iPhoneOS/SDL/testsdl-Info.plist	Thu Dec 02 11:56:23 2010 -0800
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
    64
+++ b/Xcode-iPhoneOS/SDL/testsdl-Info.plist	Thu Dec 02 22:38:57 2010 +0100
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    65
@@ -16,7 +16,5 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    66
 	<string>????</string>
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    67
 	<key>CFBundleVersion</key>
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    68
 	<string>1.0</string>
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    69
-	<key>NSMainNibFile</key>
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    70
-	<string>MainWindow</string>
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    71
 </dict>
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    72
 </plist>
4454
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
    73
diff -r d716dff4b13e include/SDL_config_iphoneos.h
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
    74
--- a/include/SDL_config_iphoneos.h	Thu Dec 02 11:56:23 2010 -0800
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
    75
+++ b/include/SDL_config_iphoneos.h	Thu Dec 02 22:38:57 2010 +0100
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    76
@@ -98,6 +98,8 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    77
 #define HAVE_COS	1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    78
 #define HAVE_COSF	1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    79
 #define HAVE_FABS	1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    80
+#define HAVE_ATAN       1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    81
+#define HAVE_ATAN2      1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    82
 #define HAVE_FLOOR	1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    83
 #define HAVE_LOG	1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    84
 #define HAVE_POW	1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    85
@@ -114,7 +116,7 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    86
 /* enable iPhone version of Core Audio driver */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    87
 #define SDL_AUDIO_DRIVER_COREAUDIOIPHONE 1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    88
 /* Enable the dummy audio driver (src/audio/dummy/\*.c) */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    89
-#define SDL_AUDIO_DRIVER_DUMMY	1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    90
+#define SDL_AUDIO_DRIVER_DUMMY	0
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    91
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    92
 /* Enable the stub haptic driver (src/haptic/dummy/\*.c) */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    93
 #define SDL_HAPTIC_DISABLED	1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    94
@@ -135,7 +137,7 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    95
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    96
 /* Supported video drivers */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    97
 #define SDL_VIDEO_DRIVER_UIKIT	1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    98
-#define SDL_VIDEO_DRIVER_DUMMY	1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
    99
+#define SDL_VIDEO_DRIVER_DUMMY	0
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   100
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   101
 /* enable OpenGL ES */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   102
 #define SDL_VIDEO_OPENGL_ES	1
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   103
@@ -152,4 +154,7 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   104
  */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   105
 #define SDL_IPHONE_MAX_GFORCE 5.0
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   106
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   107
+/* Tag to grab the uikit view from external code for further modification */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   108
+#define SDL_VIEW_TAG 456987
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   109
+
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   110
 #endif /* _SDL_config_iphoneos_h */
4454
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   111
diff -r d716dff4b13e src/SDL_fatal.c
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   112
--- a/src/SDL_fatal.c	Thu Dec 02 11:56:23 2010 -0800
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   113
+++ b/src/SDL_fatal.c	Thu Dec 02 22:38:57 2010 +0100
3978
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
   114
@@ -38,9 +38,9 @@
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
   115
 static void
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
   116
 SDL_Parachute(int sig)
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
   117
 {
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
   118
-    signal(sig, SIG_DFL);
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
   119
+    /*signal(sig, SIG_DFL);
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
   120
     SDL_Quit();
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
   121
-    raise(sig);
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
   122
+    raise(sig);*/
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
   123
 }
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
   124
 
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
   125
 static const int SDL_fatal_signals[] = {
4454
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   126
diff -r d716dff4b13e src/video/SDL_renderer_gles.c
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   127
--- a/src/video/SDL_renderer_gles.c	Thu Dec 02 11:56:23 2010 -0800
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   128
+++ b/src/video/SDL_renderer_gles.c	Thu Dec 02 22:38:57 2010 +0100
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   129
@@ -324,6 +324,9 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   130
     data->glDisable(GL_CULL_FACE);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   131
     data->updateSize = SDL_TRUE;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   132
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   133
+    data->glEnableClientState(GL_VERTEX_ARRAY);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   134
+    data->glEnableClientState(GL_TEXTURE_COORD_ARRAY);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   135
+    
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   136
     return renderer;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   137
 }
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   138
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   139
@@ -665,9 +668,7 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   140
         vertices[2*i+1] = (GLshort)points[i].y;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   141
     }
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   142
     data->glVertexPointer(2, GL_SHORT, 0, vertices);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   143
-    data->glEnableClientState(GL_VERTEX_ARRAY);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   144
     data->glDrawArrays(GL_POINTS, 0, count);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   145
-    data->glDisableClientState(GL_VERTEX_ARRAY);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   146
     SDL_stack_free(vertices);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   147
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   148
     return 0;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   149
@@ -694,7 +695,6 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   150
         vertices[2*i+1] = (GLshort)points[i].y;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   151
     }
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   152
     data->glVertexPointer(2, GL_SHORT, 0, vertices);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   153
-    data->glEnableClientState(GL_VERTEX_ARRAY);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   154
     if (count > 2 && 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   155
         points[0].x == points[count-1].x && points[0].y == points[count-1].y) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   156
         /* GL_LINE_LOOP takes care of the final segment */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   157
@@ -703,7 +703,6 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   158
     } else {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   159
         data->glDrawArrays(GL_LINE_STRIP, 0, count);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   160
     }
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   161
-    data->glDisableClientState(GL_VERTEX_ARRAY);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   162
     SDL_stack_free(vertices);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   163
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   164
     return 0;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   165
@@ -723,7 +722,6 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   166
                     (GLfloat) renderer->b * inv255f,
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   167
                     (GLfloat) renderer->a * inv255f);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   168
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   169
-    data->glEnableClientState(GL_VERTEX_ARRAY);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   170
     for (i = 0; i < count; ++i) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   171
         const SDL_Rect *rect = rects[i];
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   172
         GLshort minx = rect->x;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   173
@@ -743,7 +741,6 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   174
         data->glVertexPointer(2, GL_SHORT, 0, vertices);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   175
         data->glDrawArrays(GL_LINE_LOOP, 0, 4);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   176
     }
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   177
-    data->glDisableClientState(GL_VERTEX_ARRAY);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   178
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   179
     return 0;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   180
 }
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   181
@@ -762,7 +759,6 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   182
                     (GLfloat) renderer->b * inv255f,
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   183
                     (GLfloat) renderer->a * inv255f);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   184
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   185
-    data->glEnableClientState(GL_VERTEX_ARRAY);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   186
     for (i = 0; i < count; ++i) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   187
         const SDL_Rect *rect = rects[i];
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   188
         GLshort minx = rect->x;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   189
@@ -782,7 +778,6 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   190
         data->glVertexPointer(2, GL_SHORT, 0, vertices);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   191
         data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   192
     }
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   193
-    data->glDisableClientState(GL_VERTEX_ARRAY);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   194
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   195
     return 0;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   196
 }
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   197
@@ -925,12 +920,8 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   198
         texCoords[7] = maxv;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   199
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   200
         data->glVertexPointer(2, GL_SHORT, 0, vertices);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   201
-        data->glEnableClientState(GL_VERTEX_ARRAY);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   202
         data->glTexCoordPointer(2, GL_FLOAT, 0, texCoords);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   203
-        data->glEnableClientState(GL_TEXTURE_COORD_ARRAY);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   204
         data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   205
-        data->glDisableClientState(GL_TEXTURE_COORD_ARRAY);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   206
-        data->glDisableClientState(GL_VERTEX_ARRAY);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   207
     }
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   208
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   209
     data->glDisable(GL_TEXTURE_2D);
4454
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   210
diff -r d716dff4b13e src/video/SDL_video.c
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   211
--- a/src/video/SDL_video.c	Thu Dec 02 11:56:23 2010 -0800
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   212
+++ b/src/video/SDL_video.c	Thu Dec 02 22:38:57 2010 +0100
4362
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   213
@@ -1421,9 +1421,9 @@
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   214
         SDL_MinimizeWindow(window);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   215
     }
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   216
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   217
-    if (display->gamma && _this->SetDisplayGammaRamp) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   218
+    /*if (display->gamma && _this->SetDisplayGammaRamp) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   219
         _this->SetDisplayGammaRamp(_this, display, display->saved_gamma);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   220
-    }
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   221
+    }*/
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   222
     if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN))
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   223
         && _this->SetWindowGrab) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   224
         _this->SetWindowGrab(_this, window);
4454
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   225
diff -r d716dff4b13e src/video/uikit/SDL_uikitopengles.m
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   226
--- a/src/video/uikit/SDL_uikitopengles.m	Thu Dec 02 11:56:23 2010 -0800
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   227
+++ b/src/video/uikit/SDL_uikitopengles.m	Thu Dec 02 22:38:57 2010 +0100
3978
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
   228
@@ -114,8 +114,8 @@
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   229
 									bBits: _this->gl_config.blue_size \
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   230
 									aBits: _this->gl_config.alpha_size \
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   231
 									depthBits: _this->gl_config.depth_size];
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   232
-	
3978
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
   233
-	data->view = view;
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   234
+        view.tag = SDL_VIEW_TAG;
3978
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
   235
+        data->view = view;
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   236
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   237
 	/* add the view to our window */
3978
9660600e43cb fix some glitches
koda
parents: 3923
diff changeset
   238
 	[uiwindow addSubview: view ];
4454
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   239
diff -r d716dff4b13e src/video/uikit/SDL_uikitopenglview.m
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   240
--- a/src/video/uikit/SDL_uikitopenglview.m	Thu Dec 02 11:56:23 2010 -0800
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   241
+++ b/src/video/uikit/SDL_uikitopenglview.m	Thu Dec 02 22:38:57 2010 +0100
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   242
@@ -117,6 +117,8 @@
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   243
 			return NO;
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   244
 		}
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   245
 		/* end create buffers */
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   246
+            if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)])
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   247
+                self.contentScaleFactor = [UIScreen mainScreen].scale;
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   248
 	}
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   249
 	return self;
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   250
 }
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   251
diff -r d716dff4b13e src/video/uikit/SDL_uikitview.h
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   252
--- a/src/video/uikit/SDL_uikitview.h	Thu Dec 02 11:56:23 2010 -0800
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   253
+++ b/src/video/uikit/SDL_uikitview.h	Thu Dec 02 22:38:57 2010 +0100
4362
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   254
@@ -23,11 +23,11 @@
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   255
 #include "SDL_stdinc.h"
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   256
 #include "SDL_events.h"
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   257
 
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   258
-#define IPHONE_TOUCH_EFFICIENT_DANGEROUS
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   259
-#define FIXED_MULTITOUCH
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   260
+#undef IPHONE_TOUCH_EFFICIENT_DANGEROUS
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   261
+#undef FIXED_MULTITOUCH
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   262
 
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   263
 #ifndef IPHONE_TOUCH_EFFICIENT_DANGEROUS
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   264
-#define MAX_SIMULTANEOUS_TOUCHES 5
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   265
+#define MAX_SIMULTANEOUS_TOUCHES 0
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   266
 #endif
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   267
 
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   268
 /* *INDENT-OFF* */
4454
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   269
diff -r d716dff4b13e src/video/uikit/SDL_uikitview.m
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   270
--- a/src/video/uikit/SDL_uikitview.m	Thu Dec 02 11:56:23 2010 -0800
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   271
+++ b/src/video/uikit/SDL_uikitview.m	Thu Dec 02 22:38:57 2010 +0100
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   272
@@ -35,9 +35,6 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   273
 @implementation SDL_uikitview
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   274
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   275
 - (void)dealloc {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   276
-#if SDL_IPHONE_KEYBOARD
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   277
-	[textField release];
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   278
-#endif
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   279
 	[super dealloc];
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   280
 }
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   281
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   282
@@ -220,7 +217,7 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   283
 /* Set ourselves up as a UITextFieldDelegate */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   284
 - (void)initializeKeyboard {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   285
 		
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   286
-	textField = [[[UITextField alloc] initWithFrame: CGRectZero] autorelease];
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   287
+	textField = [[UITextField alloc] initWithFrame: CGRectZero];
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   288
 	textField.delegate = self;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   289
 	/* placeholder so there is something to delete! */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   290
 	textField.text = @" ";	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   291
@@ -238,6 +235,7 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   292
 	keyboardVisible = NO;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   293
 	/* add the UITextField (hidden) to our view */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   294
 	[self addSubview: textField];
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   295
+        [textField release];
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   296
 }
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   297
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   298
 /* reveal onscreen virtual keyboard */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   299
@@ -300,6 +298,7 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   300
 
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   301
 /* Terminates the editing session */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   302
 - (BOOL)textFieldShouldReturn:(UITextField*)_textField {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   303
+        SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_RETURN);
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   304
 	[self hideKeyboard];
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   305
 	return YES;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   306
 }
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   307
@@ -314,7 +313,7 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   308
 int SDL_iPhoneKeyboardShow(SDL_Window * window) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   309
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   310
 	SDL_WindowData *data;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   311
-	SDL_uikitview *view;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   312
+	SDL_uikitview *view = NULL;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   313
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   314
 	if (NULL == window) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   315
 		SDL_SetError("Window does not exist");
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   316
@@ -322,7 +321,8 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   317
 	}
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   318
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   319
 	data = (SDL_WindowData *)window->driverdata;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   320
-	view = data->view;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   321
+	if (data != NULL)
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   322
+            view = data->view;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   323
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   324
 	if (nil == view) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   325
 		SDL_SetError("Window has no view");
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   326
@@ -337,7 +337,7 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   327
 int SDL_iPhoneKeyboardHide(SDL_Window * window) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   328
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   329
 	SDL_WindowData *data;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   330
-	SDL_uikitview *view;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   331
+	SDL_uikitview *view = NULL;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   332
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   333
 	if (NULL == window) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   334
 		SDL_SetError("Window does not exist");
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   335
@@ -345,7 +345,8 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   336
 	}	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   337
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   338
 	data = (SDL_WindowData *)window->driverdata;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   339
-	view = data->view;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   340
+	if (data != NULL)
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   341
+            view = data->view;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   342
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   343
 	if (NULL == view) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   344
 		SDL_SetError("Window has no view");
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   345
@@ -360,7 +361,7 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   346
 SDL_bool SDL_iPhoneKeyboardIsShown(SDL_Window * window) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   347
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   348
 	SDL_WindowData *data;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   349
-	SDL_uikitview *view;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   350
+	SDL_uikitview *view = NULL;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   351
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   352
 	if (NULL == window) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   353
 		SDL_SetError("Window does not exist");
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   354
@@ -368,7 +369,8 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   355
 	}	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   356
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   357
 	data = (SDL_WindowData *)window->driverdata;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   358
-	view = data->view;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   359
+	if (data != NULL)
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   360
+            view = data->view;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   361
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   362
 	if (NULL == view) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   363
 		SDL_SetError("Window has no view");
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   364
@@ -382,7 +384,7 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   365
 int SDL_iPhoneKeyboardToggle(SDL_Window * window) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   366
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   367
 	SDL_WindowData *data;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   368
-	SDL_uikitview *view;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   369
+	SDL_uikitview *view = NULL;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   370
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   371
 	if (NULL == window) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   372
 		SDL_SetError("Window does not exist");
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   373
@@ -390,7 +392,8 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   374
 	}	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   375
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   376
 	data = (SDL_WindowData *)window->driverdata;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   377
-	view = data->view;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   378
+	if (data != NULL)
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   379
+            view = data->view;
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   380
 	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   381
 	if (NULL == view) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   382
 		SDL_SetError("Window has no view");
4454
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   383
diff -r d716dff4b13e src/video/uikit/SDL_uikitwindow.m
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   384
--- a/src/video/uikit/SDL_uikitwindow.m	Thu Dec 02 11:56:23 2010 -0800
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   385
+++ b/src/video/uikit/SDL_uikitwindow.m	Thu Dec 02 22:38:57 2010 +0100
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   386
@@ -144,7 +144,10 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   387
     if (SDL_UIKit_supports_multiple_displays) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   388
         [uiwindow setScreen:uiscreen];
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   389
     }
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   390
-
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   391
+    
4362
8dae325dc625 added missing graphics and fixed some glitches/crashes/bugs
koda
parents: 3978
diff changeset
   392
+    if ([UIScreen respondsToSelector:@selector(screens)] && [[UIScreen screens] count] > 1)
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   393
+        uiwindow.screen = [[UIScreen screens] objectAtIndex:1];
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   394
+    
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   395
     if (SetupWindowData(_this, window, uiwindow, SDL_TRUE) < 0) {
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   396
         [uiwindow release];
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   397
         return -1;
4454
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   398
diff -r d716dff4b13e src/video/uikit/keyinfotable.h
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   399
--- a/src/video/uikit/keyinfotable.h	Thu Dec 02 11:56:23 2010 -0800
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   400
+++ b/src/video/uikit/keyinfotable.h	Thu Dec 02 22:38:57 2010 +0100
3923
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   401
@@ -54,7 +54,7 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   402
 /*  10 */ {   SDL_SCANCODE_UNKNOWN, 0 },
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   403
 /*  11 */ {   SDL_SCANCODE_UNKNOWN, 0 },
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   404
 /*  12 */ {   SDL_SCANCODE_UNKNOWN, 0 },
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   405
-/*  13 */ {   SDL_SCANCODE_UNKNOWN, 0 },
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   406
+/*  13 */ {   SDL_SCANCODE_RETURN, 0 },
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   407
 /*  14 */ {   SDL_SCANCODE_UNKNOWN, 0 },
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   408
 /*  15 */ {   SDL_SCANCODE_UNKNOWN, 0 },
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   409
 /*  16 */ {   SDL_SCANCODE_UNKNOWN, 0 },
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   410
@@ -137,7 +137,7 @@
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   411
 /*  93 */ {   SDL_SCANCODE_RIGHTBRACKET, 0 },
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   412
 /*  94 */ {   SDL_SCANCODE_6,  KMOD_SHIFT },			/* plus shift modifier '^' */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   413
 /*  95 */ {   SDL_SCANCODE_MINUS,  KMOD_SHIFT },		/* plus shift modifier '_' */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   414
-/*  96 */ {   SDL_SCANCODE_GRAVE,  KMOD_SHIFT },		/* '`'
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   415
+/*  96 */ {   SDL_SCANCODE_GRAVE,  KMOD_SHIFT },		/* '`' */
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   416
 /*  97 */ {   SDL_SCANCODE_A, 0	},	
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   417
 /*  98 */ {   SDL_SCANCODE_B, 0 },
694e6f6e0e30 various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
diff changeset
   418
 /*  99 */ {   SDL_SCANCODE_C, 0 },