From 89a4b6ffb2f0bfeef29aaaff8f4e2dbf5093570e Mon Sep 17 00:00:00 2001
From: gmueller <devnull@localhost>
Date: Sun, 23 Jan 2011 20:11:24 +0100
Subject: [PATCH] minor fixes

---
 src/client/Client.cpp  | 16 ++++++++--------
 src/common/Game.cpp    | 11 ++++++-----
 src/common/Game.h      |  4 ++--
 src/common/Network.cpp |  5 ++---
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index 2fcdd46..b4cb825 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -399,7 +399,7 @@ void Client::initialize(Arguments &arg) {
 
 	if (isMaster()) {
 		Team *team = game.getTeam(0);
-		game.local_player = game.spawn_player(team);
+		game.local_player = game.spawnPlayer(team);
 		std::cout << "[Game] local player " << game.local_player->id
 				<< std::endl;
 	}
@@ -479,17 +479,17 @@ void Client::update() {
 	glEnable( GL_LIGHTING);
 	glEnable( GL_CULL_FACE);
 	glDisable( GL_TEXTURE_2D);
-//	for (size_t i = 0; i < game.teams.size(); i++)
-//		draw_team(&game.teams[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++)
 		drawPlayer(&game.player[i]);
 
-//	for (size_t i = 0; i < GAME_BOMB_COUNT; i++)
-//		draw_bomb(&game.bomb[i]);
-//
-//	for (size_t i = 0; i < GAME_POINT_COUNT; i++)
-//		draw_point(&game.point[i]);
+	//	for (size_t i = 0; i < GAME_BOMB_COUNT; i++)
+	//		draw_bomb(&game.bomb[i]);
+	//
+	//	for (size_t i = 0; i < GAME_POINT_COUNT; i++)
+	//		draw_point(&game.point[i]);
 
 	drawLevel();
 
diff --git a/src/common/Game.cpp b/src/common/Game.cpp
index 4f69559..bd09a1a 100644
--- a/src/common/Game.cpp
+++ b/src/common/Game.cpp
@@ -102,6 +102,9 @@ void Game::loadLevelShape() {
 	levelMesh = tlLoadTrimesh("data/level.obj", TL_FVF_XYZ | TL_FVF_UV
 			| TL_FVF_NORMAL);
 
+	if (levelMesh == 0)
+		throw("level mesh not found! (data/level.obj)");
+
 	btIndexedMesh im;
 	im.m_numTriangles = levelMesh->face_count;
 	im.m_triangleIndexBase = (unsigned char *) levelMesh->faces;
@@ -120,8 +123,6 @@ void Game::loadLevelShape() {
 	btVector3 center;
 	btScalar radius;
 	_levelShape->getBoundingSphere(center, radius);
-	std::cout << center.x() << " " << center.y() << " " << center.y() << ", "
-			<< radius << std::endl;
 	levelShape.reset(_levelShape);
 }
 
@@ -218,7 +219,7 @@ player_t *Game::getFreePlayer() {
 	}
 }
 
-player_t *Game::spawn_player(Team *team) {
+player_t *Game::spawnPlayer(Team *team) {
 	player_t *player = getFreePlayer();
 	player->team = team;
 	player->status = 1;
@@ -226,7 +227,7 @@ player_t *Game::spawn_player(Team *team) {
 	reset_player(player);
 
 	if (player->body.get() == 0) {
-		std::cout << "Game::spawn_player: create body" << std::endl;
+		std::cout << "[Game] create body" << std::endl;
 		/// Create Dynamic Objects
 		btTransform startTransform;
 		startTransform.setIdentity();
@@ -245,7 +246,7 @@ player_t *Game::spawn_player(Team *team) {
 	return player;
 }
 
-player_t *Game::spawn_player_id(Team *team, uint16_t id) {
+player_t *Game::spawnPlayerWithId(Team *team, uint16_t id) {
 	player_t *player = getFreePlayer();
 	player->team = team;
 	player->id = id;
diff --git a/src/common/Game.h b/src/common/Game.h
index 5d2d831..fb4e79d 100644
--- a/src/common/Game.h
+++ b/src/common/Game.h
@@ -79,8 +79,8 @@ public:
 	void setup();
 	void reset();
 	Team *team_with_least_players();
-	player_t *spawn_player(Team *team);
-	player_t *spawn_player_id(Team *team, uint16_t id);
+	player_t *spawnPlayer(Team *team);
+	player_t *spawnPlayerWithId(Team *team, uint16_t id);
 	Team *getTeam(uint16_t id);
 	player_t *getPlayer(uint16_t id);
 	bomb_t *getBomb(uint16_t index);
diff --git a/src/common/Network.cpp b/src/common/Network.cpp
index 1690de8..221d134 100644
--- a/src/common/Network.cpp
+++ b/src/common/Network.cpp
@@ -114,7 +114,7 @@ void Network::dispatch(enet_uint8 *data, size_t length) {
 	case MESSAGE_PLAYER_SPAWN: {
 		player_spawn_message_t *sm = (player_spawn_message_t *) data;
 		Team *team = game->getTeam(sm->team_id);
-		player_t *player = game->spawn_player_id(team, sm->player_id);
+		player_t *player = game->spawnPlayerWithId(team, sm->player_id);
 		break;
 	}
 	case MESSAGE_PLAYER_KILL: {
@@ -132,7 +132,6 @@ void Network::dispatch(enet_uint8 *data, size_t length) {
 	}
 	case MESSAGE_PLAYER_UPDATE: {
 		player_update_message_t *um = (player_update_message_t *) data;
-		std::cout << "[Network] update player " << um->player_id << std::endl;
 		player_t *player = game->getPlayer(um->player_id);
 #if 1
 		btVector3 v = player->body->getLinearVelocity();
@@ -271,7 +270,7 @@ void Network::service(uint32_t timeout) {
 			}
 
 			Team *team = game->team_with_least_players();
-			player_t *player = game->spawn_player(team);
+			player_t *player = game->spawnPlayer(team);
 			event.peer->data = player;
 
 			// send player spawn message