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

Refactored some code from InWorld into methods in CharacterData

Browse Source
This commit is contained in:
Kayne Ruse
2014-05-28 21:07:11 +10:00
parent 519b8a1e36
commit 6428b02d85
6 changed files with 96 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/in_world.cpp
+4 -14
View File
@@ -112,14 +112,7 @@ void InWorld::Update(double delta) {
//update the characters
for (auto& it : characterMap) {
if (it.second.motion.x && it.second.motion.y) {
//TODO: refactor this into a method
it.second.position += it.second.motion * delta * CHARACTER_WALKING_MOD;
}
else if (it.second.motion != 0) {
it.second.position += it.second.motion * delta;
}
//TODO: SPRITE: fix sprite
it.second.Update(delta);
}
//TODO: sort the players and entities by Y position
@@ -152,8 +145,7 @@ void InWorld::Render(SDL_Surface* const screen) {
//draw characters
for (auto& it : characterMap) {
//TODO: refactor this
it.second.sprite.DrawTo(screen, it.second.position.x - camera.x, it.second.position.y - camera.y);
it.second.DrawTo(screen, camera.x, camera.y);
}
//draw UI
@@ -316,8 +308,7 @@ void InWorld::HandleCharacterUpdate(SerialPacket packet) {
characterMap[packet.characterInfo.characterIndex].position = packet.characterInfo.position;
characterMap[packet.characterInfo.characterIndex].motion = packet.characterInfo.motion;
}
//TODO: refactor this
// characterMap[packet.characterInfo.characterIndex].ResetDirection();
characterMap[packet.characterInfo.characterIndex].CorrectSprite();
}
void InWorld::HandleCharacterNew(SerialPacket packet) {
@@ -330,8 +321,7 @@ void InWorld::HandleCharacterNew(SerialPacket packet) {
characterMap[packet.characterInfo.characterIndex].sprite.LoadSurface(config["dir.sprites"] + packet.characterInfo.avatar, 4, 4);
characterMap[packet.characterInfo.characterIndex].position = packet.characterInfo.position;
characterMap[packet.characterInfo.characterIndex].motion = packet.characterInfo.motion;
//TODO: refactor this
// characterMap[packet.characterInfo.characterIndex].ResetDirection();
characterMap[packet.characterInfo.characterIndex].CorrectSprite();
//catch this client's player object
if (packet.characterInfo.characterIndex == characterIndex && !localCharacter) {