diff --git a/client/scenes/lobby_menu.cpp b/client/scenes/lobby_menu.cpp index 3954c26..7c8e385 100644 --- a/client/scenes/lobby_menu.cpp +++ b/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 - ClientPacket packet; - packet.type = SerialPacketType::BROADCAST_REQUEST; - network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet); + //broadcast to the home server, and to the LAN + ClientPacket packet; - //reset the server list - serverVector.clear(); - selection = nullptr; + packet.type = SerialPacketType::BROADCAST_REQUEST; + network.SendTo(config["server.home"].c_str(), config.Int("server.port"), &packet); + network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet); + + //reset the server list + serverVector.clear(); + selection = nullptr; } void LobbyMenu::SendJoinRequest() { diff --git a/makefile b/makefile index d296d33..7e5efca 100644 --- a/makefile +++ b/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 diff --git a/rsc/config.cfg b/rsc/config.cfg index 51c528b..1c2d90d 100644 --- a/rsc/config.cfg +++ b/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 diff --git a/todo.txt b/todo.txt index 5fc5c6d..5d5b6db 100644 --- a/todo.txt +++ b/todo.txt @@ -22,4 +22,5 @@ TODO: Fix the const-ness of accessors 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 \ No newline at end of file +TODO: Better collision logic +TODO: cleaner shutdowns \ No newline at end of file