games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00
Code Issues Releases Activity

* minor changes (a few new consts introduced)

Browse Source
This commit is contained in:
mateuszb
2009-09-25 12:33:29 +00:00
parent 4ba26635b6
commit 4dbc54f335
4 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/CGameState.cpp
View File

@ -1692,18 +1692,18 @@ const CGHeroInstance * CGameState::battleGetOwner(int stackID)
} }
UpgradeInfo CGameState::getUpgradeInfo(CArmedInstance *obj, int stackPos) UpgradeInfo CGameState::getUpgradeInfo(const CArmedInstance *obj, int stackPos)
{ {
UpgradeInfo ret; UpgradeInfo ret;
CCreature *base = &VLC->creh->creatures[obj->army.slots[stackPos].first]; const CCreature *base = &VLC->creh->creatures[obj->army.slots.find(stackPos)->first];
if((obj->ID == TOWNI_TYPE) || ((obj->ID == HEROI_TYPE) && static_cast<const CGHeroInstance*>(obj)->visitedTown)) if((obj->ID == TOWNI_TYPE) || ((obj->ID == HEROI_TYPE) && static_cast<const CGHeroInstance*>(obj)->visitedTown))
{ {
CGTownInstance * t; const CGTownInstance * t;
if(obj->ID == TOWNI_TYPE) if(obj->ID == TOWNI_TYPE)
t = static_cast<CGTownInstance *>(const_cast<CArmedInstance *>(obj)); t = static_cast<const CGTownInstance *>(obj);
else else
t = static_cast<const CGHeroInstance*>(obj)->visitedTown; t = static_cast<const CGHeroInstance*>(obj)->visitedTown;
for(std::set<si32>::iterator i=t->builtBuildings.begin(); i!=t->builtBuildings.end(); i++) for(std::set<si32>::const_iterator i=t->builtBuildings.begin(); i!=t->builtBuildings.end(); i++)
{ {
if( (*i) >= 37 && (*i) < 44 ) //upgraded creature dwelling if( (*i) >= 37 && (*i) < 44 ) //upgraded creature dwelling
{ {

2
lib/CGameState.h
View File

@ -349,7 +349,7 @@ public:
const CGHeroInstance * battleGetOwner(int stackID); //returns hero that owns given stack; NULL if none const CGHeroInstance * battleGetOwner(int stackID); //returns hero that owns given stack; NULL if none
si8 battleMaxSpellLevel(); //calculates maximum spell level possible to be cast on battlefield - takes into account artifacts of both heroes; if no effects are set, SPELL_LEVELS is returned si8 battleMaxSpellLevel(); //calculates maximum spell level possible to be cast on battlefield - takes into account artifacts of both heroes; if no effects are set, SPELL_LEVELS is returned
bool battleCanShoot(int ID, int dest); //determines if stack with given ID shoot at the selected destination bool battleCanShoot(int ID, int dest); //determines if stack with given ID shoot at the selected destination
UpgradeInfo getUpgradeInfo(CArmedInstance *obj, int stackPos); UpgradeInfo getUpgradeInfo(const CArmedInstance *obj, int stackPos);
float getMarketEfficiency(int player, int mode=0); float getMarketEfficiency(int player, int mode=0);
int canBuildStructure(const CGTownInstance *t, int ID);// 0 - no more than one capitol, 1 - lack of water, 2 - forbidden, 3 - Add another level to Mage Guild, 4 - already built, 5 - cannot build, 6 - cannot afford, 7 - build, 8 - lack of requirements int canBuildStructure(const CGTownInstance *t, int ID);// 0 - no more than one capitol, 1 - lack of water, 2 - forbidden, 3 - Add another level to Mage Guild, 4 - already built, 5 - cannot build, 6 - cannot afford, 7 - build, 8 - lack of requirements
bool checkForVisitableDir(const int3 & src, const int3 & dst) const; //check if src tile is visitable from dst tile bool checkForVisitableDir(const int3 & src, const int3 & dst) const; //check if src tile is visitable from dst tile

44
lib/map.cpp
View File

@ -151,7 +151,7 @@ static EDefType getDefType(CGDefInfo * a)
return TERRAINOBJ_DEF; // nothing to be handled return TERRAINOBJ_DEF; // nothing to be handled
} }
} }
static int readNormalNr (unsigned char * bufor, int pos, int bytCon = 4, bool cyclic = false) static int readNormalNr (const unsigned char * bufor, int pos, int bytCon = 4, bool cyclic = false)
{ {
int ret=0; int ret=0;
int amp=1; int amp=1;
@ -166,11 +166,11 @@ static int readNormalNr (unsigned char * bufor, int pos, int bytCon = 4, bool cy
} }
return ret; return ret;
} }
static char readChar(unsigned char * bufor, int &i) static char readChar(const unsigned char * bufor, int &i)
{ {
return bufor[i++]; return bufor[i++];
} }
static std::string readString(unsigned char * bufor, int &i) static std::string readString(const unsigned char * bufor, int &i)
{ {
int len = readNormalNr(bufor,i); i+=4; int len = readNormalNr(bufor,i); i+=4;
std::string ret; ret.reserve(len); std::string ret; ret.reserve(len);
@ -180,7 +180,7 @@ static std::string readString(unsigned char * bufor, int &i)
} }
return ret; return ret;
} }
static CCreatureSet readCreatureSet(unsigned char * bufor, int &i, int number, bool version) //version==true for >RoE maps static CCreatureSet readCreatureSet(const unsigned char * bufor, int &i, int number, bool version) //version==true for >RoE maps
{ {
if(version) if(version)
{ {
@ -219,7 +219,7 @@ static CCreatureSet readCreatureSet(unsigned char * bufor, int &i, int number, b
return ret; return ret;
} }
} }
CMapHeader::CMapHeader(unsigned char *map) CMapHeader::CMapHeader(const unsigned char *map)
{ {
int i=0; int i=0;
initFromMemory(map,i); initFromMemory(map,i);
@ -231,7 +231,7 @@ CMapHeader::CMapHeader()
height = width = twoLevel = -1; height = width = twoLevel = -1;
} }
void CMapHeader::initFromMemory( unsigned char *bufor, int &i ) void CMapHeader::initFromMemory( const unsigned char *bufor, int &i )
{ {
version = (Eformat)(readNormalNr(bufor,i)); i+=4; //map version version = (Eformat)(readNormalNr(bufor,i)); i+=4; //map version
areAnyPLayers = readChar(bufor,i); //invalid on some maps areAnyPLayers = readChar(bufor,i); //invalid on some maps
@ -277,7 +277,7 @@ void CMapHeader::initFromMemory( unsigned char *bufor, int &i )
if(version>RoE) //probably reserved for further heroes if(version>RoE) //probably reserved for further heroes
i+=4; i+=4;
} }
void CMapHeader::loadPlayerInfo( int &pom, unsigned char * bufor, int &i ) void CMapHeader::loadPlayerInfo( int &pom, const unsigned char * bufor, int &i )
{ {
players.resize(8); players.resize(8);
for (pom=0;pom<8;pom++) for (pom=0;pom<8;pom++)
@ -363,7 +363,7 @@ void CMapHeader::loadPlayerInfo( int &pom, unsigned char * bufor, int &i )
} }
} }
void CMapHeader::loadViCLossConditions( unsigned char * bufor, int &i) void CMapHeader::loadViCLossConditions( const unsigned char * bufor, int &i)
{ {
victoryCondition.condition = (EvictoryConditions)bufor[i++]; victoryCondition.condition = (EvictoryConditions)bufor[i++];
if (victoryCondition.condition != winStandard) //specific victory conditions if (victoryCondition.condition != winStandard) //specific victory conditions
@ -477,7 +477,7 @@ CMapHeader::~CMapHeader()
} }
void Mapa::initFromBytes(unsigned char * bufor) void Mapa::initFromBytes(const unsigned char * bufor)
{ {
int i=0; int i=0;
initFromMemory(bufor,i); initFromMemory(bufor,i);
@ -659,7 +659,7 @@ CGHeroInstance * Mapa::getHero(int ID, int mode)
return NULL; return NULL;
} }
int Mapa::loadSeerHut( unsigned char * bufor, int i, CGObjectInstance *& nobj ) int Mapa::loadSeerHut( const unsigned char * bufor, int i, CGObjectInstance *& nobj )
{ {
CGSeerHut *hut = new CGSeerHut(); CGSeerHut *hut = new CGSeerHut();
nobj = hut; nobj = hut;
@ -762,7 +762,7 @@ int Mapa::loadSeerHut( unsigned char * bufor, int i, CGObjectInstance *& nobj )
return i; return i;
} }
void Mapa::loadTown( CGObjectInstance * &nobj, unsigned char * bufor, int &i, int subid) void Mapa::loadTown( CGObjectInstance * &nobj, const unsigned char * bufor, int &i, int subid)
{ {
CGTownInstance * nt = new CGTownInstance(); CGTownInstance * nt = new CGTownInstance();
//(*(static_cast<CGObjectInstance*>(nt))) = *nobj; //(*(static_cast<CGObjectInstance*>(nt))) = *nobj;
@ -894,7 +894,7 @@ void Mapa::loadTown( CGObjectInstance * &nobj, unsigned char * bufor, int &i, in
nt->garrisonHero = NULL; nt->garrisonHero = NULL;
} }
void Mapa::loadHero( CGObjectInstance * &nobj, unsigned char * bufor, int &i ) void Mapa::loadHero( CGObjectInstance * &nobj, const unsigned char * bufor, int &i )
{ {
CGHeroInstance * nhi = new CGHeroInstance; CGHeroInstance * nhi = new CGHeroInstance;
nobj=nhi; nobj=nhi;
@ -1073,7 +1073,7 @@ void Mapa::loadHero( CGObjectInstance * &nobj, unsigned char * bufor, int &i )
nhi->movement = -1; nhi->movement = -1;
} }
void Mapa::readRumors( unsigned char * bufor, int &i) void Mapa::readRumors( const unsigned char * bufor, int &i)
{ {
int rumNr = readNormalNr(bufor,i,4);i+=4; int rumNr = readNormalNr(bufor,i,4);i+=4;
for (int it=0;it<rumNr;it++) for (int it=0;it<rumNr;it++)
@ -1089,7 +1089,7 @@ void Mapa::readRumors( unsigned char * bufor, int &i)
} }
} }
void Mapa::readHeader( unsigned char * bufor, int &i) void Mapa::readHeader( const unsigned char * bufor, int &i)
{ {
//reading allowed heroes (20 bytes) //reading allowed heroes (20 bytes)
int ist = i; int ist = i;
@ -1176,7 +1176,7 @@ void Mapa::readHeader( unsigned char * bufor, int &i)
} }
} }
void Mapa::readPredefinedHeroes( unsigned char * bufor, int &i) void Mapa::readPredefinedHeroes( const unsigned char * bufor, int &i)
{ {
switch(version) switch(version)
{ {
@ -1283,7 +1283,7 @@ void Mapa::readPredefinedHeroes( unsigned char * bufor, int &i)
} }
} }
void Mapa::readTerrain( unsigned char * bufor, int &i) void Mapa::readTerrain( const unsigned char * bufor, int &i)
{ {
terrain = new TerrainTile**[width]; // allocate memory terrain = new TerrainTile**[width]; // allocate memory
for (int ii=0;ii<width;ii++) for (int ii=0;ii<width;ii++)
@ -1328,7 +1328,7 @@ void Mapa::readTerrain( unsigned char * bufor, int &i)
} }
} }
void Mapa::readDefInfo( unsigned char * bufor, int &i) void Mapa::readDefInfo( const unsigned char * bufor, int &i)
{ {
int defAmount = readNormalNr(bufor,i); i+=4; int defAmount = readNormalNr(bufor,i); i+=4;
defy.reserve(defAmount); defy.reserve(defAmount);
@ -1402,7 +1402,7 @@ void Mapa::readDefInfo( unsigned char * bufor, int &i)
} }
} }
void Mapa::readObjects( unsigned char * bufor, int &i) void Mapa::readObjects( const unsigned char * bufor, int &i)
{ {
int howManyObjs = readNormalNr(bufor,i, 4); i+=4; int howManyObjs = readNormalNr(bufor,i, 4); i+=4;
for(int ww=0; ww<howManyObjs; ++ww) //comment this line to turn loading objects off for(int ww=0; ww<howManyObjs; ++ww) //comment this line to turn loading objects off
@ -1978,7 +1978,7 @@ void Mapa::readObjects( unsigned char * bufor, int &i)
std::sort(heroes.begin(), heroes.end(), boost::bind(&CGHeroInstance::subID, _1) < boost::bind(&CGHeroInstance::subID, _2)); std::sort(heroes.begin(), heroes.end(), boost::bind(&CGHeroInstance::subID, _1) < boost::bind(&CGHeroInstance::subID, _2));
} }
void Mapa::readEvents( unsigned char * bufor, int &i ) void Mapa::readEvents( const unsigned char * bufor, int &i )
{ {
int numberOfEvents = readNormalNr(bufor,i); i+=4; int numberOfEvents = readNormalNr(bufor,i); i+=4;
for(int yyoo=0; yyoo<numberOfEvents; ++yyoo) for(int yyoo=0; yyoo<numberOfEvents; ++yyoo)
@ -2027,7 +2027,7 @@ bool Mapa::isInTheMap(const int3 &pos) const
else return true; else return true;
} }
void Mapa::loadQuest(CQuest * guard, unsigned char * bufor, int & i) void Mapa::loadQuest(CQuest * guard, const unsigned char * bufor, int & i)
{ {
guard->missionType = bufor[i]; ++i; guard->missionType = bufor[i]; ++i;
int len1, len2, len3; int len1, len2, len3;
@ -2137,7 +2137,7 @@ void CMapInfo::countPlayers()
} }
} }
CMapInfo::CMapInfo(const std::string &fname, unsigned char *map ) CMapInfo::CMapInfo(const std::string &fname, const unsigned char *map )
{ {
init(fname, map); init(fname, map);
} }
@ -2147,7 +2147,7 @@ CMapInfo::CMapInfo()
version = invalid; version = invalid;
} }
void CMapInfo::init(const std::string &fname, unsigned char *map ) void CMapInfo::init(const std::string &fname, const unsigned char *map )
{ {
filename = fname; filename = fname;
int i = 0; int i = 0;

38
lib/map.h
View File

@ -221,10 +221,10 @@ public:
std::vector<PlayerInfo> players; // info about players - size 8 std::vector<PlayerInfo> players; // info about players - size 8
ui8 howManyTeams; ui8 howManyTeams;
std::vector<ui8> allowedHeroes; //allowedHeroes[hero_ID] - if the hero is allowed std::vector<ui8> allowedHeroes; //allowedHeroes[hero_ID] - if the hero is allowed
void initFromMemory(unsigned char *bufor, int &i); void initFromMemory(const unsigned char *bufor, int &i);
void loadViCLossConditions( unsigned char * bufor, int &i); void loadViCLossConditions( const unsigned char * bufor, int &i);
void loadPlayerInfo( int &pom, unsigned char * bufor, int &i); void loadPlayerInfo( int &pom, const unsigned char * bufor, int &i);
CMapHeader(unsigned char *map); //an argument is a reference to string described a map (unpacked) CMapHeader(const unsigned char *map); //an argument is a reference to string described a map (unpacked)
CMapHeader(); CMapHeader();
virtual ~CMapHeader(); virtual ~CMapHeader();
@ -244,8 +244,8 @@ public:
std::string date; std::string date;
int playerAmnt, humenPlayers; int playerAmnt, humenPlayers;
CMapInfo(); CMapInfo();
CMapInfo(const std::string &fname, unsigned char *map); CMapInfo(const std::string &fname, const unsigned char *map);
void init(const std::string &fname, unsigned char *map); void init(const std::string &fname, const unsigned char *map);
void countPlayers(); void countPlayers();
}; };
@ -254,7 +254,7 @@ class DLL_EXPORT mapSorter
{ {
public: public:
ESortBy sortBy; ESortBy sortBy;
bool operator()(CMapHeader *a, CMapHeader *b) bool operator()(const CMapHeader *a, const CMapHeader *b)
{ {
switch (sortBy) switch (sortBy)
{ {
@ -315,19 +315,19 @@ struct DLL_EXPORT Mapa : public CMapHeader
std::vector<CGHeroInstance*> heroes; std::vector<CGHeroInstance*> heroes;
std::vector<CGTownInstance*> towns; std::vector<CGTownInstance*> towns;
void initFromBytes(unsigned char * bufor); //creates map from decompressed .h3m data void initFromBytes( const unsigned char * bufor); //creates map from decompressed .h3m data
void readEvents( unsigned char * bufor, int &i); void readEvents( const unsigned char * bufor, int &i);
void readObjects( unsigned char * bufor, int &i); void readObjects( const unsigned char * bufor, int &i);
void loadQuest( CQuest * guard, unsigned char * bufor, int & i); void loadQuest( CQuest * guard, const unsigned char * bufor, int & i);
void readDefInfo( unsigned char * bufor, int &i); void readDefInfo( const unsigned char * bufor, int &i);
void readTerrain( unsigned char * bufor, int &i); void readTerrain( const unsigned char * bufor, int &i);
void readPredefinedHeroes( unsigned char * bufor, int &i); void readPredefinedHeroes( const unsigned char * bufor, int &i);
void readHeader( unsigned char * bufor, int &i); void readHeader( const unsigned char * bufor, int &i);
void readRumors( unsigned char * bufor, int &i); void readRumors( const unsigned char * bufor, int &i);
void loadHero( CGObjectInstance * &nobj, unsigned char * bufor, int &i); void loadHero( CGObjectInstance * &nobj, const unsigned char * bufor, int &i);
void loadTown( CGObjectInstance * &nobj, unsigned char * bufor, int &i, int subid); void loadTown( CGObjectInstance * &nobj, const unsigned char * bufor, int &i, int subid);
int loadSeerHut( unsigned char * bufor, int i, CGObjectInstance *& nobj); int loadSeerHut( const unsigned char * bufor, int i, CGObjectInstance *& nobj);
void addBlockVisTiles(CGObjectInstance * obj); void addBlockVisTiles(CGObjectInstance * obj);