games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

Missing file.

Browse Source
This commit is contained in:
DjWarmonger 2011-02-13 13:16:41 +00:00
parent a5a493bfc1
commit adb1d9181d
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/CCreatureHandler.cpp
View File

@ -631,7 +631,9 @@ void CCreatureHandler::loadCreatures()
si32 creid = -1; si32 creid = -1;
Bonus b; //prototype with some default properties Bonus b; //prototype with some default properties
b.source = Bonus::STACK_EXPERIENCE; b.source = Bonus::STACK_EXPERIENCE;
b.duration = Bonus::PERMANENT;
b.valType = Bonus::ADDITIVE_VALUE; b.valType = Bonus::ADDITIVE_VALUE;
b.effectRange = Bonus::NO_LIMIT;
b.additionalInfo = 0; b.additionalInfo = 0;
BonusList bl; BonusList bl;
@ -642,7 +644,7 @@ void CCreatureHandler::loadCreatures()
BOOST_FOREACH(Bonus * b, bl) BOOST_FOREACH(Bonus * b, bl)
addBonusForAllCreatures(b); //health bonus is common for all addBonusForAllCreatures(b); //health bonus is common for all
loadToIt (dump2, buf, it, 4); //crop comment loadToIt (dump2, buf, it, 3); //crop comment
for (i = 1; i < 8; ++i) for (i = 1; i < 8; ++i)
{ {
for (int j = 0; j < 4; ++j) //four modifiers common for tiers for (int j = 0; j < 4; ++j) //four modifiers common for tiers
@ -693,6 +695,7 @@ void CCreatureHandler::loadCreatures()
si32 val; si32 val;
for (i = 1; i < 8; ++i) for (i = 1; i < 8; ++i)
{ {
loadToIt (dump2, buf, it, 4); //index
loadToIt (dump2, buf, it, 4); //float multiplier -> hardcoded loadToIt (dump2, buf, it, 4); //float multiplier -> hardcoded
loadToIt (dump2, buf, it, 4); //ignore upgrade mod? ->hardcoded loadToIt (dump2, buf, it, 4); //ignore upgrade mod? ->hardcoded
loadToIt (dump2, buf, it, 4); //already calculated loadToIt (dump2, buf, it, 4); //already calculated
@ -816,7 +819,9 @@ void CCreatureHandler::loadStackExp(Bonus & b, BonusList & bl, std::string & src
b.subtype = 1; b.subtype = 1;
break; break;
case 'S': case 'S':
b.type = Bonus::STACKS_SPEED; break; b.type = Bonus::STACKS_SPEED;
b.additionalInfo = 0;
break;
case 'b': case 'b':
b.type = Bonus::ENEMY_DEFENCE_REDUCTION; break; b.type = Bonus::ENEMY_DEFENCE_REDUCTION; break;
@ -964,6 +969,7 @@ void CCreatureHandler::loadStackExp(Bonus & b, BonusList & bl, std::string & src
loadToIt (curVal, src, it, 4); loadToIt (curVal, src, it, 4);
if (curVal == 1) if (curVal == 1)
{ {
b.val = curVal;
b.limiter.reset (new RankRangeLimiter(i)); b.limiter.reset (new RankRangeLimiter(i));
bl.push_back(new Bonus(b)); bl.push_back(new Bonus(b));
break; //never turned off it seems break; //never turned off it seems
@ -976,9 +982,10 @@ void CCreatureHandler::loadStackExp(Bonus & b, BonusList & bl, std::string & src
for (int i = 1; i < 11; ++i) for (int i = 1; i < 11; ++i)
{ {
loadToIt (curVal, src, it, 4); loadToIt (curVal, src, it, 4);
if (curVal > lastVal) //threshold, add last bonus if (curVal > lastVal) //threshold, add new bonus
{ {
b.val = lastVal; b.val = curVal - lastVal;
lastVal = curVal;
b.limiter.reset (new RankRangeLimiter(i)); b.limiter.reset (new RankRangeLimiter(i));
bl.push_back(new Bonus(b)); bl.push_back(new Bonus(b));
lastLev = i; //start new range from here, i = previous rank lastLev = i; //start new range from here, i = previous rank