updated with new Onyx version

diff --git a/onyx-pkg.ini b/onyx-pkg.ini
index a0f136c123ca1192aa55979a349c458b4bf7b927..dbce31437b4c8658ac405ac338bf236e39ecf1d2 100644 (file)
--- a/onyx-pkg.ini
+++ b/onyx-pkg.ini
@@ -1,20 +1,14 @@
 [metadata]
 name=voxel-shooter
 description=Ace Of Spades style shooter game
 [metadata]
 name=voxel-shooter
 description=Ace Of Spades style shooter game

-url=

 author=Brendan Hansen
 version=0.0.1
 
 [config]
 lib_source_directory=./lib
 lib_bin_directory=./run_tree/lib
 author=Brendan Hansen
 version=0.0.1
 
 [config]
 lib_source_directory=./lib
 lib_bin_directory=./run_tree/lib

-run_cmd=
-debug_cmd=
-test_cmd=

 
 [native_library]
 
 [native_library]

-build_cmd=
-library=

 
 [dependencies]
 git://onyxlang.io/repo/onyx-net=0.0.7
 
 [dependencies]
 git://onyxlang.io/repo/onyx-net=0.0.7

diff --git a/run_tree/run.sh b/run_tree/run.sh
index 47e6fbe40f212e5246648ee0f806ce67a196fd04..6a67e228ccf495bab9109f1bb525b81545cc7e35 100755 (executable)
--- a/run_tree/run.sh
+++ b/run_tree/run.sh
@@ -1,6 +1,6 @@
 
 case "$1" in
 
 case "$1" in

-    build) onyx build -V build -I ../src/client -o game.wasm $@ ;;
+    build) onyx build -V build -I ../src/client -o game.wasm --tag $@ ;;

     watch) onyx watch build.onyx -I ../src/client ;;
     debug) onyx run --debug game.wasm ;;
     *)     onyx run game.wasm ;;
     watch) onyx watch build.onyx -I ../src/client ;;
     debug) onyx run --debug game.wasm ;;
     *)     onyx run game.wasm ;;

diff --git a/src/client/build.onyx b/src/client/build.onyx
index 5fc9521dee108205394d93228544cdf61d24f89c..1757b26c03001a663b9178d2349559fc981946e6 100644 (file)
--- a/src/client/build.onyx
+++ b/src/client/build.onyx
@@ -2,7 +2,7 @@
 #library_path "./lib"
 
 // Primary source files
 #library_path "./lib"
 
 // Primary source files

-#load "./../src/config"
+#load "./../config"

 
 #load_all "./."
 #load_all "./gfx"
 
 #load_all "./."
 #load_all "./gfx"


@@ -14,4 +14,4 @@
 #load_all "./../shared"
 
 // Onyx modules
 #load_all "./../shared"
 
 // Onyx modules

-#load "./../lib/packages"
+#load "./../../lib/packages"

diff --git a/src/client/net/net.onyx b/src/client/net/net.onyx
index a984d025a4da717e6c9917a97e2c8f5d74a9fa47..e537bd0bff8cd6687d20764df233d9a13beae1e2 100644 (file)
--- a/src/client/net/net.onyx
+++ b/src/client/net/net.onyx
@@ -56,8 +56,9 @@ Packet_Handler :: struct {
 
 #local handle_packet :: (packet_data: [] u8) {
     packet := cast(^packets.Packet_Base) packet_data.data;
 
 #local handle_packet :: (packet_data: [] u8) {
     packet := cast(^packets.Packet_Base) packet_data.data;

-    if packet_handles[~~ packet.type] != null_proc {
-        packet_handles[~~ packet.type](packet);
+    handler := packet_handles[~~ packet.type] ?? null_proc;
+    if handler != null_proc {
+        handler(packet);

     }
 }
 
     }
 }