Implemented launching save states from context menu.

OpenEmu · Mar 18, 2012 · 2240d56 · 2240d56
1 parent 1fd51a1
commit 2240d56
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 8 deletions.
diff --git a/OpenEmu/OECollectionViewController.m b/OpenEmu/OECollectionViewController.m
@@ -630,11 +630,6 @@ - (void)deleteSaveState:(id)stateItem
         [state remove];
 }
 
-- (void)startSelectedGameWithSaveState:(id)stateItem
-{
-    NSLog(@"startSelectedGameWithSaveState: Not implemented yet.");
-}
-
 - (void)renameSelectedGame:(id)sender
 {
     NSLog(@"renameSelectedGame: Not implemented yet.");

diff --git a/OpenEmu/OEGameDocument.h b/OpenEmu/OEGameDocument.h
@@ -29,8 +29,8 @@
 @class OEGameViewController;
 @class OEDBRom;
 @class OEDBGame;
+@class OEDBSaveState;
 @class OECorePlugin;
-
 @interface OEGameDocument : NSDocument
 
 - (id)initWithRom:(OEDBRom *)rom;
@@ -41,7 +41,8 @@
 - (id)initWithGame:(OEDBGame *)game core:(OECorePlugin*)core;
 - (id)initWithGame:(OEDBGame *)game error:(NSError **)outError;
 - (id)initWithGame:(OEDBGame *)game core:(OECorePlugin*)core error:(NSError **)outError;
-
+- (id)initWithSaveState:(OEDBSaveState *)state;
+- (id)initWithSaveState:(OEDBSaveState *)state error:(NSError **)outError;
 @property(readonly, strong) OEGameViewController *gameViewController;
 
 - (void)showInSeparateWindow:(id)sender;

diff --git a/OpenEmu/OEGameDocument.m b/OpenEmu/OEGameDocument.m
@@ -152,6 +152,27 @@ - (id)initWithGame:(OEDBGame *)game core:(OECorePlugin*)core error:(NSError **)o
     return self;
 }
 
+- (id)initWithSaveState:(OEDBSaveState *)state
+{
+    return [self initWithSaveState:state error:nil];
+}
+
+- (id)initWithSaveState:(OEDBSaveState *)state error:(NSError **)outError
+{
+    if((self = [self init]))
+    {
+        gameViewController = [[OEGameViewController alloc] initWithSaveState:state error:outError];
+        if(gameViewController == nil)
+        {
+            [self close];
+            return nil;
+        }
+
+        [gameViewController setDocument:self];
+    }
+    return self;
+}
+
 - (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:NSApplicationWillTerminateNotification object:NSApp];

diff --git a/OpenEmu/OEGameViewController.h b/OpenEmu/OEGameViewController.h
@@ -28,6 +28,7 @@
 
 @class OEDBRom;
 @class OEDBGame;
+@class OEDBSaveState;
 
 @class OEGameView;
 @protocol OEGameCoreHelper;
@@ -72,6 +73,9 @@
 - (id)initWithGame:(OEDBGame *)game error:(NSError **)outError;
 - (id)initWithGame:(OEDBGame *)game core:(OECorePlugin*)core error:(NSError **)outError;
 
+- (id)initWithSaveState:(OEDBSaveState *)state;
+- (id)initWithSaveState:(OEDBSaveState *)state error:(NSError **)outError;
+
 @property (strong) OEHUDControlsBarWindow *controlsWindow;
 
 @property(weak)   id<OEGameViewControllerDelegate> delegate;

diff --git a/OpenEmu/OEGameViewController.m b/OpenEmu/OEGameViewController.m
@@ -149,6 +149,27 @@ - (id)initWithGame:(OEDBGame *)game core:(OECorePlugin*)core error:(NSError **)o
     return [self initWithRom:[OEGameViewController OE_choseRomFromGame:game] core:core error:outError];
 }
 
+
+- (id)initWithSaveState:(OEDBSaveState *)state
+{
+    return [self initWithSaveState:state error:nil];
+}
+
+
+- (id)initWithSaveState:(OEDBSaveState *)state error:(NSError **)outError
+{
+    OEDBRom         *rom            = [state rom];
+    NSString        *coreIdentifier = [state coreIdentifier];
+    OECorePlugin    *core           = [OECorePlugin corePluginWithBundleIdentifier:coreIdentifier];
+    id gameViewController = [self initWithRom:rom core:core error:outError];
+    if(gameViewController)
+    {
+        [self loadSaveState:state];
+    }
+
+    return self;    
+}
+
 - (void)dealloc
 {
     NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];

diff --git a/OpenEmu/OELibraryController.h b/OpenEmu/OELibraryController.h
@@ -35,7 +35,7 @@
 @class OELibrarySplitView;
 @class OEROMImporter;
 @class FullscreenWindow;
-@class OEDBGame, OEDBRom;
+@class OEDBGame, OEDBRom, OEDBSaveState;
 
 @protocol OELibraryControllerDelegate;
 
@@ -113,4 +113,5 @@
 @optional
 - (void)libraryController:(OELibraryController *)sender didSelectGame:(OEDBGame *)aGame;
 - (void)libraryController:(OELibraryController *)sender didSelectRom:(OEDBRom *)aGame;
+- (void)libraryController:(OELibraryController *)sender didSelectSaveState:(OEDBSaveState *)aSaveState;
 @end
diff --git a/OpenEmu/OELibraryController.m b/OpenEmu/OELibraryController.m
@@ -366,6 +366,16 @@ - (IBAction)startGame:(id)sender
         [[self delegate] libraryController:self didSelectGame:selectedGame];
 }
 
+- (void)startSelectedGameWithSaveState:(id)stateItem
+{
+    OEDBSaveState *saveState = [stateItem representedObject];
+
+    NSAssert(saveState != nil, @"Attempt to start a save state without valid item");
+
+    if([[self delegate] respondsToSelector:@selector(libraryController:didSelectGame:)])
+        [[self delegate] libraryController:self didSelectSaveState:saveState];
+}
+
 #pragma mark -
 #pragma mark Spotlight Importing
 

diff --git a/OpenEmu/OEMainWindowController.m b/OpenEmu/OEMainWindowController.m
@@ -206,6 +206,22 @@ - (void)libraryController:(OELibraryController *)sender didSelectGame:(OEDBGame
     [self openGameDocument:gameDocument];
 }
 
+
+- (void)libraryController:(OELibraryController *)sender didSelectSaveState:(OEDBSaveState *)aSaveState
+{
+    NSError        *error = nil;
+    OEGameDocument *gameDocument = [[OEGameDocument alloc] initWithSaveState:aSaveState error:&error];
+
+    if(gameDocument == nil)
+    {
+        if(error!=nil)
+            [NSApp presentError:error];
+        return;
+    }
+
+    [[NSDocumentController sharedDocumentController] addDocument:gameDocument];
+    [self openGameDocument:gameDocument];
+}
 #pragma mark -
 #pragma mark NSWindow delegate