summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/chathandler.cpp2
-rw-r--r--src/net/ea/guildhandler.cpp4
-rw-r--r--src/net/ea/inventoryhandler.cpp11
-rw-r--r--src/net/ea/loginhandler.cpp1
4 files changed, 10 insertions, 8 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 0f0b3214a..ea9d17798 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -212,7 +212,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
}
}
else if (chatMsg.length() > 3
- && chatMsg.find("\302\202") == 0)
+ && chatMsg.find("\302\202") == 0)
{
chatMsg = chatMsg.erase(0, 2);
if (showMsg && chatWindow)
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index 163fed401..bb5cbe94b 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -423,7 +423,7 @@ void GuildHandler::processGuildInviteAck(Net::MessageIn &msg)
void GuildHandler::processGuildLeave(Net::MessageIn &msg)
{
std::string nick = msg.readString(24); // Name
- std::string message = msg.readString(40); // Message
+ msg.readString(40); // Message
if (taGuild)
taGuild->removeMember(nick);
@@ -468,7 +468,7 @@ void GuildHandler::processGuildLeave(Net::MessageIn &msg)
void GuildHandler::processGuildExpulsion(Net::MessageIn &msg)
{
std::string nick = msg.readString(24); // Name (of expulsed?)
- std::string message = msg.readString(40); // Message
+ msg.readString(40); // Message
msg.skip(24); // unused ("dummy")
if (taGuild)
taGuild->removeMember(nick);
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 04967b0a7..acd674d12 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -158,7 +158,8 @@ int InventoryHandler::getSlot(int eAthenaSlot)
return EQUIP_POINTS[position];
}
-void InventoryHandler::processPlayerInventory(Net::MessageIn &msg, bool playerInvintory)
+void InventoryHandler::processPlayerInventory(Net::MessageIn &msg,
+ bool playerInvintory)
{
int index, amount, itemId, arrow;
int cards[4], itemType;
@@ -450,7 +451,7 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg)
{
int index, amount, itemId, refine;
unsigned char identified;
- int cards[4];
+// int cards[4];
// Move an item into storage
index = msg.readInt16() - STORAGE_OFFSET;
@@ -460,7 +461,7 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg)
msg.readInt8(); // attribute
refine = msg.readInt8();
for (int i = 0; i < 4; i++)
- cards[i] = msg.readInt16();
+ msg.readInt16(); // card i
if (Item *item = mStorage->getItem(index))
{
@@ -583,10 +584,10 @@ void InventoryHandler::processPlayerEquip(Net::MessageIn &msg)
void InventoryHandler::processPlayerUnEquip(Net::MessageIn &msg)
{
- int index, equipType;
+ int equipType;
int flag;
- index = msg.readInt16() - INVENTORY_OFFSET;
+ msg.readInt16(); // inder val - INVENTORY_OFFSET;
equipType = msg.readInt16();
flag = msg.readInt8();
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 2bce6c251..51502895c 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -38,6 +38,7 @@ LoginHandler::LoginHandler():
mVersionResponse(false),
mRegistrationEnabled(true)
{
+ mToken.clear();
}
LoginHandler::~LoginHandler()