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

CButton GUI class (partial rewrite of CAdventureButton),

Browse Source 
bugs fixes, warnings elimination
This commit is contained in:
paracelsus
2013-03-10 18:26:10 +00:00
parent d4a74b536d
commit 6cef1dd8d8
26 changed files with 323 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/CPlayerInterface.cpp
View File

@ -959,7 +959,7 @@ void CPlayerInterface::showInfoDialog(const std::string &text, const std::vector
return;
}
std::vector<CComponent*> intComps;
for(int i=0;i<components.size();i++)
for(size_t i=0; i<components.size(); ++i)
intComps.push_back(new CComponent(*components[i]));
showInfoDialog(text,intComps,soundID);
@ -1016,7 +1016,7 @@ void CPlayerInterface::showBlockingDialog( const std::string &text, const std::v
if(!selection && cancel) //simple yes/no dialog
{
std::vector<CComponent*> intComps;
for(int i=0;i<components.size();i++)
for(size_t i=0; i<components.size(); ++i)
intComps.push_back(new CComponent(components[i])); //will be deleted by close in window
showYesNoDialog(text, boost::bind(&CCallback::selectionMade,cb,1,askID),boost::bind(&CCallback::selectionMade,cb,0,askID),true, intComps);
@ -1024,7 +1024,7 @@ void CPlayerInterface::showBlockingDialog( const std::string &text, const std::v
else if(selection)
{
std::vector<CSelectableComponent*> intComps;
for(int i=0;i<components.size();i++)
for(size_t i=0; i<components.size(); ++i)
intComps.push_back(new CSelectableComponent(components[i])); //will be deleted by CSelWindow::close
std::vector<std::pair<std::string,CFunctionList<void()> > > pom;
@ -1438,7 +1438,7 @@ void CPlayerInterface::initializeHeroTownList()
wanderingHeroes = newWanderingHeroes;
newWanderingHeroes.clear();*/
for (int i = 0; i < allHeroes.size(); i++)
for (size_t i = 0; i < allHeroes.size(); ++i)
if (!allHeroes[i]->inTownGarrison)
wanderingHeroes += allHeroes[i];
@ -1455,7 +1455,7 @@ void CPlayerInterface::initializeHeroTownList()
towns.clear();
towns = newTowns;
newTowns.clear();*/
for(int i = 0; i < allTowns.size(); i++)
for(size_t i = 0; i < allTowns.size(); ++i)
towns.push_back(allTowns[i]);
if (adventureInt)