Diff: map.cpp

Revision:

4:e3fbc74a3783

Parent:

0:35660d7952f7

--- a/map.cpp	Mon Oct 28 05:26:35 2019 +0000
+++ b/map.cpp	Thu Nov 14 17:14:37 2019 +0000
@@ -7,9 +7,10 @@
  * The Map structure. This holds a HashTable for all the MapItems, along with
  * values for the width and height of the Map.
  */
-struct Map {
-    HashTable* items;
-    int w, h;
+struct Map
+{
+  HashTable *items;
+  int w, h;
 };
 
 /**
@@ -25,8 +26,9 @@
  * key information (x, y) into a one-dimensional unsigned integer.
  * This function should uniquely map (x,y) onto the space of unsigned integers.
  */
-static unsigned XY_KEY(int X, int Y) {
-    // TODO: Fix me!
+static unsigned XY_KEY(int X, int Y)
+{
+  return Y * map_width() + X;
 }
 
 /**
@@ -36,103 +38,116 @@
  */
 unsigned map_hash(unsigned key)
 {
-    // TODO: Fix me!
+  return key % map_width();
 }
 
 void maps_init()
 {
-    // TODO: Implement!    
-    // Initialize hash table
-    // Set width & height
+  HashTable *hash_map = createHashTable(map_hash, 50);
+  map.items = hash_map;
+  map.w = 50;
+  map.h = 50;
 }
 
-Map* get_active_map()
+Map *get_active_map()
 {
-    // There's only one map
-    return ↦
+  // There's only one map
+  return ↦
 }
 
-Map* set_active_map(int m)
+Map *set_active_map(int m)
 {
-    active_map = m;
-    return ↦
+  active_map = m;
+  return ↦
 }
 
 void print_map()
 {
-    // As you add more types, you'll need to add more items to this array.
-    char lookup[] = {'W', 'P'};
-    for(int y = 0; y < map_height(); y++)
+  // As you add more types, you'll need to add more items to this array.
+  char lookup[] = {'W', 'P'};
+  for (int y = 0; y < map_height(); y++)
+  {
+    for (int x = 0; x < map_width(); x++)
     {
-        for (int x = 0; x < map_width(); x++)
-        {
-            MapItem* item = get_here(x,y);
-            if (item) pc.printf("%c", lookup[item->type]);
-            else pc.printf(" ");
-        }
-        pc.printf("\r\n");
+      MapItem *item = get_here(x, y);
+      if (item)
+        pc.printf("%c", lookup[item->type]);
+      else
+        pc.printf(" ");
     }
+    pc.printf("\r\n");
+  }
 }
 
 int map_width()
 {
+  return map.w;
 }
 
 int map_height()
 {
+  return map.h;
 }
 
 int map_area()
 {
+  return map_height() * map_width();
 }
 
-MapItem* get_north(int x, int y)
+MapItem *get_north(int x, int y)
 {
+  return (MapItem *)getItem(map.items, XY_KEY(x, y - 1));
 }
 
-MapItem* get_south(int x, int y)
+MapItem *get_south(int x, int y)
 {
+  return (MapItem *)getItem(map.items, XY_KEY(x, y + 1));
 }
 
-MapItem* get_east(int x, int y)
+MapItem *get_east(int x, int y)
 {
+  return (MapItem *)getItem(map.items, XY_KEY(x + 1, y));
 }
 
-MapItem* get_west(int x, int y)
+MapItem *get_west(int x, int y)
 {
+  return (MapItem *)getItem(map.items, XY_KEY(x - 1, y));
 }
 
-MapItem* get_here(int x, int y)
+MapItem *get_here(int x, int y)
 {
+  return (MapItem *)getItem(map.items, XY_KEY(x, y));
 }
 
-
 void map_erase(int x, int y)
 {
+  removeItem(map.items, XY_KEY(x, y));
 }
 
 void add_wall(int x, int y, int dir, int len)
 {
-    for(int i = 0; i < len; i++)
-    {
-        MapItem* w1 = (MapItem*) malloc(sizeof(MapItem));
-        w1->type = WALL;
-        w1->draw = draw_wall;
-        w1->walkable = false;
-        w1->data = NULL;
-        unsigned key = (dir == HORIZONTAL) ? XY_KEY(x+i, y) : XY_KEY(x, y+i);
-        void* val = insertItem(get_active_map()->items, key, w1);
-        if (val) free(val); // If something is already there, free it
-    }
+  for (int i = 0; i < len; i++)
+  {
+    MapItem *w1 = (MapItem *)malloc(sizeof(MapItem));
+    w1->type = WALL;
+    w1->draw = draw_wall;
+    w1->walkable = false;
+    w1->data = NULL;
+    unsigned key = (dir == HORIZONTAL) ? XY_KEY(x + i, y) : XY_KEY(x, y + i);
+    void *val = insertItem(get_active_map()->items, key, w1);
+    if (val)
+      free(val); // If something is already there, free it
+  }
 }
 
 void add_plant(int x, int y)
 {
-    MapItem* w1 = (MapItem*) malloc(sizeof(MapItem));
-    w1->type = PLANT;
-    w1->draw = draw_plant;
-    w1->walkable = true;
-    w1->data = NULL;
-    void* val = insertItem(get_active_map()->items, XY_KEY(x, y), w1);
-    if (val) free(val); // If something is already there, free it
+  MapItem *w1 = (MapItem *)malloc(sizeof(MapItem));
+  w1->type = PLANT;
+  w1->draw = draw_plant;
+  w1->walkable = true;
+  w1->data = NULL;
+  void *val = insertItem(get_active_map()->items, XY_KEY(x, y), w1);
+  if (val)
+    free(val); // If something is already there, free it
 }
\ No newline at end of file