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

Merge commit '0f13956'

Browse Source 
* also eliminated ./todo.txt
This commit is contained in:
Kayne Ruse
2014-11-07 00:17:04 +11:00
parent 2a7a2889c6 0f139562c3
commit 3192524922
18 changed files with 62 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/renderable/base_monster.hpp
+2 -2
View File
@@ -26,8 +26,8 @@
class BaseMonster {
public:
BaseMonster();
virtual ~BaseMonster();
BaseMonster() = default;
virtual ~BaseMonster() = default;
private:
//
client/renderable/local_character.hpp
+4
View File
@@ -30,9 +30,13 @@ public:
LocalCharacter() = default;
~LocalCharacter() = default;
int SetRoomIndex(int i) { return roomIndex = i; }
int GetRoomIndex() { return roomIndex; }
Statistics* GetBaseStats() { return &baseStats; }
private:
int roomIndex = -1;
Statistics baseStats;
//TODO: weapons, armour, buffs, debuffs, etc.
};
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;
client/scenes/in_world.hpp
+9 -5
View File
@@ -39,6 +39,7 @@
#include "frame_rate.hpp"
#include "base_character.hpp"
#include "base_monster.hpp"
#include "local_character.hpp"
//client
@@ -92,12 +93,13 @@ protected:
//utilities
void UpdateMap();
//shared parameters
//singleton shortcut
UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
//indexes
int& clientIndex;
int& accountIndex;
int characterIndex = -1;
std::map<int, BaseCharacter> characterMap;
//graphics
Image buttonImage;
@@ -110,6 +112,7 @@ protected:
//UI
Button disconnectButton;
Button shutDownButton;
FrameRate fps;
//the camera structure
struct {
@@ -117,12 +120,13 @@ protected:
int width = 0, height = 0;
int marginX = 0, marginY = 0;
} camera;
FrameRate fps;
//game
//game components
BaseCharacter* localCharacter = nullptr;
std::map<int, BaseCharacter> characterMap;
std::map<int, BaseMonster> monsterMap;
//connections
//heartbeat
//TODO: This needs it's own utility, for both InWorld and InCombat
typedef std::chrono::steady_clock Clock;
Clock::time_point lastBeat = Clock::now();
common/map/region_api.hpp
+3 -3
View File
@@ -22,10 +22,10 @@
#ifndef REGIONAPI_HPP_
#define REGIONAPI_HPP_
#ifdef __unix__
#include "lua.hpp"
#if defined(__MINGW32__)
#include "lua/lua.hpp"
#else
#include "lua/lua.hpp"
#include "lua.hpp"
#endif
#define TORTUGA_REGION_NAME "Region"
common/map/region_pager_api.hpp
+3 -3
View File
@@ -22,10 +22,10 @@
#ifndef REGIONPAGERAPI_HPP_
#define REGIONPAGERAPI_HPP_
#ifdef __unix__
#include "lua.hpp"
#if defined(__MINGW32__)
#include "lua/lua.hpp"
#else
#include "lua/lua.hpp"
#include "lua.hpp"
#endif
#define TORTUGA_REGION_PAGER_NAME "RegionPager"
common/map/region_pager_lua.hpp
+3 -3
View File
@@ -24,10 +24,10 @@
#include "region_pager_base.hpp"
#ifdef __unix__
#include "lua.hpp"
#if defined(__MINGW32__)
#include "lua/lua.hpp"
#else
#include "lua/lua.hpp"
#include "lua.hpp"
#endif
#include <string>
common/map/tile_sheet_api.hpp
+3 -3
View File
@@ -22,10 +22,10 @@
#ifndef TILESHEETAPI_HPP_
#define TILESHEETAPI_HPP_
#ifdef __unix__
#include "lua.hpp"
#if defined(__MINGW32__)
#include "lua/lua.hpp"
#else
#include "lua/lua.hpp"
#include "lua.hpp"
#endif
common/utilities/utility.cpp
+1 -3
View File
@@ -29,10 +29,8 @@ std::string truncatePath(std::string pathname) {
pathname.rbegin(),
pathname.rend(),
[](char ch) -> bool {
//windows only
//windows & unix tested
return ch == '/' || ch == '\\';
// //unix only
// return ch == '/';
}).base(),
pathname.end());
}
server/accounts/account_manager.hpp
+3 -3
View File
@@ -26,10 +26,10 @@
#include "singleton.hpp"
#include "manager_interface.hpp"
#ifdef __unix__
#include "sqlite3.h"
#if defined(__MINGW32__)
#include "sqlite3/sqlite3.h"
#else
#include "sqlite3/sqlite3.h"
#include "sqlite3.h"
#endif
#include <functional>
server/characters/character_manager.cpp
+3 -3
View File
@@ -21,10 +21,10 @@
*/
#include "character_manager.hpp"
#ifdef __unix__
#include "sqlite3.h"
#if defined(__MINGW32__)
#include "sqlite3/sqlite3.h"
#else
#include "sqlite3/sqlite3.h"
#include "sqlite3.h"
#endif
#include <algorithm>
server/characters/character_manager.hpp
+3 -3
View File
@@ -26,10 +26,10 @@
#include "singleton.hpp"
#include "manager_interface.hpp"
#ifdef __unix__
#include "sqlite3.h"
#if defined(__MINGW32__)
#include "sqlite3/sqlite3.h"
#else
#include "sqlite3/sqlite3.h"
#include "sqlite3.h"
#endif
#include <functional>
server/linit.cpp
+3 -3
View File
@@ -34,10 +34,10 @@
#define linit_c
#define LUA_LIB
#ifdef __unix__
#include "lua.hpp"
#if defined(__MINGW32__)
#include "lua/lua.hpp"
#else
#include "lua/lua.hpp"
#include "lua.hpp"
#endif
#include "region_api.hpp"
server/rooms/room_api.hpp
+3 -3
View File
@@ -22,10 +22,10 @@
#ifndef ROOMAPI_HPP_
#define ROOMAPI_HPP_
#ifdef __unix__
#include "lua.hpp"
#if defined(__MINGW32__)
#include "lua/lua.hpp"
#else
#include "lua/lua.hpp"
#include "lua.hpp"
#endif
#define TORTUGA_ROOM_NAME "Room"
server/rooms/room_manager.hpp
+3 -3
View File
@@ -26,10 +26,10 @@
#include "singleton.hpp"
#include "manager_interface.hpp"
#ifdef __unix__
#include "lua.hpp"
#if defined(__MINGW32__)
#include "lua/lua.hpp"
#else
#include "lua/lua.hpp"
#include "lua.hpp"
#endif
class RoomManager:
server/rooms/room_manager_api.hpp
+3 -3
View File
@@ -22,10 +22,10 @@
#ifndef ROOMMANAGERAPI_HPP_
#define ROOMMANAGERAPI_HPP_
#ifdef __unix__
#include "lua.hpp"
#if defined(__MINGW32__)
#include "lua/lua.hpp"
#else
#include "lua/lua.hpp"
#include "lua.hpp"
#endif
#define TORTUGA_ROOM_MANAGER_NAME "RoomManager"
server/server_application.hpp
+5 -5
View File
@@ -35,12 +35,12 @@
#include "singleton.hpp"
//APIs
#if __unix__
#include "lua.hpp"
#include "sqlite3.h"
#if defined(__MINGW32__)
#include "lua/lua.hpp"
#include "sqlite3/sqlite3.h"
#else
#include "lua/lua.hpp"
#include "sqlite3/sqlite3.h"
#include "lua.hpp"
#include "sqlite3.h"
#endif
#include "SDL/SDL.h"
server/server_utilities/sql_tools.hpp
+3 -3
View File
@@ -22,10 +22,10 @@
#ifndef SERVERUTILITY_HPP_
#define SERVERUTILITY_HPP_
#ifdef __unix__
#include "sqlite3.h"
#if defined(__MINGW32__)
#include "sqlite3/sqlite3.h"
#else
#include "sqlite3/sqlite3.h"
#include "sqlite3.h"
#endif
#include <string>