games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-12 23:57:33 +02:00
Code Issues Releases Activity

Minor compile fix, std::copy used that way overwrites original bonuses [but the code won't be needed anyway]

Browse Source
This commit is contained in:
Michał W. Urbańczyk 2011-02-09 12:33:58 +00:00
parent 72c30df16a
commit 9f21e4b46f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/CAnimation.cpp
View File

@ -195,7 +195,7 @@ void CDefFile::loadFrame(size_t frame, size_t group, ImageLoader &loader) const
case 1: case 1:
{ {
//for each line we have offset of pixel data //for each line we have offset of pixel data
const ui32 * RWEntriesLoc = reinterpret_cast<const unsigned int *>(FDef+currentOffset); const ui32 * RWEntriesLoc = reinterpret_cast<const ui32 *>(FDef+currentOffset);
currentOffset += sizeof(ui32) * sprite.height; currentOffset += sizeof(ui32) * sprite.height;
for (unsigned int i=0; i<sprite.height; i++) for (unsigned int i=0; i<sprite.height; i++)

14
lib/CCreatureHandler.cpp
View File

@ -649,13 +649,13 @@ void CCreatureHandler::loadCreatures()
loadToIt (dump2, buf, it, 3); //crop comment loadToIt (dump2, buf, it, 3); //crop comment
} while (it < buf.size()); } while (it < buf.size());
BOOST_FOREACH(CCreature *c, creatures) // BOOST_FOREACH(CCreature *c, creatures)
{ // {
if (it = c->level < 7) // if (it = c->level < 7)
std::copy(commonBonuses[it-1].begin(), commonBonuses[it-1].end(), c->bonuses.begin()); // std::copy(commonBonuses[it-1].begin(), commonBonuses[it-1].end(), c->bonuses.begin());
else // else
std::copy(commonBonuses[7].begin(), commonBonuses[7].end(), c->bonuses.begin()); //common for tiers 8+ // std::copy(commonBonuses[7].begin(), commonBonuses[7].end(), c->bonuses.begin()); //common for tiers 8+
} // }
} //end of stack experience } //end of stack experience
} }