Controller stick fix

WilliamLCobb · Jul 5, 2016 · 353ca75 · 353ca75
1 parent 099b6b2
commit 353ca75
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/Dolphin/libcommon.a b/Dolphin/libcommon.a
diff --git a/GC4iOS.xcodeproj/project.pbxproj b/GC4iOS.xcodeproj/project.pbxproj
@@ -645,8 +645,9 @@
 		CAB660471D09B9D600037854 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				CLASSPREFIX = GC4iOS;
 				LastUpgradeCheck = 0730;
-				ORGANIZATIONNAME = WilliamCobb;
+				ORGANIZATIONNAME = GC4iOS;
 				TargetAttributes = {
 					CAB6604E1D09B9D600037854 = {
 						CreatedOnToolsVersion = 7.3;
@@ -917,7 +918,7 @@
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/Dolphin",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = WilliamCobb.GC4iOS;
+				PRODUCT_BUNDLE_IDENTIFIER = com.WilliamCobb.GC4iOS;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -943,7 +944,7 @@
 					"$(PROJECT_DIR)/Dolphin",
 				);
 				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = WilliamCobb.GC4iOS;
+				PRODUCT_BUNDLE_IDENTIFIER = com.WilliamCobb.GC4iOS;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;

diff --git a/GC4iOS/Info.plist b/GC4iOS/Info.plist
@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
@@ -21,7 +23,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>${PRODUCT_BUNDLE_IDENTIFIER}${BUNDLE_ID_SUFFIX}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)${BUNDLE_ID_SUFFIX}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/GC4iOS/UI/EmulatorViewController.mm b/GC4iOS/UI/EmulatorViewController.mm
@@ -75,17 +75,18 @@ - (void)viewWillLayoutSubviews
 
     //printf("%f %f\n", joyData[0].x, joyData[1].x);
 
-    pad->stickX = (int)joyData[0].x;
-    pad->stickY = (int)joyData[0].y;
+    pad->stickX = (uint8_t)joyData[0].x;
+    pad->stickY = (uint8_t)joyData[0].y;
 
-    pad->substickX = (int)joyData[1].x;
-    pad->substickY = (int)joyData[1].y;
+    pad->substickX = (uint8_t)joyData[1].x;
+    pad->substickY = (uint8_t)joyData[1].y;
 }
 
 // Create a new class to handle the controller later
 - (void)joystick:(NSInteger)joyid movedToPosition:(CGPoint)joyPosition
 {
-	joyData[joyid] = joyPosition;
+	joyData[joyid].x = joyPosition.x * 126 + 127;
+	joyData[joyid].y = joyPosition.y * 126 + 127;
 }
 
 - (void)buttonStateChanged:(u16)bState