diff --git a/Client/export/windows/cpp/bin/SkullRush.exe b/Client/export/windows/cpp/bin/SkullRush.exe
index 1468fb5..dd1de19 100644
Binary files a/Client/export/windows/cpp/bin/SkullRush.exe and b/Client/export/windows/cpp/bin/SkullRush.exe differ
diff --git a/Client/export/windows/cpp/bin/config.txt b/Client/export/windows/cpp/bin/config.txt
index acef89f..1339773 100644
--- 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
index 8c7e813..bfe09fd 100644
Binary files a/Client/export/windows/cpp/bin/lime.ndll and b/Client/export/windows/cpp/bin/lime.ndll differ
diff --git a/Client/source/PreGame.hx b/Client/source/PreGame.hx
index b96263c..5a564ad 100644
--- 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
index 4c36de0..4b4cd16 100644
--- 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
index c75a2d4..5b5d8c8 100644
--- a/Server/assets/maps/ProjectDef.oep
+++ b/Server/assets/maps/ProjectDef.oep
@@ -181,5 +181,20 @@
+
+
+ 64
+ 64
+
+
+ 0
+ 0
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Server/export/windows/cpp/bin/SkullRushServer.exe b/Server/export/windows/cpp/bin/SkullRushServer.exe
index 0ed6b37..20af692 100644
Binary files a/Server/export/windows/cpp/bin/SkullRushServer.exe and b/Server/export/windows/cpp/bin/SkullRushServer.exe differ
diff --git a/Server/export/windows/cpp/bin/assets/maps/ProjectDef.oep b/Server/export/windows/cpp/bin/assets/maps/ProjectDef.oep
index c75a2d4..5b5d8c8 100644
--- a/Server/export/windows/cpp/bin/assets/maps/ProjectDef.oep
+++ b/Server/export/windows/cpp/bin/assets/maps/ProjectDef.oep
@@ -181,5 +181,20 @@
+
+
+ 64
+ 64
+
+
+ 0
+ 0
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Server/export/windows/cpp/bin/config.txt b/Server/export/windows/cpp/bin/config.txt
index 3f69f58..e06ec42 100644
--- 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
index 8c7e813..bfe09fd 100644
Binary files a/Server/export/windows/cpp/bin/lime.ndll and b/Server/export/windows/cpp/bin/lime.ndll differ
diff --git a/Server/source/PlayState.hx b/Server/source/PlayState.hx
index 866a72c..18f5a19 100644
--- 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
index 1898304..89b48a0 100644
--- 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);
}