Diff: map.h

Revision:

11:6cd02a8539d1

Parent:

10:e18685911e84

Child:

13:798a4dd14c7e

--- a/map.h	Wed Dec 01 22:07:24 2021 +0000
+++ b/map.h	Thu Dec 02 06:24:22 2021 +0000
@@ -35,11 +35,6 @@
      */
     int walkable;
     
-    //Current and Previous Location of item 
-    
-    int x,y;
-    int px,py;
-    
     /**
      * Arbitrary extra data for the MapItem. Could be useful for keeping up with
      * special information, like where a set of stairs should take the player.
@@ -69,6 +64,9 @@
 #define PORTAl 8
 #define KINDOM 9
 #define FRUIT 10
+#define VILL 11
+#define NPCT 12
+#define ENEMY 13
 
 
 
@@ -97,7 +95,7 @@
  * Returns the map m, regardless of whether it is the active map. This function
  * does not change the active map.
  */
-Map* get_map(int m);
+int get_map(int m);
 
 /**
  * Print the active map to the serial console.
@@ -154,6 +152,8 @@
  */
 void map_erase(int x, int y);
 
+void map_delete(int x, int y);
+
 /**
  * Add WALL items in a line of length len beginning at (x,y).
  * If dir == HORIZONTAL, the line is in the direction of increasing x.
@@ -170,11 +170,21 @@
 
 void add_kindom(int x, int y);
 
+void add_fire(int x, int y);
+
 void add_chest(int x, int y);
 
 void add_npc(int x, int y);
 
-void delete_npc(int x, int y);
+void add_npc2(int x, int y);
+
+void add_store(int x, int y);
+
+void add_merch(int x, int y);
+
+void add_eye(int x, int y);
+
+void add_goblin(int x, int y);
 
 void add_portal(int x, int y);