From 52b203b8a2ba3a338dc4693a676942d4a3bce49c Mon Sep 17 00:00:00 2001
From: jeblanchard <jeblanchard@users.sf.net>
Date: Thu, 29 May 2008 08:15:20 +0000
Subject: [PATCH] Add -playmovie (the "old-fashioned" way)

---
 src/drivers/win/args.cpp |  3 +++
 src/drivers/win/args.h   |  3 ++-
 src/drivers/win/main.cpp | 10 ++++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/drivers/win/args.cpp b/src/drivers/win/args.cpp
index a0a4b9cd..2c4f2c37 100644
--- a/src/drivers/win/args.cpp
+++ b/src/drivers/win/args.cpp
@@ -23,6 +23,8 @@
 #include "common.h"
 #include "../common/args.h"
 
+char* MovieToLoad = 0;
+
 // TODO: Parsing arguments needs to be improved a lot. A LOT.
 
 /**
@@ -39,6 +41,7 @@ char *ParseArgies(int argc, char *argv[])
          //{"-nofs",0,&eoptions,0},   
          {"-clipsides",0,&eoptions,0x8000|EO_CLIPSIDES},  
          {"-nothrottle",0,&eoptions,0x8000|EO_NOTHROTTLE},
+         {"-playmovie",0,&MovieToLoad,0x4001},
 	};
 
        if(argc <= 1)
diff --git a/src/drivers/win/args.h b/src/drivers/win/args.h
index 04d5cf6c..498c763c 100644
--- a/src/drivers/win/args.h
+++ b/src/drivers/win/args.h
@@ -1 +1,2 @@
-char *ParseArgies(int argc, char *argv[]);
\ No newline at end of file
+extern char* MovieToLoad;
+char *ParseArgies(int argc, char *argv[]);
diff --git a/src/drivers/win/main.cpp b/src/drivers/win/main.cpp
index 0f9dcad5..47d1008e 100644
--- a/src/drivers/win/main.cpp
+++ b/src/drivers/win/main.cpp
@@ -671,8 +671,6 @@ int main(int argc,char *argv[])
  
 	InitSpeedThrottle();
 
-	UpdateCheckedMenuItems();
-
 	if(t)
 	{
 		ALoad(t);
@@ -683,7 +681,15 @@ int main(int argc,char *argv[])
 	}
 
 
+	if(MovieToLoad)
+	{
+		FCEUI_LoadMovie(MovieToLoad, 1, 0);
+		free(MovieToLoad);
+		MovieToLoad = NULL;
+	}
 	if (MemWatchLoadOnStart) CreateMemWatch();
+
+	UpdateCheckedMenuItems();
 doloopy:
 	UpdateFCEUWindow();  
 	if(GameInfo)