Merge branch 'hotfix' into CentOS7

client/scenes/lobby_menu.cpp

@@ -290,14 +290,16 @@ void LobbyMenu::HandleLoginRejection(TextPacket* const argPacket) {
 //-------------------------
 
 void LobbyMenu::SendBroadcastRequest() {
-	//broadcast to the network, or a specific server
+	//broadcast to the home server, and to the LAN
-		ClientPacket packet;
+	ClientPacket packet;
-		packet.type = SerialPacketType::BROADCAST_REQUEST;
-		network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
 
-		//reset the server list
+	packet.type = SerialPacketType::BROADCAST_REQUEST;
-		serverVector.clear();
+	network.SendTo(config["server.home"].c_str(), config.Int("server.port"), &packet);
-		selection = nullptr;
+	network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
+
+	//reset the server list
+	serverVector.clear();
+	selection = nullptr;
 }
 
 void LobbyMenu::SendJoinRequest() {

makefile

@@ -17,6 +17,9 @@ all: $(OUTDIR) dll
 debug: export CXXFLAGS+=-g
 debug: clean all
 
+ifeq ($(OS),Windows_NT)
+release: export CXXFLAGS+=-static-libgcc -static-libstdc++
+endif
 release: clean all package
 
 #For use on my machine ONLY

rsc/config.cfg

@@ -2,6 +2,7 @@
 #TODO: (9) split this file in two, one for each program
 
 #server specific settings
+server.home = island.krgamestudios.com
 server.host = 255.255.255.255
 server.port = 21795
 server.name = local

todo.txt

@@ -23,3 +23,4 @@ TODO: Add a screenshot of the game to README.md
 TODO: joystick/gamepad support
 TODO: add the tilesheet to the map system
 TODO: Better collision logic
+TODO: cleaner shutdowns