gmueller/gremlin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more oo design

Browse Source
This commit is contained in:
gmueller
2011-01-18 22:50:24 +01:00
parent 1d0dd12b2e
commit b55b687cd9
4 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/client/Client.cpp
View File

@@ -62,7 +62,7 @@ void setup_opengl() {
glfwSwapInterval(0);
}
void draw_team(team_t *team) {
void draw_team(Team *team) {
size_t i = 0;
glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, team->color);
glMatrixMode( GL_MODELVIEW);
@@ -372,7 +372,7 @@ void Client::initialize(Arguments &arg) {
gluQuadricTexture(quadratic, GL_TRUE);
if (isMaster()) {
team_t *team = game.getTeam(0);
Team *team = game.getTeam(0);
game.local_player = game.spawn_player(team);
}
@@ -448,8 +448,8 @@ void Client::update() {
glEnable( GL_LIGHTING);
glEnable( GL_CULL_FACE);
glDisable( GL_TEXTURE_2D);
for (size_t i = 0; i < GAME_TEAM_COUNT; i++)
draw_team(&game.team[i]);
for (size_t i = 0; i < game.teams.size(); i++)
draw_team(&game.teams[i]);
for (size_t i = 0; i < GAME_PLAYER_COUNT; i++)
draw_player(&game.player[i]);
@@ -476,12 +476,12 @@ void Client::update() {
}
for (size_t i = 0; i < GAME_TEAM_COUNT; i++) {
for (size_t i = 0; i < game.teams.size(); i++) {
std::stringstream sstr;
if (game.local_player && &game.team[i] == game.local_player->team) {
sstr << "Team " << i << " (yours) : " << game.team[i].points;
if (game.local_player && &game.teams[i] == game.local_player->team) {
sstr << "Team " << i << " (yours) : " << game.teams[i].points;
} else {
sstr << "Team " << i << " (other) : " << game.team[i].points;
sstr << "Team " << i << " (other) : " << game.teams[i].points;
}
oglf_print(&font, 10, 25 * fy++, sstr.str().c_str());
}