Fixed invisible HUD issues

Fixed reload bar firing at the wrong place Made server not render anything (to fix performance issues) Launcher bullet explosions now adequately respond to obstacles
Ohmnivore · Jun 13, 2014 · 4d5faaf · 4d5faaf
1 parent 945d62b
commit 4d5faaf
Show file tree

Hide file tree

Showing 25 changed files with 140 additions and 33 deletions.
diff --git a/Client/export/windows/cpp/bin/SkullRush.exe b/Client/export/windows/cpp/bin/SkullRush.exe
diff --git a/Client/export/windows/cpp/bin/config.txt b/Client/export/windows/cpp/bin/config.txt
@@ -1,4 +1,4 @@
-version=0.3.2
+version=0.3.4
 name=NOOB
 team=1
 ip=

diff --git a/Client/source/PlayState.hx b/Client/source/PlayState.hx
@@ -48,6 +48,7 @@ class PlayState extends FlxState
 	public var players:FlxGroup;
 	public var emitters:FlxGroup;
 	public var ent:FlxGroup;
+	public var perma_hud:FlxGroup;
 	public var hud:FlxGroup;
 	public var scores:NScoreManager;
 
@@ -111,6 +112,8 @@ class PlayState extends FlxState
 		ent = new FlxGroup();
 		add(ent);
 		tocollide.add(ent);
+		perma_hud = new FlxGroup();
+		add(perma_hud);
 		hud = new FlxGroup();
 		add(hud);
 		scores = new NScoreManager();
@@ -121,11 +124,11 @@ class PlayState extends FlxState
 		//hud.add(new FlxCrosshairs());
 
 		Reg.chatbox = new ChatBox();
-		hud.add(Reg.chatbox);
+		perma_hud.add(Reg.chatbox);
 		Reg.chatbox.callback = sendChatMsg;
 
 		Reg.announcer = new Announcer();
-		hud.add(Reg.announcer);
+		perma_hud.add(Reg.announcer);
 
 		ping_text = new FlxText(0, 0, 70, "0");
 		ping_text.scrollFactor.set();
@@ -313,13 +316,28 @@ class PlayState extends FlxState
 	{
 		super.destroy();
 	}
-
+
+	override public function draw():Void
+	{
+		m.acquire();
+		if (collidemap != null)
+		{
+			if (collidemap.cachedGraphics != null)
+			{
+				if (collidemap.cachedGraphics.tilesheet != null)
+					super.draw();
+			}
+		}
+		m.release();
+	}
+
 	/**
 	 * Function that is called once every frame.
 	 */
 	override public function update():Void
 	{
 		//Reg.client.updateS();
+		m.acquire();
 
 		if (FlxG.keys.justPressed.ESCAPE && !Menu.OPENED)
 		{
@@ -341,7 +359,7 @@ class PlayState extends FlxState
 
 		scores.update();
 
-		m.acquire();
+		//m.acquire();
 
 		super.update();
 
@@ -360,6 +378,7 @@ class PlayState extends FlxState
 			Reg.chatbox.toggle();
 		}
 
+		Reg.client.poll();
 		m.release();
 	}
 

diff --git a/Client/source/Player.hx b/Client/source/Player.hx
@@ -19,9 +19,12 @@ class Player extends PlayerBase
 	{
 		super.fire();
 
-		var reload:FlxTimer = new FlxTimer(last_shot.mock_fireRate / 1000);
-		Reg.state.wepBar.setRange(0, 1);
-		Reg.state.wepBar.setParent(reload, "progress", false);
+		if (ID == Reg.state.player.ID)
+		{
+			var reload:FlxTimer = new FlxTimer(last_shot.mock_fireRate / 1000);
+			Reg.state.wepBar.setRange(0, 1);
+			Reg.state.wepBar.setParent(reload, "progress", false);
+		}
 	}
 
 	override public function setGun(GunID:Int, Force:Bool = false):Void

diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ At the moment the client source code is a mess. I'll clean it up one day.
 
 ## Bugs:
 * Fix annoying LAN server discovery bug
-* Fix client-side crashes on map change
+* Map change crash
 
 
 ## Assets:

diff --git a/Server/Project.xml b/Server/Project.xml
@@ -15,7 +15,6 @@
 
 	<!--These window settings apply to all targets-->
 	<window width="640" height="480" fps="60" background="#000000" hardware="true" vsync="true" />
-	<window antialiasing="100" />
 
 	<!--Web-specific-->
 	<window if="web" orientation="portrait"  />

diff --git a/Server/export/windows/cpp/bin/Insomnia.ndll b/Server/export/windows/cpp/bin/Insomnia.ndll
diff --git a/Server/export/windows/cpp/bin/SkullRushServer.exe b/Server/export/windows/cpp/bin/SkullRushServer.exe
diff --git a/Server/export/windows/cpp/bin/config.txt b/Server/export/windows/cpp/bin/config.txt
@@ -1,4 +1,4 @@
-version=0.3.1
+version=0.3.4
 
 ############################
 

diff --git a/Server/export/windows/cpp/bin/shared/images/playerblue2.png b/Server/export/windows/cpp/bin/shared/images/playerblue2.png
diff --git a/Server/export/windows/cpp/bin/shared/images/playergreen2.png b/Server/export/windows/cpp/bin/shared/images/playergreen2.png
diff --git a/Server/export/windows/cpp/bin/shared/images/playerred2.png b/Server/export/windows/cpp/bin/shared/images/playerred2.png
diff --git a/Server/export/windows/cpp/bin/shared/images/playeryellow2.png b/Server/export/windows/cpp/bin/shared/images/playeryellow2.png
diff --git a/Server/source/Admin.hx b/Server/source/Admin.hx
@@ -1,6 +1,7 @@
 package ;
 import enet.ENet;
 import flixel.FlxG;
+import flixel.util.FlxTimer;
 import gevents.ConfigEvent;
 import networkobj.NReg;
 
@@ -77,6 +78,7 @@ class Admin
 
 	public static function reloadMap():Void
 	{
+		FlxTimer.manager.clear();
 		Reg.reLaunch();
 	}
 

diff --git a/Server/source/InitState.hx b/Server/source/InitState.hx
@@ -71,7 +71,7 @@ class InitState extends FlxState
 
 		//Make trace also write to flixel's debugger's log
 		old_trace = Log.trace;
-		//Log.trace = new_trace;
+		Log.trace = new_trace;
 
 		//Setup networking
 		Reg.maps = Reg.parseMaps();

diff --git a/Server/source/PlayState.hx b/Server/source/PlayState.hx
@@ -36,6 +36,7 @@ import gamemodes.FFA;
 import gevents.GenEvent;
 import gevents.InitEvent;
 import gevents.SetTeamEvent;
+import insomnia.Insomnia;
 import sys.io.File;
 import gevents.ConfigEvent;
 import haxe.Serializer;
@@ -130,6 +131,9 @@ class PlayState extends FlxState
 		Thread.create(thread);
 
 		Admin.hookCommands();
+
+		Insomnia.preventSleep();
+		Insomnia.setProcessPriority(Insomnia.P_REALTIME_PRIORITY_CLASS);
 	}
 
 	public function loadMap(Name:String):Void
@@ -217,6 +221,11 @@ class PlayState extends FlxState
 		}
 	}
 
+	override public function draw():Void 
+	{
+		//super.draw();
+	}
+
 	/**
 	 * Function that is called once every frame.
 	 */

diff --git a/Server/source/Player.hx b/Server/source/Player.hx
@@ -269,10 +269,8 @@ class Player extends PlayerBase
 
 			if (move_jump) //jump
 			{
-				//trace("jumping");
 				if (isTouching(FlxObject.ANY) && canJump)
 				{
-					//trace(_arr[2]);
 					velocity.y = -280;
 					canJump = false;
 				}

diff --git a/Server/source/SkullServer.hx b/Server/source/SkullServer.hx
@@ -74,7 +74,6 @@ class SkullServer extends Server
 		//var b = Bytes.alloc(80);
 		//s.receive(b);
 		//var msg:String = new BytesInput(b).readUntil(0);
-		//if (msg.length > 0) trace("Msg: ", msg);
 		//
 		//if (msg == "get_info")
 		//{
@@ -89,7 +88,6 @@ class SkullServer extends Server
 			//info += '$players_max, ';
 			//info += '"$internal_ip"';
 			//info += ']';
-			//trace("Info: ", info);
 			//
 			//s.sendAll(Bytes.ofString(info));
 		//}

diff --git a/Server/source/gamemodes/DefaultHooks.hx b/Server/source/gamemodes/DefaultHooks.hx
@@ -263,7 +263,7 @@ class DefaultHooks
 	{
 		var e:ENetEvent = E.leaveinfo;
 
-		trace("Peer disconnected! ID: ", e.ID);
+		trace("Peer disconnected! ID: " + Std.string(e.ID));
 
 		var p:Player = Reg.server.playermap.get(e.ID);
 
@@ -359,7 +359,7 @@ class DefaultHooks
 	static public function onPeerConnect(e:JoinEvent):Void
 	{
 		var E:ENetEvent = e.joininfo;
-		trace("Peer connected. ID: ", E.ID);
+		trace("Peer connected. ID: " + Std.string(E.ID));
 		var name:String = Msg.PlayerInfo.data.get("name");
 		name = StringTools.trim(name);
 		if (name.length > 15) name = name.substr(0, 15);

diff --git a/Server/source/networkobj/NEmitter.hx b/Server/source/networkobj/NEmitter.hx
@@ -142,7 +142,7 @@ class NEmitter
 	static public function stopEmitter(Handle:Int):Void
 	{
 		var e:FlxEmitterAuto = live_emitters.get(Handle);
-		//trace(e);
+
 		if (e != null)
 		{
 			Msg.EmitterDelete.data.set("id", Handle);

diff --git a/Server/source/networkobj/NWeapon.hx b/Server/source/networkobj/NWeapon.hx
@@ -171,13 +171,11 @@ class NWeapon
 	static public function announceWeapons(player:Int = 0):Void
 	{
 		var map:Map<Int, Dynamic> = new Map<Int, Dynamic>();
-		//trace(array);
+
 		for (slot in NWeapon.weapons.keys())
 		{
-			//trace("trace");
 			var arr:Array<Dynamic> = [];
 			var w:NWeapon = cast NWeapon.weapons.get(slot);
-			//trace("Wep:", w);
 
 			arr.push(w.bulletElasticity);
 			arr.push(w.bulletLifeSpan);
@@ -201,7 +199,7 @@ class NWeapon
 
 			map.set(slot, arr);
 		}
-		//trace(array);
+
 		Msg.AnnounceGuns.data.set("serialized", Serializer.run(map));
 
 		if (player == 0)

diff --git a/Server/source/weapons/Launcher.hx b/Server/source/weapons/Launcher.hx
@@ -2,6 +2,7 @@ package weapons;
 import flixel.addons.weapon.FlxBullet;
 import flixel.effects.particles.FlxEmitter;
 import flixel.effects.particles.FlxEmitterExt;
+import flixel.tile.FlxTilemap;
 import flixel.util.FlxAngle;
 import flixel.util.FlxMath;
 import flixel.util.FlxPoint;
@@ -76,7 +77,25 @@ class Launcher extends NWeapon
 
 				v.rotateByRadians(FlxAngle.angleBetween(Bullet, pl));
 
-				if (Reg.state.collidemap.ray(Bullet.getMidpoint(), pl.getMidpoint()))
+				var no_collision:Bool = true;
+				for (m in Reg.state.maps.members.iterator())
+				{
+					var map:FlxTilemap = cast m;
+
+					try
+					{
+						if (!map.ray(Bullet.getMidpoint(), pl.getMidpoint()))
+						{
+							no_collision = false;
+						}
+					}
+					catch (e:Dynamic)
+					{
+
+					}
+				}
+
+				if (no_collision)
 				{
 					var dist_coeff:Float = (100 - FlxMath.distanceBetween(pl, Bullet)) / 100;
 					if (dist_coeff < 0) dist_coeff = 0;

diff --git a/Shared/code/PlayerBase.hx b/Shared/code/PlayerBase.hx
@@ -350,7 +350,6 @@ class PlayerBase extends FlxSprite
 		{
 			if (grantedWeps.exists(GunID))
 			{
-				//trace(GunID);
 				if (grantedWeps.get(GunID) == true)
 				{
 					var g:FlxWeaponExt = guns_arr[GunID - 1];
@@ -371,7 +370,6 @@ class PlayerBase extends FlxSprite
 							canChange = false;
 							weap_change_timer.reset(0.3);
 
-							//trace(current_weap);
 						}
 					}
 				}
@@ -397,9 +395,7 @@ class PlayerBase extends FlxSprite
 		_arr.push(dash_left);
 		_arr.push(dash_right);
 		_arr.push(current_weap);
-		//trace(current_weap);
 
-		//trace(cannon.nextFire - FlxG.game.ticks);
 		_arr.push(cannon.nextFire - FlxG.game.ticks);
 		_arr.push(last_shot.template.slot - 1);
 
@@ -505,16 +501,13 @@ class PlayerBase extends FlxSprite
 
 			if (move_jump) //jump
 			{
-				//trace("jumping");
 				if (isTouching(FlxObject.ANY))
 				{
-					//trace(_arr[2]);
 					velocity.y = -280;
 				}
 
 				else
 				{
-					//trace("not jumping");
 					move_jump = false;
 				}
 			}

diff --git a/Shared/code/enet/Message.hx b/Shared/code/enet/Message.hx
@@ -73,7 +73,6 @@ class Message
 		}
 
 		res += Serializer.run(_arr);
-		//trace(res);
 		return res;
 	}
 
@@ -91,7 +90,7 @@ class Message
 		for (f in fields)
 		{
 			data.set(f, _arr[x]);
-			//trace(_arr[x]);
+
 			x++;
 		}
 	}