Refactor vocations: Reload, extracted into tfs::game::vocations namespace and code improvements

data/cpplinter.lua

@@ -1986,6 +1986,7 @@ RELOAD_TYPE_SCRIPTS = 14
 RELOAD_TYPE_SPELLS = 15
 RELOAD_TYPE_TALKACTIONS = 16
 RELOAD_TYPE_WEAPONS = 17
+RELOAD_TYPE_VOCATIONS = 18
 
 PlayerFlag_CannotUseCombat = 1 * 2 ^ 0
 PlayerFlag_CannotAttackPlayer = 1 * 2 ^ 1

data/talkactions/scripts/reload.lua

@@ -49,6 +49,9 @@ local reloadTypes = {
 	["weapon"] = RELOAD_TYPE_WEAPONS,
 	["weapons"] = RELOAD_TYPE_WEAPONS,
 
+	["vocation"] = RELOAD_TYPE_VOCATIONS,
+	["vocations"] = RELOAD_TYPE_VOCATIONS,
+
 	["scripts"] = RELOAD_TYPE_SCRIPTS,
 	["libs"] = RELOAD_TYPE_GLOBAL
 }

src/combat.cpp

@@ -276,7 +276,7 @@ bool Combat::isProtected(const Player* attacker, const Player* target)
 		return true;
 	}
 
-	if (!attacker->getVocation()->allowsPvp() || !target->getVocation()->allowsPvp()) {
+	if (!attacker->getVocation()->allowPvp || !target->getVocation()->allowPvp) {
 		return true;
 	}
 

src/const.h

@@ -681,6 +681,7 @@ enum ReloadTypes_t : uint8_t
 	RELOAD_TYPE_SPELLS,
 	RELOAD_TYPE_TALKACTIONS,
 	RELOAD_TYPE_WEAPONS,
+	RELOAD_TYPE_VOCATIONS,
 };
 
 enum MonsterIcon_t : uint8_t

src/game.cpp

@@ -39,7 +39,6 @@ extern Actions* g_actions;
 extern Chat* g_chat;
 extern TalkActions* g_talkActions;
 extern Spells* g_spells;
-extern Vocations g_vocations;
 extern GlobalEvents* g_globalEvents;
 extern CreatureEvents* g_creatureEvents;
 extern Events* g_events;
@@ -5848,6 +5847,17 @@ bool Game::reload(ReloadTypes_t reloadType)
 			return results;
 		}
 
+		case RELOAD_TYPE_VOCATIONS: {
+			if (tfs::game::vocations::load_from_xml(true)) {
+				// Reload players vocations
+				for (const auto& [_, player] : players) {
+					player->updateVocation();
+				}
+				return true;
+			}
+			return false;
+		}
+
 		case RELOAD_TYPE_SCRIPTS: {
 			// commented out stuff is TODO, once we approach further in revscriptsys
 			g_actions->clear(true);

src/http/login.cpp

@@ -9,7 +9,6 @@
 #include <fmt/format.h>
 
 extern Game g_game;
-extern Vocations g_vocations;
 
 namespace beast = boost::beast;
 namespace json = boost::json;
@@ -99,14 +98,14 @@ std::pair<status, json::value> tfs::http::handle_login(const json::object& body,
 	uint32_t lastLogin = 0;
 	if (result) {
 		do {
-			auto vocation = g_vocations.getVocation(result->getNumber<uint32_t>("vocation"));
+			auto vocation = tfs::game::vocations::get_vocation_by_id(result->getNumber<uint32_t>("vocation"));
 			assert(vocation);
 
 			characters.push_back({
 			    {"worldid", 0}, // not implemented
 			    {"name", result->getString("name")},
 			    {"level", result->getNumber<uint32_t>("level")},
-			    {"vocation", vocation->getVocName()},
+			    {"vocation", vocation->name},
 			    {"lastlogin", result->getNumber<uint64_t>("lastlogin")},
 			    {"ismale", result->getNumber<uint16_t>("sex") == PLAYERSEX_MALE},
 			    {"ishidden", false},        // not implemented

src/iologindata.cpp

@@ -204,11 +204,13 @@ bool IOLoginData::loadPlayer(Player* player, DBResult_ptr result)
 		condition = Condition::createCondition(propStream);
 	}
 
-	if (!player->setVocation(result->getNumber<uint16_t>("vocation"))) {
+	auto vocation = tfs::game::vocations::get_vocation_by_id(result->getNumber<uint16_t>("vocation"));
+	if (!vocation) {
 		std::cout << "[Error - IOLoginData::loadPlayer] " << player->name << " has Vocation ID "
 		          << result->getNumber<uint16_t>("vocation") << " which doesn't exist" << std::endl;
 		return false;
 	}
+	player->setVocation(vocation);
 
 	player->mana = result->getNumber<uint32_t>("mana");
 	player->manaMax = result->getNumber<uint32_t>("manamax");
@@ -648,7 +650,7 @@ bool IOLoginData::savePlayer(Player* player)
 	query << "UPDATE `players` SET ";
 	query << "`level` = " << player->level << ',';
 	query << "`group_id` = " << player->group->id << ',';
-	query << "`vocation` = " << player->getVocationId() << ',';
+	query << "`vocation` = " << player->getVocation()->id << ',';
 	query << "`health` = " << player->health << ',';
 	query << "`healthmax` = " << player->healthMax << ',';
 	query << "`experience` = " << player->experience << ',';

src/item.cpp

@@ -19,7 +19,6 @@ class Spells;
 
 extern Game g_game;
 extern Spells* g_spells;
-extern Vocations g_vocations;
 
 Items Item::items;