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

Fix code formatting

Browse Source
This commit is contained in:
Dydzio
2022-12-30 15:51:13 +01:00
parent c40dcec7cd
commit 2c09bfb22a
3 changed files with 66 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/IGameCallback.cpp
View File

@@ -110,35 +110,35 @@ void CPrivilegedInfoCallback::getAllTiles(std::unordered_set<int3, ShashInt3> &
else else
floors.push_back(level); floors.push_back(level);
for (auto zd : floors) for(auto zd: floors)
{ {
for (int xd = 0; xd < gs->map->width; xd++) for(int xd = 0; xd < gs->map->width; xd++)
{ {
for (int yd = 0; yd < gs->map->height; yd++) for(int yd = 0; yd < gs->map->height; yd++)
{ {
bool isTileEligible = false; bool isTileEligible = false;
switch(tileFilterMode) switch(tileFilterMode)
{ {
case MapTerrainFilterMode::NONE: case MapTerrainFilterMode::NONE:
isTileEligible = true; isTileEligible = true;
break; break;
case MapTerrainFilterMode::WATER: case MapTerrainFilterMode::WATER:
isTileEligible = getTile (int3 (xd,yd,zd))->terType->isWater(); isTileEligible = getTile(int3(xd, yd, zd))->terType->isWater();
break; break;
case MapTerrainFilterMode::LAND: case MapTerrainFilterMode::LAND:
isTileEligible = getTile (int3 (xd,yd,zd))->terType->isLand(); isTileEligible = getTile(int3(xd, yd, zd))->terType->isLand();
break; break;
case MapTerrainFilterMode::LAND_CARTOGRAPHER: case MapTerrainFilterMode::LAND_CARTOGRAPHER:
isTileEligible = getTile(int3 (xd,yd,zd))->terType->isSurfaceCartographerCompatible(); isTileEligible = getTile(int3(xd, yd, zd))->terType->isSurfaceCartographerCompatible();
break; break;
case MapTerrainFilterMode::UNDERGROUND_CARTOGRAPHER: case MapTerrainFilterMode::UNDERGROUND_CARTOGRAPHER:
isTileEligible = getTile(int3 (xd,yd,zd))->terType->isUndergroundCartographerCompatible(); isTileEligible = getTile(int3(xd, yd, zd))->terType->isUndergroundCartographerCompatible();
break; break;
} }
if (isTileEligible) if(isTileEligible)
tiles.insert(int3(xd,yd,zd)); tiles.insert(int3(xd, yd, zd));
} }
} }
} }

40
lib/IGameCallback.h
View File

@@ -40,23 +40,31 @@ namespace scripting
class DLL_LINKAGE CPrivilegedInfoCallback : public CGameInfoCallback class DLL_LINKAGE CPrivilegedInfoCallback : public CGameInfoCallback
{ {
public: public:
enum class MapTerrainFilterMode enum class MapTerrainFilterMode
{ {
NONE = 0, NONE = 0,
LAND = 1, LAND = 1,
WATER = 2, WATER = 2,
LAND_CARTOGRAPHER = 3, LAND_CARTOGRAPHER = 3,
UNDERGROUND_CARTOGRAPHER = 4 UNDERGROUND_CARTOGRAPHER = 4
}; };
CGameState * gameState(); CGameState *gameState();
//used for random spawns
void getFreeTiles (std::vector<int3> &tiles) const; //used for random spawns
//mode 1 - only unrevealed tiles; mode 0 - all, mode -1 - only revealed void getFreeTiles(std::vector<int3> &tiles) const;
void getTilesInRange(std::unordered_set<int3, ShashInt3> &tiles, int3 pos, int radious, boost::optional<PlayerColor> player = boost::optional<PlayerColor>(), int mode = 0, int3::EDistanceFormula formula = int3::DIST_2D) const;
//returns all tiles on given level (-1 - both levels, otherwise number of level) //mode 1 - only unrevealed tiles; mode 0 - all, mode -1 - only revealed
void getAllTiles (std::unordered_set<int3, ShashInt3> &tiles, boost::optional<PlayerColor> player = boost::optional<PlayerColor>(), int level=-1, MapTerrainFilterMode tileFilterMode = MapTerrainFilterMode::NONE) const; void getTilesInRange(std::unordered_set<int3, ShashInt3> &tiles, int3 pos, int radious,
void pickAllowedArtsSet(std::vector<const CArtifact*> &out, CRandomGenerator & rand); //gives 3 treasures, 3 minors, 1 major -> used by Black Market and Artifact Merchant boost::optional<PlayerColor> player = boost::optional<PlayerColor>(), int mode = 0,
int3::EDistanceFormula formula = int3::DIST_2D) const;
//returns all tiles on given level (-1 - both levels, otherwise number of level)
void getAllTiles(std::unordered_set<int3, ShashInt3> &tiles, boost::optional<PlayerColor> player = boost::optional<PlayerColor>(),
int level = -1, MapTerrainFilterMode tileFilterMode = MapTerrainFilterMode::NONE) const;
void pickAllowedArtsSet(std::vector<const CArtifact *> &out,
CRandomGenerator &rand); //gives 3 treasures, 3 minors, 1 major -> used by Black Market and Artifact Merchant
void getAllowedSpells(std::vector<SpellID> &out, ui16 level); void getAllowedSpells(std::vector<SpellID> &out, ui16 level);
template<typename Saver> template<typename Saver>

36
lib/mapObjects/MiscObjects.cpp
View File

@@ -2068,9 +2068,9 @@ void CCartographer::onHeroVisit( const CGHeroInstance * h ) const
void CCartographer::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const void CCartographer::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const
{ {
if (answer) //if hero wants to buy map if(answer) //if hero wants to buy map
{ {
cb->giveResource (hero->tempOwner, Res::GOLD, -1000); cb->giveResource(hero->tempOwner, Res::GOLD, -1000);
FoWChange fw; FoWChange fw;
fw.mode = 1; fw.mode = 1;
fw.player = hero->tempOwner; fw.player = hero->tempOwner;
@@ -2078,24 +2078,24 @@ void CCartographer::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answ
//subIDs of different types of cartographers: //subIDs of different types of cartographers:
//water = 0; land = 1; underground = 2; //water = 0; land = 1; underground = 2;
IGameCallback::MapTerrainFilterMode tileFilterMode = IGameCallback::MapTerrainFilterMode::NONE; IGameCallback::MapTerrainFilterMode tileFilterMode = IGameCallback::MapTerrainFilterMode::NONE;
switch(subID) switch(subID)
{ {
case 0: case 0:
tileFilterMode = CPrivilegedInfoCallback::MapTerrainFilterMode::WATER; tileFilterMode = CPrivilegedInfoCallback::MapTerrainFilterMode::WATER;
break; break;
case 1: case 1:
tileFilterMode = CPrivilegedInfoCallback::MapTerrainFilterMode::LAND_CARTOGRAPHER; tileFilterMode = CPrivilegedInfoCallback::MapTerrainFilterMode::LAND_CARTOGRAPHER;
break; break;
case 2: case 2:
tileFilterMode = CPrivilegedInfoCallback::MapTerrainFilterMode::UNDERGROUND_CARTOGRAPHER; tileFilterMode = CPrivilegedInfoCallback::MapTerrainFilterMode::UNDERGROUND_CARTOGRAPHER;
break; break;
} }
cb->getAllTiles (fw.tiles, hero->tempOwner, -1, tileFilterMode); //reveal appropriate tiles cb->getAllTiles(fw.tiles, hero->tempOwner, -1, tileFilterMode); //reveal appropriate tiles
cb->sendAndApply (&fw); cb->sendAndApply(&fw);
cb->setObjProperty (id, CCartographer::OBJPROP_VISITED, hero->tempOwner.getNum()); cb->setObjProperty(id, CCartographer::OBJPROP_VISITED, hero->tempOwner.getNum());
} }
} }