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

Fixed the removal of damaged tiles and lose hover over damaged tiles

Browse Source
This commit is contained in:
xethm55 2012-10-02 21:28:29 -04:00
parent fd04772828
commit a5ccedb230
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/Client-gl.cc
View File

@ -8,8 +8,6 @@
#include "ccfs.h" #include "ccfs.h"
#include "HexTile.h" #include "HexTile.h"
#include <iostream>
using namespace std; using namespace std;
#define LEN(arr) (sizeof(arr)/sizeof(arr[0])) #define LEN(arr) (sizeof(arr)/sizeof(arr[0]))
@ -344,8 +342,8 @@ void Client::draw_map()
for (int x = 0; x < width; x++) for (int x = 0; x < width; x++)
{ {
if ((m_map.tile_present(x, y)) && if ((m_map.tile_present(x, y)) &&
(m_map.get_tile_at(x,y)->get_damage_state() == HexTile::UNDAMAGED)) (m_map.get_tile(x,y)->get_damage_state() < HexTile::DESTROYED))
{ {
refptr<HexTile> tile = m_map.get_tile(x, y); refptr<HexTile> tile = m_map.get_tile(x, y);
float cx = tile->get_x(); float cx = tile->get_x();
float cy = tile->get_y(); float cy = tile->get_y();
@ -414,7 +412,7 @@ void Client::draw_overlay()
for (int x = 0; x < width; x++) for (int x = 0; x < width; x++)
{ {
if ((m_map.tile_present(x, y)) && if ((m_map.tile_present(x, y)) &&
(m_map.get_tile_at(x,y)->get_damage_state() == HexTile::UNDAMAGED)) (m_map.get_tile(x,y)->get_damage_state() < HexTile::DESTROYED))
{ {
refptr<HexTile> tile = m_map.get_tile(x, y); refptr<HexTile> tile = m_map.get_tile(x, y);
float cx = tile->get_x(); float cx = tile->get_x();

15
src/server/Server.cc
View File

@ -186,7 +186,8 @@ void Server::update( double elapsed_time )
{ {
/* decrease player hover when not over a tile */ /* decrease player hover when not over a tile */
if((m_players[pindex]->hover > 0) && if((m_players[pindex]->hover > 0) &&
(m_map.get_tile_at(m_players[pindex]->x, m_players[pindex]->y).isNull())) ((m_map.get_tile_at(m_players[pindex]->x, m_players[pindex]->y).isNull()) ||
(m_map.get_tile_at(m_players[pindex]->x, m_players[pindex]->y)->get_damage_state() == HexTile::DESTROYED)))
{ {
m_players[pindex]->hover -= elapsed_time / 10; m_players[pindex]->hover -= elapsed_time / 10;
if (m_players[pindex]->hover < 0) if (m_players[pindex]->hover < 0)
@ -206,16 +207,18 @@ void Server::update( double elapsed_time )
float player_dir_x = cos(m_players[pindex]->m_shot_direction); float player_dir_x = cos(m_players[pindex]->m_shot_direction);
float player_dir_y = sin(m_players[pindex]->m_shot_direction); float player_dir_y = sin(m_players[pindex]->m_shot_direction);
float tile_x = m_players[pindex]->m_shot_start_x + (player_dir_x * m_players[pindex]->m_shot_distance); float tile_x = m_players[pindex]->m_shot_start_x + (player_dir_x * m_players[pindex]->m_shot_distance);
float tile_y = m_players[pindex]->m_shot_start_y + (player_dir_y * m_players[pindex]->m_shot_distance); float tile_y = m_players[pindex]->m_shot_start_y + (player_dir_y * m_players[pindex]->m_shot_distance);
if((!m_map.get_tile_at(tile_x, tile_y).isNull()) && refptr<HexTile> p_tile = m_map.get_tile_at(tile_x, tile_y);
(m_map.get_tile_at(tile_x, tile_y)->get_damage_state() < HexTile::DESTROYED)) if((!p_tile.isNull()) &&
(p_tile->get_damage_state() < HexTile::DESTROYED))
{ {
// Send a message to all clients letting them know a tile was damaged // Send a message to all clients letting them know a tile was damaged
sf::Uint8 ptype = TILE_DAMAGED; sf::Uint8 ptype = TILE_DAMAGED;
server_packet.clear(); server_packet.clear();
server_packet << ptype; server_packet << ptype;
server_packet << tile_x; server_packet << p_tile->get_x();
server_packet << tile_y; server_packet << p_tile->get_y();
m_net_server->sendData(server_packet, true); m_net_server->sendData(server_packet, true);
m_map.get_tile_at(tile_x, tile_y)->shot(); m_map.get_tile_at(tile_x, tile_y)->shot();
} }