1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00

Do not return reference to temporary.

This commit is contained in:
Frank Zago 2009-05-23 21:16:42 +00:00
parent 24449e0c41
commit a0417e95c4

View File

@ -149,6 +149,9 @@ CBuildingHandler::~CBuildingHandler()
for(std::map<int, CBuilding*>::iterator j=i->second.begin(); j!=i->second.end(); j++)
delete j->second;
}
static std::string emptyStr = "";
const std::string & CBuilding::Name()
{
if(name.length())
@ -156,7 +159,7 @@ const std::string & CBuilding::Name()
else if(vstd::contains(VLC->generaltexth->buildings,tid) && vstd::contains(VLC->generaltexth->buildings[tid],bid))
return VLC->generaltexth->buildings[tid][bid].first;
tlog2 << "Warning: Cannot find name text for building " << bid << "for " << tid << "town.\n";
return "";
return emptyStr;
}
const std::string & CBuilding::Description()
@ -166,11 +169,11 @@ const std::string & CBuilding::Description()
else if(vstd::contains(VLC->generaltexth->buildings,tid) && vstd::contains(VLC->generaltexth->buildings[tid],bid))
return VLC->generaltexth->buildings[tid][bid].second;
tlog2 << "Warning: Cannot find description text for building " << bid << "for " << tid << "town.\n";
return "";
return emptyStr;
}
CBuilding::CBuilding( int TID, int BID )
{
tid = TID;
bid = BID;
}
}