Server/py: Fix some thing memorization bugs.

[plomrogue] / src / client / control.h

diff --git a/src/client/control.h b/src/client/control.h
index 56d33c30bdf23325fc379af8fdfd9608d77baaa8..b1c7112ebb1924f00af2ff1964acbd2693b4c85f 100644 (file)
--- a/src/client/control.h
+++ b/src/client/control.h
@@ -1,4 +1,8 @@
 /* src/client/control.h
+ *
+ * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+ * or any later version. For details on its copyright, license, and warranties,
+ * see the file NOTICE in the root directory of the PlomRogue source package.
  *
  * Routines for handling control input from the keyboard.
  */
@@ -6,30 +10,15 @@
 #ifndef CONTROL_H
 #define CONTROL_H
 
-#include <stdint.h> /* uint8_t */
-
+#include <stdint.h> /* uint8_t, uint16_t */
 
 
-/* Tries to call by "key" for player actions triggering messages to the server.
- * The appropriate Command struct's .server_msg will be sent, followed by a " ",
- * followed by either a string representation of the numerical value of the
- * Command struct's .arg, or, if .arg == 'i', world.player_inventory_select.
- * Returns 1 on success, 0 on failure.
- */
-extern uint8_t player_control(int key);
-
-/* Try to call by "key" actions for active window's keybindings/geometry config
- * view. Return 1 on success, 0 on failure.
- */
-extern uint8_t wingeom_control(int key);
-extern uint8_t winkeyb_control(int key);
 
-/* Try to call by "key" basic window and game management actions that do not
- * send a message to the server and do not change individual windows'
- * keybindings or geometries. Returns 0 on failure, 2 for calling a "quit"
- * action (to be handled externally) and 1 for calling any other action.
+/* Try to match "key" to the Command DB and execute appropriate actions if
+ * successful. Return 0 on failure, 2 for calling a "quit" comand (to be
+ * handled externally) and 1 for calling any other command.
  */
-extern uint8_t meta_control(int key);
+extern uint8_t try_key(uint16_t key);