games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-05-16 09:28:24 +02:00
Code Issues Releases Activity

wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined

Browse Source 
preparation for having client and server in a single process
This commit is contained in:
Andrey Filipenkov
2022-07-26 16:07:42 +03:00
parent 1319c8f197
commit ff635edc0b
467 changed files with 2117 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vcmi/Artifact.h
+4
View File
@@ -12,6 +12,8 @@
#include "Entity.h"
VCMI_LIB_NAMESPACE_BEGIN
class ArtifactID;
class CreatureID;
@@ -25,3 +27,5 @@ public:
virtual uint32_t getPrice() const = 0;
virtual CreatureID getWarMachine() const = 0;
};
VCMI_LIB_NAMESPACE_END
include/vcmi/ArtifactService.h
+4
View File
@@ -12,6 +12,8 @@
#include "EntityService.h"
VCMI_LIB_NAMESPACE_BEGIN
class ArtifactID;
class Artifact;
@@ -19,3 +21,5 @@ class DLL_LINKAGE ArtifactService : public EntityServiceT<ArtifactID, Artifact>
{
public:
};
VCMI_LIB_NAMESPACE_END
include/vcmi/Creature.h
+4
View File
@@ -12,6 +12,8 @@
#include "Entity.h"
VCMI_LIB_NAMESPACE_BEGIN
class CreatureID;
class DLL_LINKAGE Creature : public EntityWithBonuses<CreatureID>
@@ -43,3 +45,5 @@ public:
virtual bool isDoubleWide() const = 0;
};
VCMI_LIB_NAMESPACE_END
include/vcmi/CreatureService.h
+4
View File
@@ -12,6 +12,8 @@
#include "EntityService.h"
VCMI_LIB_NAMESPACE_BEGIN
class CreatureID;
class Creature;
@@ -19,3 +21,5 @@ class DLL_LINKAGE CreatureService : public EntityServiceT<CreatureID, Creature>
{
public:
};
VCMI_LIB_NAMESPACE_END
include/vcmi/Entity.h
+4
View File
@@ -10,6 +10,8 @@
#pragma once
VCMI_LIB_NAMESPACE_BEGIN
class IBonusBearer;
class DLL_LINKAGE Entity
@@ -40,3 +42,5 @@ class DLL_LINKAGE EntityWithBonuses : public EntityT<IdType>
public:
virtual const IBonusBearer * accessBonuses() const = 0;
};
VCMI_LIB_NAMESPACE_END
include/vcmi/EntityService.h
+4
View File
@@ -10,6 +10,8 @@
#pragma once
VCMI_LIB_NAMESPACE_BEGIN
class Entity;
class DLL_LINKAGE EntityService
@@ -30,3 +32,5 @@ public:
virtual void forEach(const std::function<void(const EntityType * entity, bool & stop)> & cb) const = 0;
};
VCMI_LIB_NAMESPACE_END
include/vcmi/Environment.h
+6 -2
View File
@@ -10,6 +10,8 @@
#pragma once
VCMI_LIB_NAMESPACE_BEGIN
class Services;
class IGameInfoCallback;
@@ -23,8 +25,8 @@ namespace events
class DLL_LINKAGE Environment
{
public:
using BattleCb = ::IBattleInfoCallback;
using GameCb = ::IGameInfoCallback;
using BattleCb = IBattleInfoCallback;
using GameCb = IGameInfoCallback;
virtual ~Environment() = default;
@@ -34,3 +36,5 @@ public:
virtual vstd::CLoggerBase * logger() const = 0;
virtual events::EventBus * eventBus() const = 0;
};
VCMI_LIB_NAMESPACE_END
include/vcmi/Faction.h
+4
View File
@@ -12,6 +12,8 @@
#include "Entity.h"
VCMI_LIB_NAMESPACE_BEGIN
class FactionID;
class DLL_LINKAGE Faction : public EntityT<FactionID>
@@ -19,3 +21,5 @@ class DLL_LINKAGE Faction : public EntityT<FactionID>
public:
virtual bool hasTown() const = 0;
};
VCMI_LIB_NAMESPACE_END
include/vcmi/FactionService.h
+4
View File
@@ -12,6 +12,8 @@
#include "EntityService.h"
VCMI_LIB_NAMESPACE_BEGIN
class FactionID;
class Faction;
@@ -19,3 +21,5 @@ class DLL_LINKAGE FactionService : public EntityServiceT<FactionID, Faction>
{
public:
};
VCMI_LIB_NAMESPACE_END
include/vcmi/HeroClass.h
+4
View File
@@ -12,6 +12,8 @@
#include "Entity.h"
VCMI_LIB_NAMESPACE_BEGIN
class HeroClassID;
class DLL_LINKAGE HeroClass : public EntityT<HeroClassID>
@@ -20,3 +22,5 @@ public:
};
VCMI_LIB_NAMESPACE_END
include/vcmi/HeroClassService.h
+4
View File
@@ -12,6 +12,8 @@
#include "EntityService.h"
VCMI_LIB_NAMESPACE_BEGIN
class HeroClassID;
class HeroClass;
@@ -19,3 +21,5 @@ class DLL_LINKAGE HeroClassService : public EntityServiceT<HeroClassID, HeroClas
{
public:
};
VCMI_LIB_NAMESPACE_END
include/vcmi/HeroType.h
+4
View File
@@ -12,6 +12,8 @@
#include "Entity.h"
VCMI_LIB_NAMESPACE_BEGIN
class HeroTypeID;
class DLL_LINKAGE HeroType : public EntityT<HeroTypeID>
@@ -20,3 +22,5 @@ public:
};
VCMI_LIB_NAMESPACE_END
include/vcmi/HeroTypeService.h
+4
View File
@@ -12,6 +12,8 @@
#include "EntityService.h"
VCMI_LIB_NAMESPACE_BEGIN
class HeroTypeID;
class HeroType;
@@ -19,3 +21,5 @@ class DLL_LINKAGE HeroTypeService : public EntityServiceT<HeroTypeID, HeroType>
{
public:
};
VCMI_LIB_NAMESPACE_END
include/vcmi/Metatype.h
+4
View File
@@ -10,6 +10,8 @@
#pragma once
VCMI_LIB_NAMESPACE_BEGIN
enum class Metatype : uint32_t
{
UNKNOWN = 0,
@@ -28,3 +30,5 @@ enum class Metatype : uint32_t
SPELL
};
VCMI_LIB_NAMESPACE_END
include/vcmi/Player.h
+3 -4
View File
@@ -10,6 +10,8 @@
#pragma once
VCMI_LIB_NAMESPACE_BEGIN
class PlayerColor;
class TeamID;
class IBonusBearer;
@@ -24,7 +26,4 @@ public:
virtual int getResourceAmount(int type) const = 0;
};
VCMI_LIB_NAMESPACE_END
include/vcmi/ServerCallback.h
+4
View File
@@ -10,6 +10,8 @@
#pragma once
VCMI_LIB_NAMESPACE_BEGIN
namespace vstd
{
class RNG;
@@ -44,3 +46,5 @@ public:
virtual void apply(BattleObstaclesChanged * pack) = 0;
virtual void apply(CatapultAttack * pack) = 0;
};
VCMI_LIB_NAMESPACE_END
include/vcmi/Services.h
+4
View File
@@ -12,6 +12,8 @@
#include "Metatype.h"
VCMI_LIB_NAMESPACE_BEGIN
class ArtifactService;
class CreatureService;
class FactionService;
@@ -63,3 +65,5 @@ public:
virtual spells::effects::Registry * spellEffects() = 0;
//TODO: put map object types registry access here
};
VCMI_LIB_NAMESPACE_END
include/vcmi/Skill.h
+4
View File
@@ -12,6 +12,8 @@
#include "Entity.h"
VCMI_LIB_NAMESPACE_BEGIN
class SecondarySkill;
class DLL_LINKAGE Skill : public EntityT<SecondarySkill>
@@ -20,3 +22,5 @@ public:
};
VCMI_LIB_NAMESPACE_END
include/vcmi/SkillService.h
+4
View File
@@ -12,6 +12,8 @@
#include "EntityService.h"
VCMI_LIB_NAMESPACE_BEGIN
class SecondarySkill;
class Skill;
@@ -19,3 +21,5 @@ class DLL_LINKAGE SkillService : public EntityServiceT<SecondarySkill, Skill>
{
public:
};
VCMI_LIB_NAMESPACE_END
include/vcmi/events/ApplyDamage.h
+4
View File
@@ -13,6 +13,8 @@
#include "Event.h"
#include "SubscriptionRegistry.h"
VCMI_LIB_NAMESPACE_BEGIN
struct BattleStackAttacked;
namespace battle
@@ -43,3 +45,5 @@ public:
};
}
VCMI_LIB_NAMESPACE_END
include/vcmi/events/Event.h
+4
View File
@@ -10,6 +10,8 @@
#pragma once
VCMI_LIB_NAMESPACE_BEGIN
namespace events
{
@@ -27,3 +29,5 @@ public:
}
VCMI_LIB_NAMESPACE_END
include/vcmi/events/EventBus.h
+4
View File
@@ -12,6 +12,8 @@
#include "SubscriptionRegistry.h"
VCMI_LIB_NAMESPACE_BEGIN
class Environment;
namespace events
@@ -42,3 +44,5 @@ public:
}
};
}
VCMI_LIB_NAMESPACE_END
include/vcmi/events/GameResumed.h
+4
View File
@@ -13,6 +13,8 @@
#include "Event.h"
#include "SubscriptionRegistry.h"
VCMI_LIB_NAMESPACE_BEGIN
namespace events
{
@@ -33,3 +35,5 @@ public:
};
}
VCMI_LIB_NAMESPACE_END
include/vcmi/events/ObjectVisitEnded.h
+4
View File
@@ -13,6 +13,8 @@
#include "Event.h"
#include "SubscriptionRegistry.h"
VCMI_LIB_NAMESPACE_BEGIN
class PlayerColor;
class ObjectInstanceID;
@@ -38,3 +40,5 @@ public:
};
}
VCMI_LIB_NAMESPACE_END
include/vcmi/events/ObjectVisitStarted.h
+4
View File
@@ -13,6 +13,8 @@
#include "Event.h"
#include "SubscriptionRegistry.h"
VCMI_LIB_NAMESPACE_BEGIN
class PlayerColor;
class ObjectInstanceID;
@@ -41,3 +43,5 @@ public:
};
}
VCMI_LIB_NAMESPACE_END
include/vcmi/events/PlayerGotTurn.h
+4
View File
@@ -13,6 +13,8 @@
#include "Event.h"
#include "SubscriptionRegistry.h"
VCMI_LIB_NAMESPACE_BEGIN
class PlayerColor;
namespace events
@@ -39,3 +41,5 @@ public:
};
}
VCMI_LIB_NAMESPACE_END
include/vcmi/events/SubscriptionRegistry.h
+4
View File
@@ -10,6 +10,8 @@
#pragma once
VCMI_LIB_NAMESPACE_BEGIN
class Environment;
namespace events
@@ -164,3 +166,5 @@ private:
}
};
}
VCMI_LIB_NAMESPACE_END
include/vcmi/events/TurnStarted.h
+4
View File
@@ -13,6 +13,8 @@
#include "Event.h"
#include "SubscriptionRegistry.h"
VCMI_LIB_NAMESPACE_BEGIN
namespace events
{
@@ -31,3 +33,5 @@ public:
};
}
VCMI_LIB_NAMESPACE_END
include/vcmi/scripting/Service.h
+6 -2
View File
@@ -13,6 +13,8 @@
#if SCRIPTING_ENABLED
#include <vcmi/Environment.h>
VCMI_LIB_NAMESPACE_BEGIN
class Services;
class JsonNode;
class ServerCallback;
@@ -20,8 +22,8 @@ class ServerCallback;
namespace scripting
{
using BattleCb = ::Environment::BattleCb;
using GameCb = ::Environment::GameCb;
using BattleCb = Environment::BattleCb;
using GameCb = Environment::GameCb;
class DLL_LINKAGE Context
{
@@ -79,4 +81,6 @@ public:
}
VCMI_LIB_NAMESPACE_END
#endif
include/vcmi/spells/Caster.h
+4
View File
@@ -10,6 +10,8 @@
#pragma once
VCMI_LIB_NAMESPACE_BEGIN
class PlayerColor;
struct MetaString;
class ServerCallback;
@@ -66,3 +68,5 @@ public:
};
}
VCMI_LIB_NAMESPACE_END
include/vcmi/spells/Magic.h
+5 -1
View File
@@ -10,6 +10,8 @@
#pragma once
VCMI_LIB_NAMESPACE_BEGIN
struct MetaString;
namespace battle
@@ -24,7 +26,7 @@ class Caster;
class Spell;
class Mechanics;
class BattleCast;
using Destination = ::battle::Destination;
using Destination = battle::Destination;
using Target = std::vector<Destination>;
@@ -67,3 +69,5 @@ public:
};
}
VCMI_LIB_NAMESPACE_END
include/vcmi/spells/Service.h
+4
View File
@@ -12,6 +12,8 @@
#include "../EntityService.h"
VCMI_LIB_NAMESPACE_BEGIN
class SpellID;
namespace spells
@@ -24,3 +26,5 @@ public:
};
}
VCMI_LIB_NAMESPACE_END
include/vcmi/spells/Spell.h
+4
View File
@@ -12,6 +12,8 @@
#include "../Entity.h"
VCMI_LIB_NAMESPACE_BEGIN
class SpellID;
namespace spells
@@ -54,3 +56,5 @@ public:
};
}
VCMI_LIB_NAMESPACE_END
include/vstd/CLoggerBase.h
+4
View File
@@ -10,6 +10,8 @@
#pragma once
VCMI_LIB_NAMESPACE_BEGIN
namespace ELogLevel
{
enum ELogLevel
@@ -191,3 +193,5 @@ extern DLL_LINKAGE vstd::CLoggerBase * logNetwork;
extern DLL_LINKAGE vstd::CLoggerBase * logAi;
extern DLL_LINKAGE vstd::CLoggerBase * logAnim;
extern DLL_LINKAGE vstd::CLoggerBase * logMod;
VCMI_LIB_NAMESPACE_END
include/vstd/ContainerUtils.h
+3 -2
View File
@@ -10,6 +10,8 @@
#pragma once
VCMI_LIB_NAMESPACE_BEGIN
namespace vstd
{
template<typename K, typename V>
@@ -24,5 +26,4 @@ namespace vstd
}
}
VCMI_LIB_NAMESPACE_END
include/vstd/RNG.h
+4
View File
@@ -10,6 +10,8 @@
#pragma once
VCMI_LIB_NAMESPACE_BEGIN
namespace vstd
{
@@ -56,3 +58,5 @@ namespace RandomGeneratorUtil
}
}
}
VCMI_LIB_NAMESPACE_END
include/vstd/StringUtils.h
+4
View File
@@ -1,5 +1,7 @@
#pragma once
VCMI_LIB_NAMESPACE_BEGIN
namespace vstd
{
@@ -7,3 +9,5 @@ namespace vstd
DLL_LINKAGE std::pair<std::string, std::string> splitStringToPair(std::string input, char separator);
}
VCMI_LIB_NAMESPACE_END