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

Merge branch 'char-add' into develop, characters working again

Browse Source
This commit is contained in:
Kayne Ruse
2014-06-14 23:30:57 +10:00
parent c210b99a5f bd5e57401e
commit dfc464ddd6
10 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/in_world.cpp
+12 -4
View File
@@ -128,7 +128,7 @@ void InWorld::RenderFrame() {
}
void InWorld::Render(SDL_Surface* const screen) {
//draw the map0
//draw the map
for (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); it++) {
tileSheet.DrawRegionTo(screen, &(*it), camera.x, camera.y);
}
@@ -185,6 +185,7 @@ void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
case SDLK_LEFT:
if (localCharacter) {
localCharacter->motion.x -= CHARACTER_WALKING_SPEED;
localCharacter->CorrectSprite();
SendPlayerUpdate();
}
break;
@@ -192,6 +193,7 @@ void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
case SDLK_RIGHT:
if (localCharacter) {
localCharacter->motion.x += CHARACTER_WALKING_SPEED;
localCharacter->CorrectSprite();
SendPlayerUpdate();
}
break;
@@ -199,6 +201,7 @@ void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
case SDLK_UP:
if (localCharacter) {
localCharacter->motion.y -= CHARACTER_WALKING_SPEED;
localCharacter->CorrectSprite();
SendPlayerUpdate();
}
break;
@@ -206,6 +209,7 @@ void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
case SDLK_DOWN:
if (localCharacter) {
localCharacter->motion.y += CHARACTER_WALKING_SPEED;
localCharacter->CorrectSprite();
SendPlayerUpdate();
}
break;
@@ -218,6 +222,7 @@ void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
case SDLK_LEFT:
if (localCharacter) {
localCharacter->motion.x += CHARACTER_WALKING_SPEED;
localCharacter->CorrectSprite();
SendPlayerUpdate();
}
break;
@@ -225,6 +230,7 @@ void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
case SDLK_RIGHT:
if (localCharacter) {
localCharacter->motion.x -= CHARACTER_WALKING_SPEED;
localCharacter->CorrectSprite();
SendPlayerUpdate();
}
break;
@@ -232,6 +238,7 @@ void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
case SDLK_UP:
if (localCharacter) {
localCharacter->motion.y += CHARACTER_WALKING_SPEED;
localCharacter->CorrectSprite();
SendPlayerUpdate();
}
break;
@@ -239,6 +246,7 @@ void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
case SDLK_DOWN:
if (localCharacter) {
localCharacter->motion.y -= CHARACTER_WALKING_SPEED;
localCharacter->CorrectSprite();
SendPlayerUpdate();
}
break;
@@ -297,11 +305,11 @@ void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
character.CorrectSprite();
//catch this client's player object
if (argPacket->characterIndex == characterIndex && !localCharacter) {
if (argPacket->accountIndex == accountIndex && !localCharacter) {
characterIndex = argPacket->characterIndex;
localCharacter = &character;
//setup the camera
//TODO: can't change the screen size?
camera.width = GetScreen()->w;
camera.height = GetScreen()->h;
@@ -330,7 +338,7 @@ void InWorld::HandleCharacterUpdate(CharacterPacket* const argPacket) {
CharacterData& character = characterMap[argPacket->characterIndex];
//TODO: review this
//other characters moving
if (argPacket->characterIndex != characterIndex) {
character.roomIndex = argPacket->roomIndex;
character.origin = argPacket->origin;
client/lobby_menu.cpp
+7 -1
View File
@@ -238,5 +238,11 @@ void LobbyMenu::HandleJoinResponse(ClientPacket* const argPacket) {
network.Bind(&argPacket->srcAddress, Channels::SERVER);
SetNextScene(SceneList::INWORLD);
//TODO: send this player's character info
//send this player's character info
CharacterPacket newPacket;
newPacket.type = SerialPacketType::CHARACTER_NEW;
strncpy(newPacket.handle, config["client.handle"].c_str(), PACKET_STRING_SIZE);
strncpy(newPacket.avatar, config["client.avatar"].c_str(), PACKET_STRING_SIZE);
newPacket.accountIndex = accountIndex;
network.SendTo(Channels::SERVER, &newPacket);
}
client/main_menu.cpp
+3
View File
@@ -53,6 +53,9 @@ MainMenu::MainMenu(ConfigUtility* const argConfig):
startButton.SetText("Start");
optionsButton.SetText("Options");
quitButton.SetText("Quit");
//debug
//
}
MainMenu::~MainMenu() {
common/gameplay/combat_data.hpp
+1 -1
View File
@@ -43,7 +43,7 @@
struct CombatData {
enum class Terrain {
//TODO: types of terrains
//TODO: types of combat terrains
NONE = 0,
GRASSLANDS,
};
common/network/packet/serial_packet_base.hpp
+2 -2
View File
@@ -30,8 +30,8 @@
#include "SDL/SDL_net.h"
#define NETWORK_VERSION 20140607
#define PACKET_STRING_SIZE 100
constexpr int NETWORK_VERSION = 20140607;
constexpr int PACKET_STRING_SIZE = 100;
struct SerialPacketBase {
//members
common/network/serial/serial.cpp
-1
View File
@@ -73,7 +73,6 @@ void serializePacket(SerialPacketBase* packet, void* buffer) {
case SerialPacketType::COMBAT_DELETE:
case SerialPacketType::COMBAT_UPDATE:
//TODO: is this the best fit?
case SerialPacketType::COMBAT_ENTER_REQUEST:
case SerialPacketType::COMBAT_ENTER_RESPONSE:
case SerialPacketType::COMBAT_EXIT_REQUEST:
common/network/serial/serial_client.cpp
+4 -4
View File
@@ -28,8 +28,8 @@ void serializeClient(ClientPacket* packet, void* buffer) {
SERIALIZE(buffer, &packet->clientIndex, sizeof(int));
SERIALIZE(buffer, &packet->accountIndex, sizeof(int));
SERIALIZE(buffer, &packet->username, sizeof(PACKET_STRING_SIZE));
// SERIALIZE(buffer, &packet->password, sizeof(PACKET_STRING_SIZE));
SERIALIZE(buffer, &packet->username, PACKET_STRING_SIZE);
// SERIALIZE(buffer, &packet->password, PACKET_STRING_SIZE);
}
void deserializeClient(ClientPacket* packet, void* buffer) {
@@ -37,6 +37,6 @@ void deserializeClient(ClientPacket* packet, void* buffer) {
DESERIALIZE(buffer, &packet->clientIndex, sizeof(int));
DESERIALIZE(buffer, &packet->accountIndex, sizeof(int));
DESERIALIZE(buffer, &packet->username, sizeof(PACKET_STRING_SIZE));
// DESERIALIZE(buffer, &packet->password, sizeof(PACKET_STRING_SIZE));
DESERIALIZE(buffer, &packet->username, PACKET_STRING_SIZE);
// DESERIALIZE(buffer, &packet->password, PACKET_STRING_SIZE);
}
makefile
+1 -1
View File
@@ -3,7 +3,7 @@
#MKDIR=mkdir
#RM=del /y
CXXFLAGS+=-static-libgcc -static-libstdc++ -g
CXXFLAGS+=-static-libgcc -static-libstdc++
export
server/server_application.cpp
+5 -4
View File
@@ -233,7 +233,7 @@ void ServerApplication::HandleBroadcastRequest(SerialPacket* const argPacket) {
ServerPacket newPacket;
newPacket.type = SerialPacketType::BROADCAST_RESPONSE;
snprintf(newPacket.name, PACKET_STRING_SIZE, "%s", config["server.name"].c_str());
strncpy(newPacket.name, config["server.name"].c_str(), PACKET_STRING_SIZE);
newPacket.playerCount = characterMgr.GetContainer()->size();
newPacket.version = NETWORK_VERSION;
@@ -338,7 +338,8 @@ void ServerApplication::HandleRegionRequest(RegionPacket* const argPacket) {
//-------------------------
void ServerApplication::HandleCharacterNew(CharacterPacket* const argPacket) {
int characterIndex = characterMgr.CreateCharacter(argPacket->accountIndex, argPacket->handle, argPacket->avatar);
//NOTE: misnomer, try to load the character first
int characterIndex = characterMgr.LoadCharacter(argPacket->accountIndex, argPacket->handle, argPacket->avatar);
if (characterIndex == -1) {
//TODO: rejection packet
@@ -478,8 +479,8 @@ void ServerApplication::CopyCharacterToPacket(CharacterPacket* const packet, int
//TODO: keep this up to date when the character changes
packet->characterIndex = characterIndex;
snprintf(packet->handle, PACKET_STRING_SIZE, "%s", character->handle.c_str());
snprintf(packet->avatar, PACKET_STRING_SIZE, "%s", character->avatar.c_str());
strncpy(packet->handle, character->handle.c_str(), PACKET_STRING_SIZE);
strncpy(packet->avatar, character->avatar.c_str(), PACKET_STRING_SIZE);
packet->accountIndex = character->owner;
packet->roomIndex = character->roomIndex;
packet->origin = character->origin;
todo.txt
+1
View File
@@ -1,3 +1,4 @@
TODO: rename restart scene to cleanup scene
TODO: encapsulate the data structures
TODO: Get the rooms working