Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implemented a few minor changes from the monster branch

Browse Source
This commit is contained in:
Kayne Ruse
2014-10-19 00:53:38 +11:00
parent bd2fd4ee97
commit 40c76b4285
5 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/scenes/in_world.cpp
+5 -4
View File
@@ -138,7 +138,7 @@ void InWorld::Update() {
}
}
//update the camera
//update the camera (following the player)
camera.x = localCharacter->GetOrigin().x - camera.marginX;
camera.y = localCharacter->GetOrigin().y - camera.marginY;
@@ -179,6 +179,7 @@ void InWorld::Render(SDL_Surface* const screen) {
//draw characters
for (auto& it : characterMap) {
//BUG: #29 drawing order according to Y origin
//TODO: use a list of renderable objects
it.second.DrawTo(screen, camera.x, camera.y);
}
@@ -209,10 +210,10 @@ void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
}
void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER) {
if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER && button.button == SDL_BUTTON_LEFT) {
RequestDisconnect();
}
if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER) {
if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER && button.button == SDL_BUTTON_LEFT) {
RequestShutDown();
}
}
@@ -326,7 +327,7 @@ void InWorld::HandlePing(ServerPacket* const argPacket) {
void InWorld::HandlePong(ServerPacket* const argPacket) {
if (network.GetIPAddress(Channels::SERVER)->host != argPacket->srcAddress.host) {
throw(std::runtime_error("Heartbeat message received from unknown source"));
throw(std::runtime_error("Heartbeat message received from an unknown source"));
}
attemptedBeats = 0;