Renamed {read,write}{Byte,Short,Long} to {read,write}{Int8,Int16,Int32}. This

is less confusing in 64-bit context and less conflicting with the 0.0 client.

2 files changed, 14 insertions, 14 deletions

diff --git a/src/net/accountserver/account.cpp b/src/net/accountserver/account.cpp
index a90f75b8..f0778b1d 100644
--- a/src/net/accountserver/account.cpp
+++ b/src/net/accountserver/account.cpp
@@ -37,16 +37,16 @@ void Net::AccountServer::Account::createCharacter(
     MessageOut msg(PAMSG_CHAR_CREATE);
 
     msg.writeString(name);
-    msg.writeByte(hairStyle);
-    msg.writeByte(hairColor);
-    msg.writeByte(gender);
-    msg.writeShort(strength);
-    msg.writeShort(agility);
-    msg.writeShort(vitality);
-    msg.writeShort(intelligence);
-    msg.writeShort(dexterity);
-    msg.writeShort(willpower);
-    msg.writeShort(charisma);
+    msg.writeInt8(hairStyle);
+    msg.writeInt8(hairColor);
+    msg.writeInt8(gender);
+    msg.writeInt16(strength);
+    msg.writeInt16(agility);
+    msg.writeInt16(vitality);
+    msg.writeInt16(intelligence);
+    msg.writeInt16(dexterity);
+    msg.writeInt16(willpower);
+    msg.writeInt16(charisma);
 
     Net::AccountServer::connection->send(msg);
 }
@@ -55,7 +55,7 @@ void Net::AccountServer::Account::deleteCharacter(char slot)
 {
     MessageOut msg(PAMSG_CHAR_DELETE);
 
-    msg.writeByte(slot);
+    msg.writeInt8(slot);
 
     Net::AccountServer::connection->send(msg);
 }
@@ -64,7 +64,7 @@ void Net::AccountServer::Account::selectCharacter(char slot)
 {
     MessageOut msg(PAMSG_CHAR_SELECT);
 
-    msg.writeByte(slot);
+    msg.writeInt8(slot);
 
     Net::AccountServer::connection->send(msg);
 }
diff --git a/src/net/accountserver/accountserver.cpp b/src/net/accountserver/accountserver.cpp
index 92d803e6..651758a6 100644
--- a/src/net/accountserver/accountserver.cpp
+++ b/src/net/accountserver/accountserver.cpp
@@ -36,7 +36,7 @@ void Net::AccountServer::login(Net::Connection *connection, int version,
 
     MessageOut msg(PAMSG_LOGIN);
 
-    msg.writeLong(version);
+    msg.writeInt32(version);
     msg.writeString(username);
     msg.writeString(password);
 
@@ -51,7 +51,7 @@ void Net::AccountServer::registerAccount(Net::Connection *connection,
 
     MessageOut msg(PAMSG_REGISTER);
 
-    msg.writeLong(version); // client version
+    msg.writeInt32(version); // client version
     msg.writeString(username);
     msg.writeString(password);
     msg.writeString(email);