Merge remote-tracking branch 'origin'

code/game/world.h

@@ -1,19 +1,21 @@
 #if !defined(LD_GAME_WORLD_H_)
 #define LD_GAME_WORLD_H_
+
 #include "player.h"
 #include "npc.h"
 #include "bandit.h"
 
-// Areas are which 
-enum AREA {
-  WORLD_AREA_OUTSIDE = 1,
-  WORLD_AREA_SALOON = 1 << 1,
+// Areas are which
+typedef U32 World_Area;
+enum World_Area {
+  WORLD_AREA_OUTSIDE = (1 << 0),
+  WORLD_AREA_SALOON  = (1 << 1),
 };
 
 typedef struct World World;
 struct World {
   //// Static stuff
-  NavMesh navMesh;
+  NavMesh *navMesh;
 
   //// Player
 	Player player;