X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=TargetController.m;h=8afaaf2fc6056d2f79140875fde15dff400f767d;hp=3442a61e3912169d45437683405bcff8e7f9ad24;hb=0a402879ee3beb79bb4d2270f909ad75eead0c96;hpb=61f8cdec21ab083b29c22aa11fda54d6005666ca

diff --git a/TargetController.m b/TargetController.m
index 3442a61..8afaaf2 100644
--- a/TargetController.m
+++ b/TargetController.m
@@ -5,6 +5,21 @@
 //  Created by Sam McCall on 5/05/09.
 //
 
+#import "TargetController.h"
+
+#import "ConfigsController.h"
+#import "Config.h"
+#import "JSAction.h"
+#import "JoystickController.h"
+#import "KeyInputTextView.h"
+#import "TargetConfig.h"
+#import "TargetController.h"
+#import "TargetKeyboard.h"
+#import "TargetMouseBtn.h"
+#import "TargetMouseMove.h"
+#import "TargetMouseScroll.h"
+#import "TargetToggleMouseScope.h"
+
 @implementation TargetController
 
 -(void) keyChanged {
@@ -37,17 +52,16 @@
 		case 0: // none
 			return NULL;
 		case 1: // key
-			if([keyInput hasKey]) {
+			if(keyInput.hasKey) {
 				TargetKeyboard* k = [[TargetKeyboard alloc] init];
 				[k setVk: [keyInput vk]];
-				[k setDescr: [keyInput descr]];
 				return k;
 			}
 			break;
 		case 2:
 		{
 			TargetConfig* c = [[TargetConfig alloc] init];
-			[c setConfig: [[configsController configs] objectAtIndex: [configPopup indexOfSelectedItem]]];
+			[c setConfig: [configsController configs][[configPopup indexOfSelectedItem]]];
 			return c;
 		}
         case 3: {
@@ -93,10 +107,9 @@
 }
 
 -(void) commit {
-	id action = [joystickController selectedAction];
-	if(action) {
-		Target* target = [self state];
-		[[configsController currentConfig] setTarget: target forAction: action];
+	JSAction *action = [joystickController selectedAction];
+	if (action) {
+        configsController.currentConfig[action] = self.state;
 	}
 }
 
@@ -131,7 +144,7 @@
 	} else {
 		[self setEnabled: YES];
 	}
-	Target* target = [[configsController currentConfig] getTargetForAction: jsaction];
+	Target* target = configsController.currentConfig[jsaction];
 	
 	id act = jsaction;
 	NSString* actFullName = [act name];
@@ -185,7 +198,7 @@
 	NSArray* configs = [configsController configs];
 	[configPopup removeAllItems];
 	for(int i=0; i<[configs count]; i++) {
-		[configPopup addItemWithTitle: [[configs objectAtIndex:i]name]];
+		[configPopup addItemWithTitle: [configs[i]name]];
 	}
 	if(preserve)
 		[configPopup selectItemAtIndex:initialIndex];