Made single World struct a global variable, fitted a lot of code to this change,...

[plomrogue] / src / control.h

diff --git a/src/control.h b/src/control.h
index 79e5976e7b5010019df474c994ac4fa25dea2e91..889bdbfd366394f1d7a44e29eed7853b8fde05c4 100644 (file)
--- a/src/control.h
+++ b/src/control.h
@@ -6,25 +6,35 @@
 #ifndef CONTROL_H
 #define CONTROL_H
 
+#include <stdint.h> /* for uint8_t */
 
 
-#include <stdint.h> /* for uint8_t */
-struct World;
+
+/* Return keycode to action of "name" if available in current window config. */
+extern uint16_t get_available_keycode_to_action(char * name);
 
 
 
 /* Control the player character, either via recorded "action" or pressed "key".
  */
-extern void record_control(int action, struct World * world);
-extern uint8_t player_control(int key, struct World * world);
+extern void record_control(int action);
+extern uint8_t player_control(int key);
+
+
+
+/* Control via "key" active window's geometry / keybindings in respective config
+ * view.
+ */
+extern uint8_t wingeom_control(int key);
+extern uint8_t winkeyb_control(int key);
 
 
 
-/* Call by "key" game / window management actions that don't influence the
- * player character. If the "quit" action is called, return 1 (instead of
+/* Call by "key" further game / window management actions that don't influence
+ * the player character. If the "quit" action is called, return 1 (instead of
  * exiting directly).
  */
-extern uint8_t meta_control(int key, struct World * world);
+extern uint8_t meta_control(int key);