diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/Contents.json b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 0000000..71fddbe
--- /dev/null
+++ b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,111 @@
+{
+ "images" : [
+ {
+ "idiom" : "iphone",
+ "size" : "29x29",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "29x29",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "29x29",
+ "scale" : "3x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "40x40",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "40x40",
+ "scale" : "3x"
+ },
+ {
+ "size" : "57x57",
+ "idiom" : "iphone",
+ "filename" : "icon.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "57x57",
+ "idiom" : "iphone",
+ "filename" : "icon@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "60x60",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "60x60",
+ "scale" : "3x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "29x29",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "29x29",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "40x40",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "40x40",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "50x50",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "50x50",
+ "scale" : "2x"
+ },
+ {
+ "size" : "72x72",
+ "idiom" : "ipad",
+ "filename" : "icon72.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "72x72",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "76x76",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "76x76",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "83.5x83.5",
+ "scale" : "2x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon.png
new file mode 100644
index 0000000..d00eed7
Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon.png differ
diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon72.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon72.png
new file mode 100644
index 0000000..a0a0d21
Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon72.png differ
diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@2x.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@2x.png
new file mode 100644
index 0000000..ee861ff
Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@2x.png differ
diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/Brand Assets.launchimage/Contents.json b/ActiveGS_iOS/ActiveGS/Images.xcassets/Brand Assets.launchimage/Contents.json
new file mode 100644
index 0000000..ec2b6b2
--- /dev/null
+++ b/ActiveGS_iOS/ActiveGS/Images.xcassets/Brand Assets.launchimage/Contents.json
@@ -0,0 +1,90 @@
+{
+ "images" : [
+ {
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "orientation" : "portrait"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "filename" : "Default.png",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "subtype" : "retina4",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "minimum-system-version" : "7.0",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "minimum-system-version" : "7.0",
+ "subtype" : "retina4",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "extent" : "to-status-bar",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "extent" : "to-status-bar",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "extent" : "to-status-bar",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "extent" : "to-status-bar",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "minimum-system-version" : "7.0",
+ "extent" : "full-screen",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "minimum-system-version" : "7.0",
+ "extent" : "full-screen",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "minimum-system-version" : "7.0",
+ "extent" : "full-screen",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "minimum-system-version" : "7.0",
+ "extent" : "full-screen",
+ "scale" : "2x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/Brand Assets.launchimage/Default.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/Brand Assets.launchimage/Default.png
new file mode 100644
index 0000000..94cb7e8
Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/Brand Assets.launchimage/Default.png differ
diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/Contents.json b/ActiveGS_iOS/ActiveGS/Images.xcassets/Contents.json
new file mode 100644
index 0000000..da4a164
--- /dev/null
+++ b/ActiveGS_iOS/ActiveGS/Images.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/Contents.json b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/Contents.json
new file mode 100644
index 0000000..cd932b4
--- /dev/null
+++ b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -0,0 +1,146 @@
+{
+ "images" : [
+ {
+ "extent" : "full-screen",
+ "idiom" : "iphone",
+ "subtype" : "736h",
+ "filename" : "activegs-launch-iphone6plus.png",
+ "minimum-system-version" : "8.0",
+ "orientation" : "portrait",
+ "scale" : "3x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "iphone",
+ "extent" : "full-screen",
+ "minimum-system-version" : "8.0",
+ "subtype" : "736h",
+ "scale" : "3x"
+ },
+ {
+ "extent" : "full-screen",
+ "idiom" : "iphone",
+ "subtype" : "667h",
+ "filename" : "activegs-launch-iphone6.png",
+ "minimum-system-version" : "8.0",
+ "orientation" : "portrait",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "filename" : "activegs-launch-iphone4s.png",
+ "extent" : "full-screen",
+ "minimum-system-version" : "7.0",
+ "scale" : "2x"
+ },
+ {
+ "extent" : "full-screen",
+ "idiom" : "iphone",
+ "subtype" : "retina4",
+ "filename" : "activegs-launch-iphone5.png",
+ "minimum-system-version" : "7.0",
+ "orientation" : "portrait",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "extent" : "full-screen",
+ "minimum-system-version" : "7.0",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "extent" : "full-screen",
+ "minimum-system-version" : "7.0",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "extent" : "full-screen",
+ "minimum-system-version" : "7.0",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "extent" : "full-screen",
+ "minimum-system-version" : "7.0",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "extent" : "full-screen",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "extent" : "full-screen",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "extent" : "full-screen",
+ "subtype" : "retina4",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "extent" : "to-status-bar",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "extent" : "full-screen",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "extent" : "to-status-bar",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "extent" : "full-screen",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "extent" : "to-status-bar",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "extent" : "full-screen",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "extent" : "to-status-bar",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "extent" : "full-screen",
+ "scale" : "2x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone4s.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone4s.png
new file mode 100644
index 0000000..e6a4813
Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone4s.png differ
diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone5.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone5.png
new file mode 100644
index 0000000..eba0b20
Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone5.png differ
diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6.png
new file mode 100644
index 0000000..adbd7ab
Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6.png differ
diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6plus.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6plus.png
new file mode 100644
index 0000000..9c4920b
Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6plus.png differ
diff --git a/ActiveGS_iOS/activegs.plist b/ActiveGS_iOS/activegs.plist
index bd87999..217bf41 100644
--- a/ActiveGS_iOS/activegs.plist
+++ b/ActiveGS_iOS/activegs.plist
@@ -8,18 +8,12 @@
ActiveGS
CFBundleExecutable
${EXECUTABLE_NAME}
- CFBundleIconFiles
-
- icon.png
- icon72.png
- icon@2x.png
-
CFBundleIdentifier
$(PRODUCT_BUNDLE_IDENTIFIER)
CFBundleInfoDictionaryVersion
6.0
CFBundleName
- ActiveGS
+ ActiveGS2
CFBundlePackageType
APPL
CFBundleShortVersionString
diff --git a/ActiveGS_iOS/activegs.xcodeproj/project.pbxproj b/ActiveGS_iOS/activegs.xcodeproj/project.pbxproj
index c409a5e..e1be264 100644
--- a/ActiveGS_iOS/activegs.xcodeproj/project.pbxproj
+++ b/ActiveGS_iOS/activegs.xcodeproj/project.pbxproj
@@ -237,6 +237,8 @@
7E51482F1CA6B5CE005DA0A6 /* ShastonHi640.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7E51481C1CA6B5CE005DA0A6 /* ShastonHi640.ttf */; };
7E5148301CA6B5CE005DA0A6 /* Spin Up Search 1.wav in Resources */ = {isa = PBXBuildFile; fileRef = 7E51481D1CA6B5CE005DA0A6 /* Spin Up Search 1.wav */; };
7E5148311CA6B5CE005DA0A6 /* Spin Up Search 2.wav in Resources */ = {isa = PBXBuildFile; fileRef = 7E51481E1CA6B5CE005DA0A6 /* Spin Up Search 2.wav */; };
+ 7E8EED6B1A7D83C900C6E522 /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7E8EED6A1A7D83C900C6E522 /* Entitlements.plist */; };
+ 928410581CA8443A00DC5D93 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 928410571CA8443A00DC5D93 /* Images.xcassets */; };
/* End PBXBuildFile section */
/* Begin PBXBuildRule section */
@@ -573,6 +575,8 @@
7E51481C1CA6B5CE005DA0A6 /* ShastonHi640.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = ShastonHi640.ttf; sourceTree = ""; };
7E51481D1CA6B5CE005DA0A6 /* Spin Up Search 1.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = "Spin Up Search 1.wav"; sourceTree = ""; };
7E51481E1CA6B5CE005DA0A6 /* Spin Up Search 2.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = "Spin Up Search 2.wav"; sourceTree = ""; };
+ 7E8EED6A1A7D83C900C6E522 /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; sourceTree = ""; };
+ 928410571CA8443A00DC5D93 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ActiveGS/Images.xcassets; sourceTree = ""; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -1023,6 +1027,7 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
+ 928410571CA8443A00DC5D93 /* Images.xcassets */,
090A6076163093D800C8FB59 /* Default-568h@2x.png */,
095542A6128375C40035AE09 /* Tab][.png */,
095542A7128375C40035AE09 /* Tab][@2x.png */,
@@ -1195,6 +1200,7 @@
09E7BE3911FC935E00DCCFE7 /* XMASDEMO.FTA in Resources */,
09BCB6281211649D009858DF /* flobynoid (2002).dsk.zip in Resources */,
09087F3A12244C0500C52D88 /* delta_1.png in Resources */,
+ 928410581CA8443A00DC5D93 /* Images.xcassets in Resources */,
09087F3B12244C0500C52D88 /* delta_2.png in Resources */,
09087F3C12244C0500C52D88 /* delta_3.png in Resources */,
09087F3D12244C0500C52D88 /* delta_4.png in Resources */,
@@ -1400,8 +1406,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_ENTITLEMENTS = "";
- CODE_SIGN_IDENTITY = "iPhone Developer";
+ CODE_SIGN_IDENTITY = "iPhone Developer: Yoshinobu Sugawara (5AFZVV5C8V)";
COPY_PHASE_STRIP = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = activegs_Prefix.pch;
@@ -1422,7 +1430,7 @@
"$(inherited)",
"\"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/GraphicsServices.framework\"",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.myname.myid;
+ PRODUCT_BUNDLE_IDENTIFIER = com.freetoolsassociation.activegs.yoshi;
PRODUCT_NAME = ActiveGS;
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
@@ -1435,8 +1443,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_ENTITLEMENTS = "";
- CODE_SIGN_IDENTITY = "iPhone Developer";
+ CODE_SIGN_IDENTITY = "iPhone Developer: Yoshinobu Sugawara (5AFZVV5C8V)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1459,7 +1469,7 @@
"$(inherited)",
"\"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/GraphicsServices.framework\"",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.myname.myid;
+ PRODUCT_BUNDLE_IDENTIFIER = com.freetoolsassociation.activegs.yoshi;
PRODUCT_NAME = ActiveGS;
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
@@ -1471,8 +1481,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_ENTITLEMENTS = "";
- CODE_SIGN_IDENTITY = "iPhone Developer";
+ CODE_SIGN_IDENTITY = "iPhone Developer: Yoshinobu Sugawara (5AFZVV5C8V)";
COPY_PHASE_STRIP = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = activegs_Prefix.pch;
@@ -1492,7 +1504,7 @@
"$(inherited)",
"\"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/GraphicsServices.framework\"",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.myname.myid;
+ PRODUCT_BUNDLE_IDENTIFIER = com.freetoolsassociation.activegs.yoshi;
PRODUCT_NAME = ActiveGS;
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
diff --git a/Common.iphone/KBDController.mm b/Common.iphone/KBDController.mm
index f98f702..6b8c82c 100644
--- a/Common.iphone/KBDController.mm
+++ b/Common.iphone/KBDController.mm
@@ -460,7 +460,7 @@ extern int findCode(const char* _s);
self.textField = [[UITextField alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
self.textField.delegate = self;
- self.textField.autocapitalizationType= UITextAutocapitalizationTypeAllCharacters;
+ self.textField.autocapitalizationType= UITextAutocorrectionTypeNo;
self.textField.text= @"*"; // Put a default value to capture del key
[self.interfaceView addSubview:self.textField];
@@ -599,7 +599,7 @@ int hardwarekeyboard= 0;
}
else
{
- option.setIntValue(OPTION_JOYSTICKMODE,JOYSTICK_TYPE_KEYPAD);
+ option.setIntValue(OPTION_JOYSTICKMODE,JOYSTICK_TYPE_NATIVE_1);
[pManager setNotificationText:@"iCade de-activated"];
}
@@ -692,17 +692,13 @@ scontrol runtimeControlDefs[]={
{ LOCKZOOM_AUTO,LOCKZOOM_ON, LOCKZOOM_ARCADE},
nil
},
-/*
-#if 0
{
RC_JOYSTICK,
"Pad Input" ,
- { "iDevice", "iCade",NULL },
+ { "TouchPad", "iCade",NULL },
{ JOYSTICK_TYPE_NATIVE_1,JOYSTICK_TYPE_ICADE},
nil
},
-#endif
- */
#ifdef ACTIVEGS_NOHARDWAREKEYBOARDDETECTION
{
RC_KBD,
@@ -812,6 +808,11 @@ extern int x_frame_rate ;
case RC_JOYSTICK:
option.setIntValue(OPTION_JOYSTICKMODE,v);
g_joystick_type = v;
+ if ( v == JOYSTICK_TYPE_ICADE ) {
+ [self setiCadeMode:YES];
+ } else {
+ [self setiCadeMode:NO];
+ }
break;
case RC_DISPLAY:
// monitor
@@ -1843,7 +1844,7 @@ extern int x_frame_rate ;
-const char* iCadeDetectString="zexwzexw";
+const char* iCadeDetectString="wewexzxz";
int iCadeDetectPos=0;
int keypad_x = 0;
@@ -1897,11 +1898,10 @@ int x_adb_get_keypad_y()
else
[self setiCadeMode:TRUE];
return NO;
- /*
+
option.setIntValue(OPTION_JOYSTICKMODE,JOYSTICK_TYPE_ICADE);
[self setInputMode:inputMode&INPUTMODE_PAD];
[self refreshControls:nil];
- */
}
}
else
@@ -1914,20 +1914,20 @@ int x_adb_get_keypad_y()
{
switch(c)
{
- case 'z': // up
+ case 'w': // up
keypad_y = -32767;
break;
- case 'e':
- case 'w': // !verti
+ case 'e': // !verti
+ case 'z':
keypad_y = 0;
break;
case 'x': // down
keypad_y = 32767;
break;
- case 'q': // left
+ case 'a': // left
keypad_x = -32767;
break;
- case 'a': // !hori
+ case 'q': // !hori
case 'c':
keypad_x = 0;
break;