3 files changed, 16 insertions, 1 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 7e2ef7f..262e7c4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,10 +18,15 @@ int main( int argc, char *argv[] )
         Options &opt = Options::getInstance();
         opt.parse( argc, argv );
 
+        if( opt.sFile.isEmpty() )
+        {
+                sio << "You must specify a stage script filename." << sio.nl;
+                return 1;
+        }
         srandom( time( NULL ) );
 
         GameBuilder bld;
-        bld.parse( argv[1] );
+        bld.parse( opt.sFile );
         Game *pGame = bld.getGame();
 
         GameState gs( pGame );
diff --git a/src/options.cpp b/src/options.cpp
index 0483759..42f58a2 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -26,6 +26,7 @@ void Options::parse( int argc, char *argv[] )
                         " [options] <filename>\n");
         opt.addOption( Bu::slot( this, &Options::version ), Bu::String("version"), Bu::String("Show the version info.") );
         opt.addHelpOption('h', "help");
+        opt.setNonOption( Bu::slot( this, &Options::nonOption ) );
         opt.parse( argc, argv );
 }
 
@@ -41,3 +42,10 @@ int Options::version( Bu::StrArray aArgs )
         return 0;
 }
 
+int Options::nonOption( Bu::Array<Bu::String> aArgs )
+{
+        sFile = aArgs[0];
+
+        return 0;
+}
+
diff --git a/src/options.h b/src/options.h
index 7fe2633..09ad19a 100644
--- a/src/options.h
+++ b/src/options.h
@@ -17,7 +17,9 @@ public:
 
         Bu::String sFile;
 
+protected:
         int version( Bu::Array<Bu::String> aArgs );
+        int nonOption( Bu::Array<Bu::String> aArgs );
 };
 
 #endif