Server: Minor refactoring, removal of unneeded is_passable().

[plomrogue] / src / server / map.h

diff --git a/src/server/map.h b/src/server/map.h
index 641cb797edca08f8d9ef95692901777d84eb6fd3..5407dafe34942b65f0ce6a1b6570b38baa8b4771 100644 (file)
--- a/src/server/map.h
+++ b/src/server/map.h
@@ -6,8 +6,8 @@
 #ifndef MAP_H_SERVER
 #define MAP_H_SERVER
 
-#include <stdint.h> /* uint8_t, uint16_t */
-#include "../common/yx_uint8.h" /* yx_uint8 struct */
+#include <stdint.h> /* uint8_t */
+#include "../common/yx_uint8.h" /* yx_uint8 */
 
 
 
@@ -21,14 +21,10 @@
  */
 extern void remake_map();
 
-/* Check if coordinate "pos" on (or beyond) world.map is accessible to thing
- * movement.
+/* Wrapper to mv_yx_in_dir_wrap(), returns 1 if the wrapped function moved "yx"
+ * within the wrap borders and the map size, else 0.
  */
-extern uint8_t is_passable(struct yx_uint8 pos);
-
-/* Transform "yx" to an index position in the world map. */
-extern uint16_t yx_to_map_pos(struct yx_uint8 * yx);
-
+extern uint8_t mv_yx_in_dir_legal(char dir, struct yx_uint8 * yx);
 
 
 #endif