FIX w()/h() warnings

Author: deepnight

src/game/Camera.hx

@@ -116,11 +116,11 @@ class Camera extends GameChildProcess {
 	}
 
 	function get_pxWid() {
-		return M.ceil( Game.ME.w() / Const.SCALE / zoom );
+		return M.ceil( Game.ME.stageWid / Const.SCALE / zoom );
 	}
 
 	function get_pxHei() {
-		return M.ceil( Game.ME.h() / Const.SCALE / zoom );
+		return M.ceil( Game.ME.stageHei / Const.SCALE / zoom );
 	}
 
 

src/game/Fx.hx

@@ -143,8 +143,8 @@ class Fx extends GameChildProcess {
 	public inline function flashBangS(c:Col, a:Float, t=0.1) {
 		var e = new h2d.Bitmap(h2d.Tile.fromColor(c,1,1,a));
 		game.root.add(e, Const.DP_FX_FRONT);
-		e.scaleX = game.w();
-		e.scaleY = game.h();
+		e.scaleX = game.stageWid;
+		e.scaleY = game.stageHei;
 		e.blendMode = Add;
 		game.tw.createS(e.alpha, 0, t).end( function() {
 			e.remove();

src/game/ui/Hud.hx

@@ -42,7 +42,7 @@ class Hud extends GameChildProcess {
 		else
 			debugText.text += "\n"+v;
 		debugText.visible = true;
-		debugText.x = Std.int( w()/Const.UI_SCALE - 4 - debugText.textWidth );
+		debugText.x = Std.int( stageWid/Const.UI_SCALE - 4 - debugText.textWidth );
 	}
 
 
@@ -61,7 +61,7 @@ class Hud extends GameChildProcess {
 		// Text
 		var tf = new h2d.Text(Assets.fontPixel, f);
 		tf.text = str;
-		tf.maxWidth = 0.6 * w()/Const.UI_SCALE;
+		tf.maxWidth = 0.6 * stageWid/Const.UI_SCALE;
 		tf.textColor = 0xffffff;
 		tf.filter = new dn.heaps.filter.PixelOutline( color.toBlack(0.2) );
 

src/game/ui/Window.hx

@@ -10,8 +10,8 @@ enum WindowAlign {
 class Window extends dn.Process {
 	public static var ALL : Array<Window> = [];
 
-	var uiWid(get,never) : Int; inline function get_uiWid() return M.ceil( w()/Const.UI_SCALE );
-	var uiHei(get,never) : Int; inline function get_uiHei() return M.ceil( h()/Const.UI_SCALE );
+	var uiWid(get,never) : Int; inline function get_uiWid() return M.ceil( stageWid/Const.UI_SCALE );
+	var uiHei(get,never) : Int; inline function get_uiHei() return M.ceil( stageHei/Const.UI_SCALE );
 
 	public var content: h2d.Flow;
 

src/game/ui/win/DebugWindow.hx

@@ -22,9 +22,9 @@ class DebugWindow extends ui.Window {
 	override function onResize() {
 		super.onResize();
 		switch verticalAlign {
-			case Start,End: content.maxHeight = Std.int( 0.4 * h()/Const.UI_SCALE );
-			case Center: content.maxHeight = Std.int( 0.8 * h()/Const.UI_SCALE );
-			case Fill: content.maxHeight = Std.int( h()/Const.UI_SCALE );
+			case Start,End: content.maxHeight = Std.int( 0.4 * stageHei/Const.UI_SCALE );
+			case Center: content.maxHeight = Std.int( 0.8 * stageHei/Const.UI_SCALE );
+			case Fill: content.maxHeight = Std.int( stageHei/Const.UI_SCALE );
 		}
 	}
 

src/game/ui/win/SimpleMenu.hx

@@ -25,9 +25,9 @@ class SimpleMenu extends ui.Window {
 	override function onResize() {
 		super.onResize();
 		switch verticalAlign {
-			case Start,End: content.maxHeight = Std.int( 0.4 * h()/Const.UI_SCALE );
-			case Center: content.maxHeight = Std.int( 0.8 * h()/Const.UI_SCALE );
-			case Fill: content.maxHeight = Std.int( h()/Const.UI_SCALE );
+			case Start,End: content.maxHeight = Std.int( 0.4 * stageHei/Const.UI_SCALE );
+			case Center: content.maxHeight = Std.int( 0.8 * stageHei/Const.UI_SCALE );
+			case Fill: content.maxHeight = Std.int( stageHei/Const.UI_SCALE );
 		}
 	}