Merge pull request #15 from UtkarshMe/issue_14

CMakeLists.txt

@@ -43,7 +43,7 @@ set (PROJECT_SOURCES
     src/main.c
     src/interface.c
     src/map.c
-    src/action.c
+    src/command.c
     src/key.c
     src/msg.c
     src/game.c

include/action.h → include/command.h

@@ -1,6 +1,6 @@
 /*
- * include/action.h
- * Declare the interface to handle user input
+ * include/command.c
+ * Declare the interface for taking and executing commands
  *
  * Copyright (C) 2017 Utkarsh Mahshwari <[email protected]>
  *
@@ -18,14 +18,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ACTION_H_D9AS6ZWN
-#define ACTION_H_D9AS6ZWN
+#ifndef COMMAND_H_0TNF49V3
+#define COMMAND_H_0TNF49V3
+
+
+/**
+ * Ask user for input and build the command
+ * @return The pointer to the command
+ */
+command_t * command_get();
+
 
 /**
- * Take a key as input and update the map checking if the move is valid or not
- * @param The map to update
- * @return The command entered by the user
+ * Execute the command on the given map
+ * @param The pointer to the map
+ * @patam The pointer to the command
  */
-command_t action_make_move(const map_t *map);
+void command_exec(const map_t *, const command_t *);
+
 
-#endif /* end of include guard: ACTION_H_D9AS6ZWN */
+#endif /* end of include guard: COMMAND_H_0TNF49V3 */

include/datatypes.h

@@ -165,11 +165,16 @@ typedef struct {
 typedef struct {
     enum {
         COMMAND_NOP,
-        COMMAND_MOTION,
         COMMAND_HELP,
         COMMAND_QUIT,
+        COMMAND_OTHER,
     } type;
-    char value;
+    int count;
+    struct {
+        int count;
+        int value;
+    } motion;
+    int oper;
 } command_t;
 
 

include/interface.h

@@ -90,6 +90,13 @@ void interface_display_status(game_status_t);
 input_key_t interface_input_key();
 
 
+/**
+ * Put the key back to the input queue
+ * @param The key to put back
+ */
+void interface_input_key_undo(input_key_t);
+
+
 /**
  * Keep taking input till the user presses enter
  * @return The line terminated by '\0'