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

Merge branch 'monsters' into develop

Browse Source 
Conflicts:
	client/scenes/in_world.cpp
This commit is contained in:
Kayne Ruse
2015-01-20 05:04:08 +11:00
parent 7356e8ae77 bd878e20ce
commit 2a86a09693
31 changed files with 1159 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/server_logic.cpp
+12 -15
View File
@@ -276,27 +276,24 @@ void ServerApplication::HandlePacket(SerialPacket* const argPacket) {
HandleCharacterUnload(static_cast<CharacterPacket*>(argPacket));
break;
//character movement
case SerialPacketType::CHARACTER_SET_ROOM:
HandleCharacterSetRoom(static_cast<CharacterPacket*>(argPacket));
/* case SerialPacketType::QUERY_CHARACTER_EXISTS:
//
break;
case SerialPacketType::CHARACTER_SET_ORIGIN:
HandleCharacterSetOrigin(static_cast<CharacterPacket*>(argPacket));
break;
case SerialPacketType::CHARACTER_SET_MOTION:
HandleCharacterSetMotion(static_cast<CharacterPacket*>(argPacket));
break;
/*
case SerialPacketType::QUERY_CHARACTER_STATS:
// HandleCharacterStatsRequest(static_cast<RegionPacket*>(argPacket));
//
break;
case SerialPacketType::QUERY_CHARACTER_LOCATION:
// HandleCharacterStatsRequest(static_cast<RegionPacket*>(argPacket));
//
break;
case SerialPacketType::TEXT_BROADCAST:
// HandleCharacterStatsRequest(static_cast<RegionPacket*>(argPacket));
*/
//character movement
case SerialPacketType::CHARACTER_MOVEMENT:
HandleCharacterMovement(static_cast<CharacterPacket*>(argPacket));
break;
case SerialPacketType::CHARACTER_ATTACK:
HandleCharacterAttack(static_cast<CharacterPacket*>(argPacket));
break;
/*
//enemy management
//TODO: enemy management