Update dependencies

critical snap bug
evolutionleo · Dec 1, 2020 · 4b32d03 · 4b32d03
1 parent 391122e
commit 4b32d03
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 24 deletions.
diff --git a/EmptyClient/EmptyClient.yyp b/EmptyClient/EmptyClient.yyp
diff --git a/EmptyClient/notes/ProjectStructure/ProjectStructure.txt b/EmptyClient/notes/ProjectStructure/ProjectStructure.txt
@@ -13,7 +13,7 @@ Here's how the project's organized
 TL;DR:
 - handle input in HandlePacket() script
 - handle output using network_write()
-- change ip/port in __NetworkingConfig
+- change ip/port in __NetworkingConfig (or input it in-game)
 - don't worry about internal stuff
 
 - best practice would to define all your

diff --git a/EmptyClient/objects/oClient/Create_0.gml b/EmptyClient/objects/oClient/Create_0.gml
@@ -7,6 +7,7 @@ socket = network_create_socket(network_socket_tcp)
 network_connect_raw_async(socket, IP, real(PORT));
 
 // This can be used to initiate the server interaction
+// (send the first packet)
 onConnect = function() {
 	sendHello()
 	sendHello2()

diff --git a/EmptyClient/options/windows/options_windows.yy b/EmptyClient/options/windows/options_windows.yy
diff --git a/EmptyClient/scripts/HandlePacket/HandlePacket.gml b/EmptyClient/scripts/HandlePacket/HandlePacket.gml
@@ -1,6 +1,6 @@
 function handlePacket(pack) {
-	var data = snap_from_messagepack(pack) // Deserialize msgpack into a struct
-	var cmd = string_lower(data.cmd) // you can get rid of this, 
+	var data = snap_from_messagepack(pack)	// Deserialize/unpack msgpack into a struct
+	var cmd = string_lower(data.cmd) // you can get rid of this line, 
 									 // i just like the commands being lowercase
 
 	trace("Received cmd: %", cmd)
@@ -15,7 +15,7 @@ function handlePacket(pack) {
 			trace(data.str)
 			break
 		case "message":
-			show_message_async(data.msg)
+			show_message_async(data.msg+"\n (c) Server")
 			break
 		// Add your custom commands here:
 

diff --git a/EmptyClient/scripts/__NetworkingConfig/__NetworkingConfig.gml b/EmptyClient/scripts/__NetworkingConfig/__NetworkingConfig.gml
@@ -5,7 +5,7 @@
 //#macro PORT "1337"
 
 // Debug
-#macro IP   "127.0.0.1"
+#macro IP   "127.0.0.1" // localhost
 #macro PORT "1338"
 
 // Allow up to 4000 ping (YYG recommends ~1000 for LAN-only games)

diff --git a/EmptyClient/scripts/snap_to_messagepack/snap_to_messagepack.gml b/EmptyClient/scripts/snap_to_messagepack/snap_to_messagepack.gml
@@ -4,7 +4,7 @@
 /// 
 /// @param struct/array   The data to be encoded. Can contain structs, arrays, strings, and numbers.   N.B. Will not encode ds_list, ds_map etc.
 /// 
-/// @jujuadams 2020-09-13
+/// @jujuadams 2020-11-06
 
 //In the general case, functions/methods cannot be deserialised so we default to preventing their serialisation to begin with
 //If you'd like to throw an error whenever this function tries to serialise a function/method, set SNAP_MESSAGEPACK_SERIALISE_FUNCTION_NAMES to -1
@@ -199,17 +199,17 @@ function __snap_to_messagepack_parser(_ds) constructor
                 else if (_value <= 0xffff)
                 {
                     buffer_write(buffer, buffer_u8, 0xcd);
-                    buffer_write_little(buffer_u8, _value);
+                    buffer_write_little(buffer_u16, _value);
                 }
                 else if (_value <= 0xffffffff)
                 {
                     buffer_write(buffer, buffer_u8, 0xce);
-                    buffer_write_little(buffer_u8, _value);
+                    buffer_write_little(buffer_u32, _value);
                 }
                 else
                 {
                     buffer_write(buffer, buffer_u8, 0xcf);
-                    buffer_write_little(buffer_u8, _value);
+                    buffer_write_little(buffer_u64, _value);
                 }
             }
             else if (_value == 0)
@@ -235,18 +235,18 @@ function __snap_to_messagepack_parser(_ds) constructor
                 else if (_value <= 0xffff)
                 {
                     buffer_write(buffer, buffer_u8, 0xd1);
-                    buffer_write_little(buffer_u8, _value);
+                    buffer_write_little(buffer_u16, _value);
                 }
                 else if (_value <= 0xffffffff)
                 {
                     buffer_write(buffer, buffer_u8, 0xd2);
-                    buffer_write_little(buffer_u8, _value);
+                    buffer_write_little(buffer_u32, _value);
                 }
                 else
                 {
                     //!!! No signed 64-bit integer read in GameMaker so this might be redundant
                     buffer_write(buffer, buffer_u8, 0xd3);
-                    buffer_write_little(buffer_u8, _value);
+                    buffer_write_little(buffer_u64, _value);
                 }
             }
         }

diff --git a/Release/EmptyServer.zip b/Release/EmptyServer.zip
diff --git a/Release/OnlineFramework.yymps b/Release/OnlineFramework.yymps
diff --git a/desktop.ini b/desktop.ini
@@ -0,0 +1,2 @@
+[LocalizedFileNames]
+OnlineFramework.yymps[email protected],0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[LocalizedFileNames]
		OnlineFramework.yymps[email protected],0