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

add Client::create_shot(); only send one shot to server

Browse Source
This commit is contained in:
Josh Holtrop 2012-10-06 22:13:23 -04:00
parent 59b81aebe0
commit 69f403cee1
2 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/client/Client.cc
View File

@ -144,6 +144,7 @@ void Client::run(bool fullscreen, int width, int height, std::string pname)
m_drawing_shot = false; m_drawing_shot = false;
m_left_button_pressed = false; m_left_button_pressed = false;
m_shot_fired = true; m_shot_fired = true;
create_shot();
} }
break; break;
case sf::Event::Resized: case sf::Event::Resized:
@ -383,24 +384,6 @@ void Client::update(double elapsed_time)
player->d_pressed = d_pressed; player->d_pressed = d_pressed;
player->rel_mouse_movement = rel_mouse_movement; player->rel_mouse_movement = rel_mouse_movement;
} }
if(m_shot_fired)
{
float shot_distance = m_drawing_shot_distance + SHOT_RING_WIDTH / 2.0;
sf::Uint8 packet_type = PLAYER_SHOT;
client_packet.clear();
client_packet << packet_type;
client_packet << m_current_player;
client_packet << shot_distance;
m_net_client->sendData(client_packet, true);
m_drawing_shot_distance = 0;
player->m_shot_allowed = false;
refptr<Shot> shot = new Shot(
sf::Vector2f(player->x, player->y),
player->direction,
shot_distance);
m_shots.push_back(shot);
}
} }
else if(!registered_player) else if(!registered_player)
{ {
@ -424,3 +407,25 @@ void Client::update(double elapsed_time)
} }
m_net_client->Transmit(); m_net_client->Transmit();
} }
void Client::create_shot()
{
if (m_players.size() == 0)
return;
sf::Packet client_packet;
refptr<Player> player = m_players[m_current_player];
float shot_distance = m_drawing_shot_distance + SHOT_RING_WIDTH / 2.0;
sf::Uint8 packet_type = PLAYER_SHOT;
client_packet.clear();
client_packet << packet_type;
client_packet << m_current_player;
client_packet << shot_distance;
m_net_client->sendData(client_packet, true);
m_drawing_shot_distance = 0;
player->m_shot_allowed = false;
refptr<Shot> shot = new Shot(
sf::Vector2f(player->x, player->y),
player->direction,
shot_distance);
m_shots.push_back(shot);
}

1
src/client/Client.h
View File

@ -39,6 +39,7 @@ class Client
void draw_lava(); void draw_lava();
void draw_shot_ring(); void draw_shot_ring();
void draw_shot_ring_instance(); void draw_shot_ring_instance();
void create_shot();
bool m_mouse_grabbed; bool m_mouse_grabbed;
double m_player_dir_x; double m_player_dir_x;