Fixed laser bug (FlxTilemap.ray)

Ohmnivore · Ohmnivore · commit 2d167b367057 · 2014-11-23T13:04:18.000-05:00
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/assets/maps/TwinCapture.oel b/Server/export/windows/cpp/bin/assets/maps/TwinCapture.oel
@@ -343,5 +343,6 @@
     <JumpPad id="17" x="1616" y="736" angle="0" />
     <JumpPad id="18" x="1504" y="624" angle="180" />
     <JumpPad id="19" x="640" y="624" angle="180" />
+    <Laser id="20" x="192" y="464" angle="0" />
   </Entities>
 </level>
diff --git a/Server/export/windows/cpp/bin/config.txt b/Server/export/windows/cpp/bin/config.txt
@@ -13,7 +13,7 @@ crashdump=true
 manifesturl=null
 #https://dl.dropboxusercontent.com/u/229424261/skullrush/manifest.json
 
-maps=TileTest, TwinCapture, tele, TileTest, Test, CrateWorld, CaptureHell
+maps=tele, TwinCapture, TileTest, TileTest, Test, CrateWorld, CaptureHell
 
 masterserver=http://skullrush.elementfx.com/laravel/public/
 
diff --git a/Server/source/entities/Laser.hx b/Server/source/entities/Laser.hx
@@ -138,9 +138,16 @@ class LaserSprite extends NFlxSprite
 			
 			var res:FlxPoint = new FlxPoint();
 			
-			if (!map.ray(getMidpoint(), finalPoint, res))
+			try
 			{
-				finalPoint.copyFrom(res);
+				if (!map.ray(getMidpoint(), finalPoint, res))
+				{
+					finalPoint.copyFrom(res);
+				}
+			}
+			catch (e:Dynamic)
+			{
+				
 			}
 		}
 		

Original file line number	Diff line number	Diff line change
`@@ -138,9 +138,16 @@ class LaserSprite extends NFlxSprite`
`138`	`138`
`139`	`139`	`var res:FlxPoint = new FlxPoint();`
`140`	`140`
`141`		`- if (!map.ray(getMidpoint(), finalPoint, res))`
	`141`	`+ try`
`142`	`142`	`{`
`143`		`- finalPoint.copyFrom(res);`
	`143`	`+ if (!map.ray(getMidpoint(), finalPoint, res))`
	`144`	`+ {`
	`145`	`+ finalPoint.copyFrom(res);`
	`146`	`+ }`
	`147`	`+ }`
	`148`	`+ catch (e:Dynamic)`
	`149`	`+ {`
	`150`	`+`
`144`	`151`	`}`
`145`	`152`	`}`
`146`	`153`