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

- missed file from previous commit

Browse Source 
- minor fixes
This commit is contained in:
Ivan Savenko
2011-07-01 16:26:36 +00:00
parent a89895452a
commit 48e79b163c
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/CPlayerInterface.cpp
View File

@ -2200,7 +2200,7 @@ void CPlayerInterface::artifactRemoved(const ArtifactLocation &al)
{ {
if(isa->type & IShowActivable::WITH_ARTIFACTS) if(isa->type & IShowActivable::WITH_ARTIFACTS)
{ {
(dynamic_cast<CWindowWithArtifacts*>(isa))->artifactRemoved(al); (dynamic_cast<CArtifactHolder*>(isa))->artifactRemoved(al);
} }
} }
} }
@ -2212,7 +2212,7 @@ void CPlayerInterface::artifactMoved(const ArtifactLocation &src, const Artifact
{ {
if(isa->type & IShowActivable::WITH_ARTIFACTS) if(isa->type & IShowActivable::WITH_ARTIFACTS)
{ {
(dynamic_cast<CWindowWithArtifacts*>(isa))->artifactMoved(src, dst); (dynamic_cast<CArtifactHolder*>(isa))->artifactMoved(src, dst);
} }
} }
} }
@ -2224,7 +2224,7 @@ void CPlayerInterface::artifactAssembled(const ArtifactLocation &al)
{ {
if(isa->type & IShowActivable::WITH_ARTIFACTS) if(isa->type & IShowActivable::WITH_ARTIFACTS)
{ {
(dynamic_cast<CWindowWithArtifacts*>(isa))->artifactAssembled(al); (dynamic_cast<CArtifactHolder*>(isa))->artifactAssembled(al);
} }
} }
} }
@ -2236,7 +2236,7 @@ void CPlayerInterface::artifactDisassembled(const ArtifactLocation &al)
{ {
if(isa->type & IShowActivable::WITH_ARTIFACTS) if(isa->type & IShowActivable::WITH_ARTIFACTS)
{ {
(dynamic_cast<CWindowWithArtifacts*>(isa))->artifactAssembled(al); (dynamic_cast<CArtifactHolder*>(isa))->artifactDisassembled(al);
} }
} }
} }

2
client/Client.cpp
View File

@ -432,7 +432,7 @@ void CClient::newGame( CConnection *con, StartInfo *si )
hotSeat = (humanPlayers > 1); hotSeat = (humanPlayers > 1);
std::vector<FileInfo> scriptModules; std::vector<FileInfo> scriptModules;
CFileUtility::getFilesWithExt(scriptModules, "./Scripting", ".dll"); CFileUtility::getFilesWithExt(scriptModules, LIB_DIR "/Scripting", "." LIB_EXT);
BOOST_FOREACH(FileInfo &m, scriptModules) BOOST_FOREACH(FileInfo &m, scriptModules)
{ {
CScriptingModule * nm = CDynLibHandler::getNewScriptingModule(m.name); CScriptingModule * nm = CDynLibHandler::getNewScriptingModule(m.name);

4
lib/IGameCallback.cpp
View File

@ -1101,7 +1101,7 @@ int CPlayerSpecificInfoCallback::howManyHeroes(bool includeGarrisoned) const
const CGHeroInstance* CPlayerSpecificInfoCallback::getHeroBySerial(int serialId) const const CGHeroInstance* CPlayerSpecificInfoCallback::getHeroBySerial(int serialId) const
{ {
const PlayerState *p = getPlayer(serialId); const PlayerState *p = getPlayer(player);
ERROR_RET_VAL_IF(!p, "No player info", NULL); ERROR_RET_VAL_IF(!p, "No player info", NULL);
ERROR_RET_VAL_IF(serialId < 0 || serialId >= p->heroes.size(), "No player info", NULL); ERROR_RET_VAL_IF(serialId < 0 || serialId >= p->heroes.size(), "No player info", NULL);
return p->heroes[serialId]; return p->heroes[serialId];
@ -1109,7 +1109,7 @@ const CGHeroInstance* CPlayerSpecificInfoCallback::getHeroBySerial(int serialId)
const CGTownInstance* CPlayerSpecificInfoCallback::getTownBySerial(int serialId) const const CGTownInstance* CPlayerSpecificInfoCallback::getTownBySerial(int serialId) const
{ {
const PlayerState *p = getPlayer(serialId); const PlayerState *p = getPlayer(player);
ERROR_RET_VAL_IF(!p, "No player info", NULL); ERROR_RET_VAL_IF(!p, "No player info", NULL);
ERROR_RET_VAL_IF(serialId < 0 || serialId >= p->towns.size(), "No player info", NULL); ERROR_RET_VAL_IF(serialId < 0 || serialId >= p->towns.size(), "No player info", NULL);
return p->towns[serialId]; return p->towns[serialId];

4
lib/map.cpp
View File

@ -1057,7 +1057,7 @@ void Mapa::readPredefinedHeroes( const unsigned char * bufor, int &i)
if(readChar(bufor,i))//customBio if(readChar(bufor,i))//customBio
cgh->biography = readString(bufor,i); cgh->biography = readString(bufor,i);
int sex = bufor[i++]; // 0xFF is default, 00 male, 01 female //FIXME:unused? cgh->sex = bufor[i++]; // 0xFF is default, 00 male, 01 female
if(readChar(bufor,i))//are spells if(readChar(bufor,i))//are spells
{ {
int ist = i; int ist = i;
@ -1755,7 +1755,7 @@ void Mapa::readObjects( const unsigned char * bufor, int &i)
nobj = hp; nobj = hp;
int a = bufor[i++]; //unkown byte, seems to be always 0 (if not - scream!) int a = bufor[i++]; //unkown byte, seems to be always 0 (if not - scream!)
tlog2 << "Unhandled Hero Placeholder detected\n"; tlog2 << "Unhandled Hero Placeholder detected: "<<a<<"\n";
int htid = bufor[i++]; //hero type id int htid = bufor[i++]; //hero type id
nobj->subID = htid; nobj->subID = htid;