compile fixes

infidel- · Mar 27, 2016 · 90cac3e · 90cac3e
1 parent 0433f57
commit 90cac3e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -1,10 +1,16 @@
 all: clean windows-mydebug
 
-neko:
-	openfl build project.nmml neko -Dmydebug
+linux32-mydebug:
+	openfl build project.nmml linux -neko -32 -Dmydebug
 
-linux:
-	openfl build project.nmml linux -Dmydebug
+linux32-clean:
+	openfl build project.nmml linux -neko
+
+linux64-mydebug:
+	openfl build project.nmml linux -neko -Dmydebug
+
+linux64-clean:
+	openfl build project.nmml linux -neko
 
 windows-mydebug:
 	haxe --connect 6000 -D mydebug .bin/linux64/neko/haxe/release.hxml && \

diff --git a/game/AreaGame.hx b/game/AreaGame.hx
@@ -535,7 +535,7 @@ class AreaGame
   public function getCellType(x: Int, y: Int): Int
     {
       if (x < 0 || y < 0 || x >= width || y >= height)
-        return null;
+        return -1;
       return _cells[x][y];
     }
 

diff --git a/game/AreaGenerator.hx b/game/AreaGenerator.hx
@@ -28,18 +28,18 @@ class AreaGenerator
       for (y in 0...area.height)
         {
           for (x in 0...area.width)
-            neko.Lib.print(cells[x][y]);
-          neko.Lib.println('');
+            Sys.print(cells[x][y]);
+          Sys.println('');
         }
 */
 /*
       var cells = area.getCells();
       for (y in 0...area.height)
         {
           for (x in 0...area.width)
-//            neko.Lib.print(cells[x][y] == Const.TILE_BUILDING ? 1 : 0);
-            neko.Lib.print(cells[x][y]);
-          neko.Lib.println('');
+//            Sys.print(cells[x][y] == Const.TILE_BUILDING ? 1 : 0);
+            Sys.print(cells[x][y]);
+          Sys.println('');
         }
 */
 //      Sys.exit(1);
@@ -388,9 +388,9 @@ class AreaGenerator
       for (y in 0...area.height)
         {
           for (x in 0...area.width)
-//            neko.Lib.print(cells[x][y] == Const.TILE_BUILDING ? 1 : 0);
-            neko.Lib.print(cells[x][y]);
-          neko.Lib.println('');
+//            Sys.print(cells[x][y] == Const.TILE_BUILDING ? 1 : 0);
+            Sys.print(cells[x][y]);
+          Sys.println('');
         }
       return;
 
@@ -608,7 +608,7 @@ class AreaGenerator
               for (dx in 0...sx)
                 {
                   var cellType = area.getCellType(x + dx, y + dy);
-                  if (cellType == null)
+                  if (cellType == -1)
                     continue;
 
                   area.setCellType(x + dx, y + dy, Const.TILE_BUILDING);

diff --git a/game/RegionGame.hx b/game/RegionGame.hx
@@ -288,7 +288,7 @@ class RegionGame
   public function updateAlertness()
     {
       // make empty array
-      var tmp = new Array<Array<Float>>();
+      var tmp = new Array<Array<Null<Float>>>();
       for (i in 0...width)
         tmp[i] = [];
 

diff --git a/objects/AreaObject.hx b/objects/AreaObject.hx
@@ -54,13 +54,13 @@ class AreaObject
 // create entity for this AI (using parent type as a row)
   public function createEntityByType(parentType: String)
     {
-      var atlasRow: Int = Reflect.field(Const, 'ROW_' + parentType.toUpperCase());
+      var atlasRow: Null<Int> = Reflect.field(Const, 'ROW_' + parentType.toUpperCase());
       if (atlasRow == null)
         {
           trace('No such entity type: ' + parentType);
           return;
         }
-      var atlasCol: Int = Reflect.field(Const, 'FRAME_' + type.toUpperCase());
+      var atlasCol: Null<Int> = Reflect.field(Const, 'FRAME_' + type.toUpperCase());
       if (atlasCol == null)
         {
           trace('No such entity frame: ' + type);