games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +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

6
lib/mapObjects/MiscObjects.cpp
View File

@@ -26,6 +26,8 @@
#include "../CPlayerState.h"
#include "../serializer/JsonSerializeFormat.h"
VCMI_LIB_NAMESPACE_BEGIN
std::map <si32, std::vector<ObjectInstanceID> > CGMagi::eyelist;
ui8 CGObelisk::obeliskCount = 0; //how many obelisks are on map
std::map<TeamID, ui8> CGObelisk::visited; //map: team_id => how many obelisks has been visited
@@ -2207,4 +2209,6 @@ void CGLighthouse::giveBonusTo(PlayerColor player, bool onInit) const
void CGLighthouse::serializeJsonOptions(JsonSerializeFormat& handler)
{
serializeJsonOwner(handler);
}
}
VCMI_LIB_NAMESPACE_END