0.3.8: Changed server process priority to "high" instead of "realtime…

…", and fixed a crash issue (client-side) upon map change.
Ohmnivore · Jul 6, 2014 · b10cbda · b10cbda
1 parent a47bf56
commit b10cbda
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 5 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.7
+version=0.3.8
 name=NOOB
 team=1
 ip=

diff --git a/Client/export/windows/cpp/bin/lime.ndll b/Client/export/windows/cpp/bin/lime.ndll
diff --git a/Client/source/PreGame.hx b/Client/source/PreGame.hx
@@ -55,6 +55,8 @@ class PreGame extends FlxState
 		Reg.client.send(Msg.PlayerInfo.ID, 1, ENet.ENET_PACKET_FLAG_RELIABLE);
 
 		myTrace("Sending player info to server.");
+
+		Reg.pre_state = null;
 	}
 
 	public function downloadError(e:LoaderErrorType):Void

diff --git a/Client/source/SkullClient.hx b/Client/source/SkullClient.hx
@@ -162,7 +162,8 @@ class SkullClient extends Client
 				//FlxG.switchState(new PlayState());
 			//Reg.state.loadMap(Msg.MapMsg.data.get("mapname"), Msg.MapMsg.data.get("mapstring"));
 			//trace(Msg.MapMsg.data.get("mapstring"));
-			Reg.pre_state.myTrace("Received map file!");
+			if (Reg.pre_state != null)
+				Reg.pre_state.myTrace("Received map file!");
 			SkullClient.execute = false;
 			FlxG.switchState(new PlayState(Msg.MapMsg.data.get("mapstring")));
 		}

diff --git a/Server/assets/maps/ProjectDef.oep b/Server/assets/maps/ProjectDef.oep
@@ -181,5 +181,20 @@
       <ValueDefinitions />
       <NodesDefinition Enabled="false" Limit="-1" DrawMode="None" Ghost="false" />
     </EntityDefinition>
+    <EntityDefinition Name="TriggerArea" Limit="-1" ResizableX="true" ResizableY="true" Rotatable="false" RotateIncrement="15">
+      <Size>
+        <Width>64</Width>
+        <Height>64</Height>
+      </Size>
+      <Origin>
+        <X>0</X>
+        <Y>0</Y>
+      </Origin>
+      <ImageDefinition DrawMode="Rectangle" ImagePath="" Tiled="false">
+        <RectColor A="255" R="255" G="0" B="0" />
+      </ImageDefinition>
+      <ValueDefinitions />
+      <NodesDefinition Enabled="true" Limit="-1" DrawMode="Fan" Ghost="false" />
+    </EntityDefinition>
   </EntityDefinitions>
 </project>
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/ProjectDef.oep b/Server/export/windows/cpp/bin/assets/maps/ProjectDef.oep
@@ -181,5 +181,20 @@
       <ValueDefinitions />
       <NodesDefinition Enabled="false" Limit="-1" DrawMode="None" Ghost="false" />
     </EntityDefinition>
+    <EntityDefinition Name="TriggerArea" Limit="-1" ResizableX="true" ResizableY="true" Rotatable="false" RotateIncrement="15">
+      <Size>
+        <Width>64</Width>
+        <Height>64</Height>
+      </Size>
+      <Origin>
+        <X>0</X>
+        <Y>0</Y>
+      </Origin>
+      <ImageDefinition DrawMode="Rectangle" ImagePath="" Tiled="false">
+        <RectColor A="255" R="255" G="0" B="0" />
+      </ImageDefinition>
+      <ValueDefinitions />
+      <NodesDefinition Enabled="true" Limit="-1" DrawMode="Fan" Ghost="false" />
+    </EntityDefinition>
   </EntityDefinitions>
 </project>
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.7
+version=0.3.8
 
 ############################
 

diff --git a/Server/export/windows/cpp/bin/lime.ndll b/Server/export/windows/cpp/bin/lime.ndll
diff --git a/Server/source/PlayState.hx b/Server/source/PlayState.hx
@@ -133,7 +133,7 @@ class PlayState extends FlxState
 		Admin.hookCommands();
 
 		Insomnia.preventSleep();
-		Insomnia.setProcessPriority(Insomnia.P_REALTIME_PRIORITY_CLASS);
+		Insomnia.setProcessPriority(Insomnia.P_HIGH_PRIORITY_CLASS);
 	}
 
 	public function loadMap(Name:String):Void

diff --git a/Shared/code/OgmoLoader.hx b/Shared/code/OgmoLoader.hx
@@ -74,7 +74,6 @@ class OgmoLoader
 				var map:FlxTilemap = new FlxTilemap();
 				map.loadMap(x.innerData, ArtifactFix.artefactFix(Assets.getImg(x.att.tileset), 16, 16), 16, 16, 0, 0, 0, 0);
 				State.maps.add(map);
-				//map.pixelPerfectRender = false;
 
 				interpretData(td, map);
 			}