Merge a82628adaa into 79b6a47b9a

src/client/ClientServices.cpp

@@ -160,6 +160,10 @@ ClientConnection* ClientServices::Connection() {
     return ClientServices::s_currentConnection;
 }
 
+void ClientServices::CharacterDelete(uint64_t guid) {
+    ClientServices::Connection()->RequestCharacterDelete(guid);
+}
+
 void ClientServices::Disconnect() {
     ClientServices::Connection()->Disconnect();
 }

src/client/ClientServices.hpp

@@ -33,6 +33,7 @@ class ClientServices : public LoginResponse {
         // Static functions
         static void ConnectToSelectedServer();
         static ClientConnection* Connection();
+        static void CharacterDelete(uint64_t guid);
         static void Disconnect();
         static const char* GetCurrentLoginPortal();
         static const char* GetCurrentLoginServer();

src/db/Db.cpp

@@ -12,6 +12,7 @@ WowClientDB<CharacterFacialHairStylesRec> g_characterFacialHairStylesDB;
 WowClientDB<ChrClassesRec> g_chrClassesDB;
 WowClientDB<ChrRacesRec> g_chrRacesDB;
 WowClientDB<CreatureDisplayInfoRec> g_creatureDisplayInfoDB;
+WowClientDB<CreatureDisplayInfoExtraRec> g_creatureDisplayInfoExtraDB;
 WowClientDB<CreatureModelDataRec> g_creatureModelDataDB;
 WowClientDB<FactionGroupRec> g_factionGroupDB;
 WowClientDB<FactionTemplateRec> g_factionTemplateDB;
@@ -38,6 +39,7 @@ void StaticDBLoadAll(void (*loadFn)(WowClientDB_Base*, const char*, int32_t)) {
     loadFn(&g_chrClassesDB, __FILE__, __LINE__);
     loadFn(&g_chrRacesDB, __FILE__, __LINE__);
     loadFn(&g_creatureDisplayInfoDB, __FILE__, __LINE__);
+    loadFn(&g_creatureDisplayInfoExtraDB, __FILE__, __LINE__);
     loadFn(&g_creatureModelDataDB, __FILE__, __LINE__);
     loadFn(&g_factionGroupDB, __FILE__, __LINE__);
     loadFn(&g_factionTemplateDB, __FILE__, __LINE__);

src/db/Db.hpp

@@ -13,6 +13,7 @@
 #include "db/rec/ChrClassesRec.hpp"
 #include "db/rec/ChrRacesRec.hpp"
 #include "db/rec/CreatureDisplayInfoRec.hpp"
+#include "db/rec/CreatureDisplayInfoExtraRec.hpp"
 #include "db/rec/CreatureModelDataRec.hpp"
 #include "db/rec/FactionGroupRec.hpp"
 #include "db/rec/FactionTemplateRec.hpp"
@@ -34,6 +35,7 @@ extern WowClientDB<CharacterFacialHairStylesRec> g_characterFacialHairStylesDB;
 extern WowClientDB<ChrClassesRec> g_chrClassesDB;
 extern WowClientDB<ChrRacesRec> g_chrRacesDB;
 extern WowClientDB<CreatureDisplayInfoRec> g_creatureDisplayInfoDB;
+extern WowClientDB<CreatureDisplayInfoExtraRec> g_creatureDisplayInfoExtraDB;
 extern WowClientDB<CreatureModelDataRec> g_creatureModelDataDB;
 extern WowClientDB<FactionGroupRec> g_factionGroupDB;
 extern WowClientDB<FactionTemplateRec> g_factionTemplateDB;

src/db/rec/CreatureDisplayInfoExtraRec.cpp

@@ -0,0 +1,66 @@
+// DO NOT EDIT: generated by whoa-autocode
+#include "db/rec/CreatureDisplayInfoExtraRec.hpp"
+#include "util/Locale.hpp"
+#include "util/SFile.hpp"
+
+const char* CreatureDisplayInfoExtraRec::GetFilename() {
+    return "DBFilesClient\\CreatureDisplayInfoExtra.dbc";
+}
+
+uint32_t CreatureDisplayInfoExtraRec::GetNumColumns() {
+    return 21;
+}
+
+uint32_t CreatureDisplayInfoExtraRec::GetRowSize() {
+    return 84;
+}
+
+bool CreatureDisplayInfoExtraRec::NeedIDAssigned() {
+    return false;
+}
+
+int32_t CreatureDisplayInfoExtraRec::GetID() {
+    return this->m_ID;
+}
+
+void CreatureDisplayInfoExtraRec::SetID(int32_t id) {
+    this->m_ID = id;
+}
+
+bool CreatureDisplayInfoExtraRec::Read(SFile* f, const char* stringBuffer) {
+    uint32_t bakeNameOfs;
+
+    if (
+        !SFile::Read(f, &this->m_ID, sizeof(this->m_ID), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_displayRaceID, sizeof(this->m_displayRaceID), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_displaySexID, sizeof(this->m_displaySexID), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_skinID, sizeof(this->m_skinID), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_faceID, sizeof(this->m_faceID), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_hairStyleID, sizeof(this->m_hairStyleID), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_hairColorID, sizeof(this->m_hairColorID), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_facialHairID, sizeof(this->m_facialHairID), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_npcitemDisplay[0], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_npcitemDisplay[1], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_npcitemDisplay[2], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_npcitemDisplay[3], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_npcitemDisplay[4], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_npcitemDisplay[5], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_npcitemDisplay[6], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_npcitemDisplay[7], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_npcitemDisplay[8], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_npcitemDisplay[9], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_npcitemDisplay[10], sizeof(m_npcitemDisplay[0]), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &this->m_flags, sizeof(this->m_flags), nullptr, nullptr, nullptr)
+        || !SFile::Read(f, &bakeNameOfs, sizeof(uint32_t), nullptr, nullptr, nullptr)
+    ) {
+        return false;
+    }
+
+    if (stringBuffer) {
+        this->m_bakeName = &stringBuffer[bakeNameOfs];
+    } else {
+        this->m_bakeName = "";
+    }
+
+    return true;
+}

src/db/rec/CreatureDisplayInfoExtraRec.hpp

@@ -0,0 +1,32 @@
+// DO NOT EDIT: generated by whoa-autocode
+#ifndef DB_REC_CREATURE_DISPLAY_INFO_EXTRA_REC_HPP
+#define DB_REC_CREATURE_DISPLAY_INFO_EXTRA_REC_HPP
+
+#include <cstdint>
+
+class SFile;
+
+class CreatureDisplayInfoExtraRec {
+    public:
+        int32_t m_ID;
+        int32_t m_displayRaceID;
+        int32_t m_displaySexID;
+        int32_t m_skinID;
+        int32_t m_faceID;
+        int32_t m_hairStyleID;
+        int32_t m_hairColorID;
+        int32_t m_facialHairID;
+        int32_t m_npcitemDisplay[11];
+        int32_t m_flags;
+        const char* m_bakeName;
+
+        static const char* GetFilename();
+        static uint32_t GetNumColumns();
+        static uint32_t GetRowSize();
+        static bool NeedIDAssigned();
+        int32_t GetID();
+        void SetID(int32_t id);
+        bool Read(SFile* f, const char* stringBuffer);
+};
+
+#endif

src/glue/CCharacterSelectionScript.cpp

@@ -1,4 +1,5 @@
 #include "glue/CCharacterSelectionScript.hpp"
+#include "CGlueMgr.hpp"
 #include "db/Db.hpp"
 #include "glue/CCharacterSelection.hpp"
 #include "object/client/CGUnit_C.hpp"
@@ -157,7 +158,17 @@ int32_t Script_SelectCharacter(lua_State* L) {
 }
 
 int32_t Script_DeleteCharacter(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
+    if (!lua_isnumber(L, 1)) {
+        luaL_error(L, "Usage: DeleteCharacter(index)");
+    }
+
+    int32_t index = static_cast<int32_t>(lua_tonumber(L, 1)) - 1;
+
+    if (index >= 0 && index < CCharacterSelection::s_characterList.Count()) {
+        CGlueMgr::DeleteCharacter(CCharacterSelection::s_characterList.m_data[index].m_info.guid);
+    }
+
+    return 0;
 }
 
 int32_t Script_RenameCharacter(lua_State* L) {

src/glue/CGlueMgr.cpp

@@ -129,6 +129,17 @@ void CGlueMgr::ChangeRealm(const REALM_INFO* realmInfo) {
     ClientServices::Connection()->Connect();
 }
 
+void CGlueMgr::DeleteCharacter(uint64_t guid) {
+    if (guid) {
+        CGlueMgr::SetIdleState(IDLE_DELETE_CHARACTER);
+
+        auto text = FrameScript_GetText(ClientServices::GetErrorToken(70), -1, GENDER_NOT_APPLICABLE);
+        FrameScript_SignalEvent(OPEN_STATUS_DIALOG, "%s%s", "CANCEL", text);
+
+        ClientServices::CharacterDelete(guid);
+    }
+}
+
 void CGlueMgr::EnterWorld() {
     if (!ClientServices::GetSelectedRealm()) {
         return;

src/glue/CGlueMgr.hpp

@@ -66,6 +66,7 @@ class CGlueMgr {
         // Static functions
         static void CancelRealmListQuery();
         static void ChangeRealm(const REALM_INFO* realmInfo);
+        static void DeleteCharacter(uint64_t guid);
         static void DisplayLoginStatus();
         static void EnterWorld();
         static void GetCharacterList();

src/net/connection/ClientConnection.cpp

@@ -1,6 +1,7 @@
 #include "net/connection/ClientConnection.hpp"
-#include "net/Login.hpp"
 #include "client/ClientServices.hpp"
+#include "common/datastore/CDataStore.hpp"
+#include "net/Login.hpp"
 #include "ui/FrameScript.hpp"
 
 void ClientConnection::AccountLogin(const char* name, const char* password, int32_t region, WOW_LOCALE locale) {
@@ -160,3 +161,19 @@ int32_t ClientConnection::PollStatus(WOWCS_OPS& op, const char** msg, int32_t& r
 
     return this->m_statusComplete;
 }
+
+void ClientConnection::RequestCharacterDelete(uint64_t guid) {
+    this->Initiate(COP_DELETE_CHARACTER, 70, nullptr);
+
+    if (this->IsConnected()) {
+        CDataStore netMsg;
+        netMsg.Put(static_cast<uint32_t>(CMSG_CHAR_DELETE));
+        netMsg.Put(guid);
+        netMsg.Finalize();
+
+        this->Send(&netMsg);
+    }
+    else {
+        this->Cancel(4);
+    }
+}

src/net/connection/ClientConnection.hpp

@@ -43,6 +43,7 @@ class ClientConnection : public RealmConnection {
         void Initiate(WOWCS_OPS op, int32_t errorCode, void (*cleanup)());
         int32_t IsConnected();
         int32_t PollStatus(WOWCS_OPS& op, const char** msg, int32_t& result, int32_t& errorCode);
+        void RequestCharacterDelete(uint64_t guid);
 };
 
 #endif