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

Corrected spacing

Browse Source
This commit is contained in:
xethm55 2012-09-23 10:43:38 -04:00
parent 57fe48887d
commit dabca714c9
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/client/Client.cc
View File

@ -1,4 +1,3 @@
#include <math.h> #include <math.h>
#include "Client.h" #include "Client.h"
#include "Types.h" #include "Types.h"
@ -85,7 +84,7 @@ void Client::update(double elapsed_time)
m_net_client->Receive(); m_net_client->Receive();
client_packet.clear(); client_packet.clear();
// Handle all received data (only really want the latest) // Handle all received data (only really want the latest)
while(m_net_client->getData(client_packet)) while(m_net_client->getData(client_packet))
{ {
// Update player position as calculated from the server. // Update player position as calculated from the server.
@ -105,28 +104,28 @@ void Client::update(double elapsed_time)
sf::Uint8 d_pressed = KEY_NOT_PRESSED; sf::Uint8 d_pressed = KEY_NOT_PRESSED;
sf::Int32 rel_mouse_movement = 0; sf::Int32 rel_mouse_movement = 0;
// This is a fix so that the mouse will not move outside the window and // This is a fix so that the mouse will not move outside the window and
// cause the user to click on another program. // cause the user to click on another program.
// Note: Does not work well with fast movement. // Note: Does not work well with fast movement.
if(client_has_focus) if(client_has_focus)
{ {
if (sf::Keyboard::isKeyPressed(sf::Keyboard::A)) if (sf::Keyboard::isKeyPressed(sf::Keyboard::A))
{ {
a_pressed = KEY_PRESSED; a_pressed = KEY_PRESSED;
} }
if (sf::Keyboard::isKeyPressed(sf::Keyboard::D)) if (sf::Keyboard::isKeyPressed(sf::Keyboard::D))
{ {
d_pressed = KEY_PRESSED; d_pressed = KEY_PRESSED;
} }
if (sf::Keyboard::isKeyPressed(sf::Keyboard::W)) if (sf::Keyboard::isKeyPressed(sf::Keyboard::W))
{ {
w_pressed = KEY_PRESSED; w_pressed = KEY_PRESSED;
} }
if (sf::Keyboard::isKeyPressed(sf::Keyboard::S)) if (sf::Keyboard::isKeyPressed(sf::Keyboard::S))
{ {
s_pressed = KEY_PRESSED; s_pressed = KEY_PRESSED;
} }
rel_mouse_movement = sf::Mouse::getPosition(*m_window).x - m_width / 2; rel_mouse_movement = sf::Mouse::getPosition(*m_window).x - m_width / 2;
sf::Mouse::setPosition(sf::Vector2i(m_width / 2, m_height / 2), *m_window); sf::Mouse::setPosition(sf::Vector2i(m_width / 2, m_height / 2), *m_window);
} }

2
src/server/Server.cc
View File

@ -47,7 +47,7 @@ void Server::update( double elapsed_time )
static sf::Int32 rel_mouse_movement = 0; static sf::Int32 rel_mouse_movement = 0;
m_net_server->Receive(); m_net_server->Receive();
// Handle all received data (only really want the latest) // Handle all received data (only really want the latest)
while(m_net_server->getData(server_packet)) while(m_net_server->getData(server_packet))
{ {
server_packet >> w_pressed; server_packet >> w_pressed;