added versions

4 files changed, 16 insertions, 2 deletions

diff --git a/src/client.cpp b/src/client.cpp
index 3332a630..df5fec16 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -15,6 +15,8 @@
 
 #include "lzw.h"
 
+#include "versions.h"
+
 using namespace baselib;
 
 // --- string handling (MOVE THESE!!) ---
@@ -220,7 +222,7 @@ public:
 		recived_snapshots = 0;
 		
 		packet p(NETMSG_CLIENT_CONNECT);
-		p.write_str("dev v1", 32); // payload
+		p.write_str(TEEWARS_NETVERSION, 32); // payload
 		p.write_str(name,MAX_NAME_LENGTH);
 		p.write_str("no clan", MAX_CLANNAME_LENGTH);
 		p.write_str("password", 32);
diff --git a/src/menu.cpp b/src/menu.cpp
index b5e6c0eb..b5794194 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -7,6 +7,7 @@
 
 #include "interface.h"
 #include "ui.h"
+#include "versions.h"
 
 #include "game/mapres_image.h"
 #include "game/mapres_tilemap.h"
@@ -478,6 +479,8 @@ static int menu_render(netaddr4 *server_address, char *str, int max_len)
 	if (ui_do_button(&quit_button, "", 0, 290, 250, 69, 25, draw_menu_button, &quit_button))
 		return -1;
 
+	ui_do_label(10.0f, 300.0f-20.0f, "Version: " TEEWARS_VERSION);
+	
 	return 0;
 }
 
diff --git a/src/server.cpp b/src/server.cpp
index 9783ac5e..0d4a293c 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -12,6 +12,8 @@
 
 #include "lzw.h"
 
+#include "versions.h"
+
 namespace baselib {}
 using namespace baselib;
 
@@ -472,7 +474,12 @@ public:
 			
 			if(p->is_good())
 			{
-				// TODO: check version
+				// check version
+				if(strncmp(version, TEEWARS_NETVERSION, 32) != 0)
+				{
+					// TODO: send error
+					return;
+				}
 				
 				// look for empty slot, linear search
 				int id = -1;
diff --git a/src/versions.h b/src/versions.h
new file mode 100644
index 00000000..64da211c
--- /dev/null
+++ b/src/versions.h
@@ -0,0 +1,2 @@
+#define TEEWARS_NETVERSION "dev v1"
+#define TEEWARS_VERSION "0.1.1"