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

handle menu choices in run()

Browse Source
This commit is contained in:
Josh Holtrop 2012-11-04 00:46:20 -04:00
parent f10bd59226
commit 9414c30773
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/client/Client.cc
View File

@ -1,7 +1,6 @@
#include <math.h> #include <math.h>
#include "Client.h" #include "Client.h"
#include "Types.h" #include "Types.h"
#include <SFGUI/SFGUI.hpp>
/* 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
@ -94,7 +93,22 @@ void Client::run(bool fullscreen, int width, int height, std::string pname)
m_clock.restart(); m_clock.restart();
recenter_cursor(); recenter_cursor();
bool in_game = true;
while (in_game)
{
run_main_menu(); run_main_menu();
switch (m_menu_action)
{
case MAIN_MENU_SINGLE:
start_server();
run_client();
stop_server();
break;
case MAIN_MENU_EXIT:
in_game = false;
break;
}
}
} }
void Client::play_single_player_game_button_clicked() void Client::play_single_player_game_button_clicked()
@ -113,7 +127,6 @@ void Client::run_main_menu()
m_window->resetGLStates(); m_window->resetGLStates();
m_menu_action = MAIN_MENU_NONE; m_menu_action = MAIN_MENU_NONE;
sfg::SFGUI sfgui;
sfg::Box::Ptr box = sfg::Box::Create(sfg::Box::VERTICAL, 10.0f); sfg::Box::Ptr box = sfg::Box::Create(sfg::Box::VERTICAL, 10.0f);
sfg::Button::Ptr btn_singleplayer = sfg::Button::Ptr btn_singleplayer =
sfg::Button::Create("Play Single Player Game"); sfg::Button::Create("Play Single Player Game");
@ -177,24 +190,11 @@ void Client::run_main_menu()
desktop.Update(m_clock.restart().asSeconds()); desktop.Update(m_clock.restart().asSeconds());
m_window->clear(); m_window->clear();
sfgui.Display(*m_window); m_sfgui.Display(*m_window);
m_window->display(); m_window->display();
if (m_menu_action != MAIN_MENU_NONE) if (m_menu_action != MAIN_MENU_NONE)
{
switch (m_menu_action)
{
case MAIN_MENU_SINGLE:
start_server();
run_client();
m_window->resetGLStates();
break; break;
case MAIN_MENU_EXIT:
in_menu = false;
break;
}
m_menu_action = MAIN_MENU_NONE;
}
} }
} }
@ -203,6 +203,11 @@ void Client::start_server()
/* TODO */ /* TODO */
} }
void Client::stop_server()
{
/* TODO */
}
void Client::run_client() void Client::run_client()
{ {
m_window->setMouseCursorVisible(false); m_window->setMouseCursorVisible(false);

3
src/client/Client.h
View File

@ -14,6 +14,7 @@
#include "GLMatrix.h" #include "GLMatrix.h"
#include "GLBuffer.h" #include "GLBuffer.h"
#include "Network.h" #include "Network.h"
#include <SFGUI/SFGUI.hpp>
#define SHOT_RING_WIDTH 10.0f #define SHOT_RING_WIDTH 10.0f
@ -35,6 +36,7 @@ class Client
protected: protected:
void run_main_menu(); void run_main_menu();
void start_server(); void start_server();
void stop_server();
void run_client(); void run_client();
void connect(int port, const char *host); void connect(int port, const char *host);
void disconnect(); void disconnect();
@ -59,6 +61,7 @@ class Client
void play_single_player_game_button_clicked(); void play_single_player_game_button_clicked();
void exit_button_clicked(); void exit_button_clicked();
sfg::SFGUI m_sfgui;
int m_menu_action; int m_menu_action;
bool m_mouse_grabbed; bool m_mouse_grabbed;
double m_player_dir_x; double m_player_dir_x;