From b6c70cbc0d3c5b84ae12436a13adde6206e732e9 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Wed, 13 Aug 2014 09:05:26 +1000 Subject: [PATCH] Tweaked the bounds values --- client/scenes/in_world.cpp | 7 ++++++- common/gameplay/character_defines.hpp | 8 +++++--- todo.txt | 2 ++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/client/scenes/in_world.cpp b/client/scenes/in_world.cpp index ff0f67b..b2de46c 100644 --- a/client/scenes/in_world.cpp +++ b/client/scenes/in_world.cpp @@ -312,7 +312,12 @@ void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) { newCharacter.SetOrigin(argPacket->origin); newCharacter.SetMotion(argPacket->motion); - newCharacter.SetBounds({0, 16, 32, 32}); //TODO: magic numbers, fix this + newCharacter.SetBounds({ + CHARACTER_BOUNDS_X, + CHARACTER_BOUNDS_Y, + CHARACTER_BOUNDS_WIDTH, + CHARACTER_BOUNDS_HEIGHT + }); (*newCharacter.GetStats()) = argPacket->stats; diff --git a/common/gameplay/character_defines.hpp b/common/gameplay/character_defines.hpp index 1daa1b4..43777e0 100644 --- a/common/gameplay/character_defines.hpp +++ b/common/gameplay/character_defines.hpp @@ -28,8 +28,10 @@ constexpr double CHARACTER_WALKING_SPEED = 140.0; constexpr double CHARACTER_WALKING_MOD = 1.0/sqrt(2.0); -//the bounding boxes for the characters -constexpr double CHARACTER_BOUNDS_WIDTH = 32.0; -constexpr double CHARACTER_BOUNDS_HEIGHT = 32.0; +//the bounds for the character objects, mapped to the default sprites +constexpr int CHARACTER_BOUNDS_X = 0; +constexpr int CHARACTER_BOUNDS_Y = 16; +constexpr int CHARACTER_BOUNDS_WIDTH = 32; +constexpr int CHARACTER_BOUNDS_HEIGHT = 32; #endif diff --git a/todo.txt b/todo.txt index a1f8458..f7a9491 100644 --- a/todo.txt +++ b/todo.txt @@ -1,6 +1,8 @@ TODO: encapsulate the data structures +TODO: The server's managers should be singletons too TODO: Get the rooms working TODO: A proper logging system +TODO: Move the statistics into their own SQL table, instead of duplicating the structure a dozen times TODO: make the whole thing more fault tolerant TODO: Authentication