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

* fixed some warnings

Browse Source
This commit is contained in:
mateuszb 2010-08-02 11:06:49 +00:00
parent 4fb50260c3
commit 34c58bc966
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/GUIClasses.cpp
View File

@ -2910,6 +2910,8 @@ std::string CTradeWindow::CTradeableItem::getName(int number /*= -1*/) const
case ARTIFACT:
return CGI->arth->artifacts[id]->Name();
}
assert(0);
return "";
}
CTradeWindow::CTradeWindow(const IMarket *Market, const CGHeroInstance *Hero, EMarketMode Mode)
@ -6259,6 +6261,8 @@ std::string CHillFortWindow::getDefForSlot(int slot)
case 1: return "APHLF1Y.DEF";
case 2: return "APHLF1G.DEF";
}
assert(0);
return "";
}
std::string CHillFortWindow::getTextForSlot(int slot)

4
server/CGameHandler.cpp
View File

@ -3242,6 +3242,7 @@ bool CGameHandler::buyArtifact(const IMarket *m, const CGHeroInstance *h, int ri
sendAndApply(&saa);
giveHeroArtifact(aid, h->id, -2);
return true;
}
bool CGameHandler::buySecSkill( const IMarket *m, const CGHeroInstance *h, int skill)
@ -3270,7 +3271,8 @@ bool CGameHandler::buySecSkill( const IMarket *m, const CGHeroInstance *h, int s
sr.val = getResource(h->tempOwner, 6) - 2000;
sendAndApply(&sr);
changeSecSkill(h->id, skill, 1, true);
changeSecSkill(h->id, skill, 1, true);
return true;
}
bool CGameHandler::tradeResources(const IMarket *market, ui32 val, ui8 player, ui32 id1, ui32 id2)