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

Fixed #544. Final fix for #493.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2010-07-26 20:56:39 +00:00
parent dc936d5686
commit 2b899d5777
5 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/CSpellWindow.cpp
View File

@ -591,6 +591,7 @@ void CSpellWindow::SpellArea::clickLeft(tribool down, bool previousState)
char msgBuf[500]; char msgBuf[500];
sprintf(msgBuf, CGI->generaltexth->allTexts[206].c_str(), spellCost, owner->myHero->mana); sprintf(msgBuf, CGI->generaltexth->allTexts[206].c_str(), spellCost, owner->myHero->mana);
owner->myInt->showInfoDialog(std::string(msgBuf)); owner->myInt->showInfoDialog(std::string(msgBuf));
return;
} }
//battle spell on adv map or adventure map spell during combat => display infowindow, not cast //battle spell on adv map or adventure map spell during combat => display infowindow, not cast

50
hch/CArtHandler.cpp
View File

@ -358,24 +358,24 @@ int CArtHandler::convertMachineID(int id, bool creToArt )
void CArtHandler::sortArts() void CArtHandler::sortArts()
{ {
for (int i=0; i<allowedArtifacts.size(); ++i) //do 144, bo nie chcemy bzdurek // for (int i=0; i<allowedArtifacts.size(); ++i) //do 144, bo nie chcemy bzdurek
{ // {
switch (allowedArtifacts[i]->aClass) // switch (allowedArtifacts[i]->aClass)
{ // {
case CArtifact::ART_TREASURE: // case CArtifact::ART_TREASURE:
treasures.push_back(allowedArtifacts[i]); // treasures.push_back(allowedArtifacts[i]);
break; // break;
case CArtifact::ART_MINOR: // case CArtifact::ART_MINOR:
minors.push_back(allowedArtifacts[i]); // minors.push_back(allowedArtifacts[i]);
break; // break;
case CArtifact::ART_MAJOR: // case CArtifact::ART_MAJOR:
majors.push_back(allowedArtifacts[i]); // majors.push_back(allowedArtifacts[i]);
break; // break;
case CArtifact::ART_RELIC: // case CArtifact::ART_RELIC:
relics.push_back(allowedArtifacts[i]); // relics.push_back(allowedArtifacts[i]);
break; // break;
} // }
} // }
} }
void CArtHandler::erasePickedArt (si32 id) void CArtHandler::erasePickedArt (si32 id)
{ {
@ -703,10 +703,8 @@ void CArtHandler::clear()
delete art; delete art;
artifacts.clear(); artifacts.clear();
treasures.clear(); clearHlpLists();
minors.clear();
majors.clear();
relics.clear();
} }
/** /**
@ -795,3 +793,11 @@ void CArtHandler::unequipArtifact(std::map<ui16, ui32> &artifWorn, ui16 slotID)
} }
} }
} }
void CArtHandler::clearHlpLists()
{
treasures.clear();
minors.clear();
majors.clear();
relics.clear();
}

1
hch/CArtHandler.h
View File

@ -65,6 +65,7 @@ public:
void sortArts(); void sortArts();
void addBonuses(); void addBonuses();
void clear(); void clear();
void clearHlpLists();
ui16 getRandomArt (int flags); ui16 getRandomArt (int flags);
ui16 getArtSync (ui32 rand, int flags); ui16 getArtSync (ui32 rand, int flags);
void getAllowedArts(std::vector<CArtifact*> &out, std::vector<CArtifact*> *arts, int flag); void getAllowedArts(std::vector<CArtifact*> &out, std::vector<CArtifact*> *arts, int flag);

2
hch/CObjectHandler.cpp
View File

@ -828,7 +828,7 @@ void CGHeroInstance::initArmy(CCreatureSet *dst /*= NULL*/)
else else
howManyStacks = 3; howManyStacks = 3;
for(int stackNo=0; stackNo<3; stackNo++) for(int stackNo=0; stackNo < howManyStacks; stackNo++)
{ {
int creID = (VLC->creh->nameToID[type->refTypeStack[stackNo]]); int creID = (VLC->creh->nameToID[type->refTypeStack[stackNo]]);
int range = type->highStack[stackNo] - type->lowStack[stackNo]; int range = type->highStack[stackNo] - type->lowStack[stackNo];

3
lib/CGameState.cpp
View File

@ -1176,7 +1176,8 @@ CGameState::~CGameState()
} }
void CGameState::init( StartInfo * si, ui32 checksum, int Seed ) void CGameState::init( StartInfo * si, ui32 checksum, int Seed )
{ {
VLC->arth->allowedArtifacts.clear();
VLC->arth->clearHlpLists();
switch(si->mode) switch(si->mode)
{ {
case 0: case 0: