Move Events methods to namespace

src/combat.cpp

@@ -14,7 +14,6 @@
 
 extern Game g_game;
 extern Weapons* g_weapons;
-extern Events* g_events;
 
 std::vector<Tile*> getList(const MatrixArea& area, const Position& targetPos, const Direction dir)
 {
@@ -260,8 +259,7 @@ ReturnValue Combat::canDoCombat(Creature* caster, Tile* tile, bool aggressive)
 	if (aggressive && tile->hasFlag(TILESTATE_PROTECTIONZONE)) {
 		return RETURNVALUE_ACTIONNOTPERMITTEDINPROTECTIONZONE;
 	}
-
-	return g_events->eventCreatureOnAreaCombat(caster, tile, aggressive);
+	return tfs::events::creature::onAreaCombat(caster, tile, aggressive);
 }
 
 bool Combat::isInPvpZone(const Creature* attacker, const Creature* target)
@@ -290,7 +288,7 @@ bool Combat::isProtected(const Player* attacker, const Player* target)
 ReturnValue Combat::canDoCombat(Creature* attacker, Creature* target)
 {
 	if (!attacker) {
-		return g_events->eventCreatureOnTargetCombat(attacker, target);
+		return tfs::events::creature::onTargetCombat(attacker, target);
 	}
 
 	if (const Player* targetPlayer = target->getPlayer()) {
@@ -369,7 +367,7 @@ ReturnValue Combat::canDoCombat(Creature* attacker, Creature* target)
 			}
 		}
 	}
-	return g_events->eventCreatureOnTargetCombat(attacker, target);
+	return tfs::events::creature::onTargetCombat(attacker, target);
 }
 
 void Combat::setPlayerCombatValues(formulaType_t formulaType, double mina, double minb, double maxa, double maxb)

src/creature.cpp

@@ -20,7 +20,6 @@ double Creature::speedC = -4795.01;
 
 extern Game g_game;
 extern CreatureEvents* g_creatureEvents;
-extern Events* g_events;
 
 Creature::Creature() { onIdleStatus(); }
 
@@ -513,7 +512,7 @@ void Creature::onCreatureMove(Creature* creature, const Tile* newTile, const Pos
 		}
 
 		if (newTile->getZone() != oldTile->getZone()) {
-			g_events->eventCreatureOnChangeZone(this, oldTile->getZone(), newTile->getZone());
+			tfs::events::creature::onChangeZone(this, oldTile->getZone(), newTile->getZone());
 			onChangeZone(getZone());
 		}
 
@@ -1684,7 +1683,8 @@ void Creature::setStorageValue(uint32_t key, std::optional<int32_t> value, bool
 	} else {
 		storageMap.erase(key);
 	}
-	g_events->eventCreatureOnUpdateStorage(this, key, oldValue, value, isSpawn);
+
+	tfs::events::creature::onUpdateStorage(this, key, oldValue, value, isSpawn);
 }
 
 std::optional<int32_t> Creature::getStorageValue(uint32_t key) const