Merge ioguild into guild (#3949)

otland · May 9, 2022 · ff54e22 · ff54e22
1 parent 8c3e171
commit ff54e22
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 111 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -27,7 +27,6 @@ set(tfs_SRC
 	${CMAKE_CURRENT_LIST_DIR}/house.cpp
 	${CMAKE_CURRENT_LIST_DIR}/housetile.cpp
 	${CMAKE_CURRENT_LIST_DIR}/inbox.cpp
-	${CMAKE_CURRENT_LIST_DIR}/ioguild.cpp
 	${CMAKE_CURRENT_LIST_DIR}/iologindata.cpp
 	${CMAKE_CURRENT_LIST_DIR}/iomap.cpp
 	${CMAKE_CURRENT_LIST_DIR}/iomapserialize.cpp
@@ -77,4 +76,3 @@ set(tfs_SRC
 	${CMAKE_CURRENT_LIST_DIR}/wildcardtree.cpp
 	${CMAKE_CURRENT_LIST_DIR}/xtea.cpp
 	PARENT_SCOPE)
-
diff --git a/src/guild.cpp b/src/guild.cpp
@@ -81,3 +81,30 @@ void Guild::addRank(uint32_t rankId, const std::string& rankName, uint8_t level)
 {
 	ranks.emplace_back(std::make_shared<GuildRank>(rankId, rankName, level));
 }
+
+Guild* IOGuild::loadGuild(uint32_t guildId)
+{
+	Database& db = Database::getInstance();
+	if (DBResult_ptr result = db.storeQuery(fmt::format("SELECT `name` FROM `guilds` WHERE `id` = {:d}", guildId))) {
+		Guild* guild = new Guild(guildId, result->getString("name"));
+
+		if ((result = db.storeQuery(fmt::format("SELECT `id`, `name`, `level` FROM `guild_ranks` WHERE `guild_id` = {:d}", guildId)))) {
+			do {
+				guild->addRank(result->getNumber<uint32_t>("id"), result->getString("name"), result->getNumber<uint16_t>("level"));
+			} while (result->next());
+		}
+		return guild;
+	}
+	return nullptr;
+}
+
+uint32_t IOGuild::getGuildIdByName(const std::string& name)
+{
+	Database& db = Database::getInstance();
+
+	DBResult_ptr result = db.storeQuery(fmt::format("SELECT `id` FROM `guilds` WHERE `name` = {:s}", db.escapeString(name)));
+	if (!result) {
+		return 0;
+	}
+	return result->getNumber<uint32_t>("id");
+}
diff --git a/src/guild.h b/src/guild.h
@@ -81,4 +81,12 @@ class Guild
 		uint32_t memberCount = 0;
 };
 
+using GuildWarVector = std::vector<uint32_t>;
+
+namespace IOGuild
+{
+	Guild* loadGuild(uint32_t guildId);
+	uint32_t getGuildIdByName(const std::string& name);
+};
+
 #endif
diff --git a/src/ioguild.cpp b/src/ioguild.cpp
diff --git a/src/ioguild.h b/src/ioguild.h
diff --git a/src/iologindata.cpp b/src/iologindata.cpp
@@ -220,6 +220,25 @@ bool IOLoginData::loadPlayerByName(Player* player, const std::string& name)
 	return loadPlayer(player, db.storeQuery(fmt::format("SELECT `id`, `name`, `account_id`, `group_id`, `sex`, `vocation`, `experience`, `level`, `maglevel`, `health`, `healthmax`, `blessings`, `mana`, `manamax`, `manaspent`, `soul`, `lookbody`, `lookfeet`, `lookhead`, `looklegs`, `looktype`, `lookaddons`, `posx`, `posy`, `posz`, `cap`, `lastlogin`, `lastlogout`, `lastip`, `conditions`, `skulltime`, `skull`, `town_id`, `balance`, `offlinetraining_time`, `offlinetraining_skill`, `stamina`, `skill_fist`, `skill_fist_tries`, `skill_club`, `skill_club_tries`, `skill_sword`, `skill_sword_tries`, `skill_axe`, `skill_axe_tries`, `skill_dist`, `skill_dist_tries`, `skill_shielding`, `skill_shielding_tries`, `skill_fishing`, `skill_fishing_tries`, `direction` FROM `players` WHERE `name` = {:s}", db.escapeString(name))));
 }
 
+static GuildWarVector getWarList(uint32_t guildId)
+{
+	DBResult_ptr result = Database::getInstance().storeQuery(fmt::format("SELECT `guild1`, `guild2` FROM `guild_wars` WHERE (`guild1` = {:d} OR `guild2` = {:d}) AND `ended` = 0 AND `status` = 1", guildId, guildId));
+	if (!result) {
+		return {};
+	}
+
+	GuildWarVector guildWarVector;
+	do {
+		uint32_t guild1 = result->getNumber<uint32_t>("guild1");
+		if (guildId != guild1) {
+			guildWarVector.push_back(guild1);
+		} else {
+			guildWarVector.push_back(result->getNumber<uint32_t>("guild2"));
+		}
+	} while (result->next());
+	return std::move(guildWarVector);
+}
+
 bool IOLoginData::loadPlayer(Player* player, DBResult_ptr result)
 {
 	if (!result) {
@@ -402,8 +421,7 @@ bool IOLoginData::loadPlayer(Player* player, DBResult_ptr result)
 			}
 
 			player->guildRank = rank;
-
-			IOGuild::getWarList(guildId, player->guildWarVector);
+			player->guildWarVector = getWarList(guildId);
 
 			if ((result = db.storeQuery(fmt::format("SELECT COUNT(*) AS `members` FROM `guild_membership` WHERE `guild_id` = {:d}", guildId)))) {
 				guild->setMemberCount(result->getNumber<uint32_t>("members"));

diff --git a/src/player.h b/src/player.h
@@ -27,7 +27,6 @@
 #include "enums.h"
 #include "vocation.h"
 #include "protocolgame.h"
-#include "ioguild.h"
 #include "party.h"
 #include "inbox.h"
 #include "depotchest.h"

diff --git a/vc17/theforgottenserver.vcxproj b/vc17/theforgottenserver.vcxproj
@@ -186,7 +186,6 @@
     <ClCompile Include="..\src\house.cpp" />
     <ClCompile Include="..\src\housetile.cpp" />
     <ClCompile Include="..\src\inbox.cpp" />
-    <ClCompile Include="..\src\ioguild.cpp" />
     <ClCompile Include="..\src\iologindata.cpp" />
     <ClCompile Include="..\src\iomap.cpp" />
     <ClCompile Include="..\src\iomapserialize.cpp" />
@@ -275,7 +274,6 @@
     <ClInclude Include="..\src\house.h" />
     <ClInclude Include="..\src\housetile.h" />
     <ClInclude Include="..\src\inbox.h" />
-    <ClInclude Include="..\src\ioguild.h" />
     <ClInclude Include="..\src\iologindata.h" />
     <ClInclude Include="..\src\iomap.h" />
     <ClInclude Include="..\src\iomapserialize.h" />