josh/treacherous-terrain
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

handle connect()/disconnect() logic when it is actually needed

Browse Source
This commit is contained in:
Josh Holtrop 2012-11-04 08:01:00 -05:00
parent d0e562c077
commit df2808afb9
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/client/Client.cc
View File

@ -13,30 +13,29 @@ using namespace std;
/* TODO: this should be moved to common somewhere */ /* TODO: this should be moved to common somewhere */
#define MAX_SHOT_DISTANCE 250.0 #define MAX_SHOT_DISTANCE 250.0
#define SHOT_EXPAND_SPEED 75.0 #define SHOT_EXPAND_SPEED 75.0
#define DEFAULT_PORT 59243
Client::Client(const string & exe_path) Client::Client(const string & exe_path)
{ {
connect(59243, "127.0.0.1"); // Just connect to local host for now - testing
m_client_has_focus = true; m_client_has_focus = true;
m_players.clear();
m_current_player = 0;
m_left_button_pressed = false;
m_drawing_shot = false;
m_shot_fired = false;
m_exe_path = exe_path; m_exe_path = exe_path;
m_server_pid = 0; m_server_pid = 0;
} }
Client::~Client() Client::~Client()
{ {
disconnect();
m_players.clear();
} }
void Client::connect(int port, const char *host) void Client::connect(int port, const char *host)
{ {
m_net_client = new Network(); m_net_client = new Network();
m_net_client->Create(port, host); m_net_client->Create(port, host);
m_players.clear();
m_current_player = 0;
m_left_button_pressed = false;
m_drawing_shot = false;
m_shot_fired = false;
m_map = Map();
} }
void Client::disconnect() void Client::disconnect()
@ -111,8 +110,10 @@ void Client::run(bool fullscreen, int width, int height, std::string pname)
{ {
case MAIN_MENU_SINGLE: case MAIN_MENU_SINGLE:
start_server(); start_server();
connect(DEFAULT_PORT, "127.0.0.1");
run_client(); run_client();
stop_server(); stop_server();
disconnect();
break; break;
case MAIN_MENU_EXIT: case MAIN_MENU_EXIT:
in_game = false; in_game = false;