From b44b2cb4c16995d218e8d4c767c01c7b87c89816 Mon Sep 17 00:00:00 2001 From: Jon Bergli Heier Date: Sun, 12 Jun 2011 20:31:26 +0200 Subject: Minor changes to work with the reworked message classes. --- common | 2 +- game.cpp | 22 ++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/common b/common index 1f97ccd..e483f46 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 1f97ccdac792c0b5b07972e7d4b2f28416046ea8 +Subproject commit e483f468085379a986cbc48bb13a7983315475cf diff --git a/game.cpp b/game.cpp index 3f4216d..d198720 100644 --- a/game.cpp +++ b/game.cpp @@ -40,7 +40,7 @@ void Game::run(const std::string host, const std::string port) { unsigned int last = SDL_GetTicks(); while(scene->running) { if(SDL_GetTicks() - last >= 1000) { - message::Pos pos(scene->pos.x, scene->pos.y, scene->pos.z); + message::Pos pos(scene->pos); pos.send(socket); last = SDL_GetTicks(); } @@ -88,13 +88,10 @@ void Game::handle_type(const boost::system::error_code& error, std::size_t bytes void Game::handle_chunk() { message::Chunk m; - // coords - m.read(socket); + m.recv(socket); int64_t x, y; m.get_coords(x, y); - // data - m.read(socket); float *data = m.get_data(); scene->terrain->tc->add_chunk(data, x, y, Terrain::chunk_size_total, Terrain::chunk_size_total); @@ -110,10 +107,7 @@ void Game::handle_chunk() { void Game::handle_message() { message::Message m; - m.read(socket); - m.get_len(); - - m.read(socket); + m.recv(socket); std::string s = m.get_str(); scene->chat->add_line(s); @@ -122,15 +116,11 @@ void Game::handle_message() { void Game::handle_player() { message::Player m; - m.read(socket); + m.recv(socket); + uint32_t id = m.get_id(); Vector3 pos(m.get_pos()); - m.get_len(); - - // fetching string - m.read(socket); - - std::string name = m.get_str(); + std::string name = m.get_name(); scene->players.push_back(Player::p(new Player(id, pos, name))); } -- cgit v1.2.3