Brought client into line with server

Also added a new config file for developing over multiple machines.
This commit is contained in:
2016-03-21 22:06:25 +11:00
parent b89f6f2ece
commit 30aa11c083
10 changed files with 110 additions and 153 deletions
@@ -19,28 +19,28 @@
* 3. This notice may not be removed or altered from any source
* distribution.
*/
#include "base_monster.hpp"
#include "base_creature.hpp"
#include "config_utility.hpp"
void BaseMonster::CorrectSprite() {
//TODO: (9) BaseMonster::CorrectSprite()
void BaseCreature::CorrectSprite() {
//TODO: (9) BaseCreature::CorrectSprite()
}
std::string BaseMonster::SetHandle(std::string s) {
std::string BaseCreature::SetHandle(std::string s) {
return handle = s;
}
std::string BaseMonster::GetHandle() const {
std::string BaseCreature::GetHandle() const {
return handle;
}
std::string BaseMonster::SetAvatar(SDL_Renderer* const renderer, std::string s) {
std::string BaseCreature::SetAvatar(SDL_Renderer* const renderer, std::string s) {
avatar = s;
sprite.Load(renderer, ConfigUtility::GetSingleton()["dir.sprites"] + avatar, 4, 1);
return avatar;
}
std::string BaseMonster::GetAvatar() const {
std::string BaseCreature::GetAvatar() const {
return avatar;
}
@@ -23,10 +23,10 @@
#include "entity.hpp"
class BaseMonster: public Entity {
class BaseCreature: public Entity {
public:
BaseMonster() = default;
virtual ~BaseMonster() = default;
BaseCreature() = default;
virtual ~BaseCreature() = default;
void CorrectSprite();