ObjFW  Diff

Annotate Patch Side-by-side Diff

Differences From Artifact [e739358c29]:

To Artifact [c2558fe049]:

︙
26
27
28
29
30
31
32
33
34
35



36
37
38
39
40
41
42

26
27
28
29
30
31
32



33
34
35
36
37
38
39
40
41
42








-
-
-
+
+
+








#import "OFSet.h"
#import "OFStdIOStream.h"
#import "OFThread.h"
#import "OFValue.h"

#import "OTTestCase.h"

#import "HIDGameController.h"
#import "HIDGameControllerButton.h"
#import "HIDGameControllerMapping.h"
#import "OHGameController.h"
#import "OHGameControllerButton.h"
#import "OHGameControllerMapping.h"

#import "OTAssertionFailedException.h"
#import "OTTestSkippedException.h"

#ifdef OF_IOS
# include <CoreFoundation/CoreFoundation.h>
#endif
︙
281
282
283
284
285
286
287
288
289
290



291
292
293
294
295
296
297

281
282
283
284
285
286
287



288
289
290
291
292
293
294
295
296
297








-
-
-
+
+
+








	if (status == StatusFailed) {
#if defined(OF_WII) || defined(OF_NINTENDO_DS) || defined(OF_NINTENDO_3DS)
		[OFStdOut setForegroundColor: [OFColor silver]];
		[OFStdOut writeLine: @"Press A to continue"];

		for (;;) {
			void *pool = objc_autoreleasePoolPush();
			HIDGameController *controller =
			    [[HIDGameController controllers] objectAtIndex: 0];
			HIDGameControllerButton *button =
			OHGameController *controller =
			    [[OHGameController controllers] objectAtIndex: 0];
			OHGameControllerButton *button =
			    [controller.unmappedMapping.buttons
			    objectForKey: @"A"];

			[controller retrieveState];

			if (button.pressed)
				break;
︙
545
546
547
548
549
550
551
552
553
554



555
556
557
558
559
560
561

545
546
547
548
549
550
551



552
553
554
555
556
557
558
559
560
561








-
-
-
+
+
+








	[OFStdOut writeLine: @"Press Home button to exit"];
# else
	[OFStdOut writeLine: @"Press Start button to exit"];
# endif

	for (;;) {
		void *pool = objc_autoreleasePoolPush();
		HIDGameController *controller =
		    [[HIDGameController controllers] objectAtIndex: 0];
		HIDGameControllerButton *button =
		OHGameController *controller =
		    [[OHGameController controllers] objectAtIndex: 0];
		OHGameControllerButton *button =
# ifdef OF_WII
		    [controller.unmappedMapping.buttons objectForKey: @"Home"];
# else
		    [controller.unmappedMapping.buttons objectForKey: @"Start"];
# endif

		[controller retrieveState];
︙