1 files changed, 42 insertions, 3 deletions

diff --git a/src/interfaceconsole.cpp b/src/interfaceconsole.cpp
index 49be5c1..e652da8 100644
--- a/src/interfaceconsole.cpp
+++ b/src/interfaceconsole.cpp
@@ -2,6 +2,8 @@
 
 #include "smlnode.h"
 #include "gamestate.h"
+#include "situation.h"
+#include "command.h"
 
 #include <bu/sio.h>
 
@@ -12,6 +14,8 @@
 #include <gats/gatsstream.h>
 #include <bu/file.h>
 
+#include <stdlib.h>
+
 PluginInterface3( plugin_interface_console, console, InterfaceConsole,
                 Interface, "Mike Buland", 1, 0 );
 
@@ -34,10 +38,45 @@ void InterfaceConsole::run( Game *pGame )
         while( gs.isRunning() )
         {
                 char buf[1024];
-                sio << sio.nl << "command> " << sio.flush;
-                fgets( buf, 1024, stdin );
+                switch( gs.getCurSituation()->getInputType() )
+                {
+                        case Situation::inputCommand:
+                                sio << sio.nl << "command> " << sio.flush;
+                                fgets( buf, 1024, stdin );
+
+                                gs.execCommand( buf );
+                                break;
+
+                        case Situation::inputOption:
+                                sio << sio.nl;
+                                {
+                                        const CommandSet::CommandList &cl = 
+                                                gs.getCurSituation()->getCommandSet().getCommandList();
 
-                gs.execCommand( buf );
+                                        int j = 1;
+                                        for( CommandSet::CommandList::const_iterator i = cl.begin();
+                                                 i; i++ )
+                                        {
+                                                sio << "  " << j << ") " << (*i)->getRoot() << sio.nl;
+                                                j++;
+                                        }
+                                        sio << "Enter your selection: " << sio.flush;
+                                        fgets( buf, 1024, stdin );
+                                        if( buf[0] < '1' || buf[0] > '9' )
+                                                j = -1;
+                                        else
+                                                j = strtol( buf, NULL, 10 );
+                                        if( j < 1 || j > cl.getSize() )
+                                        {
+                                                sio << "Invalid selection, try again." << sio.nl;
+                                        }
+                                        else
+                                        {
+                                                gs.execOption( j-1 );
+                                        }
+                                }
+                                break;
+                }
         }       
 }