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

Info map for terrain type. Fixes bug 5.

Browse Source
This commit is contained in:
Frank Zago
2009-10-22 02:09:14 +00:00
parent 5a9752fb8c
commit e412619ce7
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/CAdvmapInterface.cpp
View File

@ -568,8 +568,18 @@ void CTerrainRect::clickRight(tribool down, bool previousState)
} }
std::vector < const CGObjectInstance * > objs = LOCPLINT->cb->getBlockingObjs(mp); std::vector < const CGObjectInstance * > objs = LOCPLINT->cb->getBlockingObjs(mp);
if(!objs.size()) if(!objs.size()) {
// Bare or undiscovered terrain
if (down) {
const TerrainTile * tile = LOCPLINT->cb->getTileInfo(mp);
if (tile) {
CSimpleWindow * temp = CMessage::genWindow(VLC->generaltexth->terrainNames[tile->tertype],LOCPLINT->playerID,true);
CRClickPopupInt *rcpi = new CRClickPopupInt(temp,true);
GH.pushInt(rcpi);
}
}
return; return;
}
const CGObjectInstance * obj = objs.back(); const CGObjectInstance * obj = objs.back();
switch(obj->ID) switch(obj->ID)

13
hch/CGeneralTextHandler.cpp
View File

@ -285,7 +285,16 @@ void CGeneralTextHandler::load()
{ {
loadToIt(temp,buf,it,3); loadToIt(temp,buf,it,3);
restypes.push_back(temp); restypes.push_back(temp);
} }
tlog5 << "\t\tReading TERRNAME \n";
buf = bitmaph->getTextFile("TERRNAME.TXT");
it=0;
while (it<buf.length()-1)
{
loadToIt(temp,buf,it,3);
terrainNames.push_back(temp);
}
tlog5 << "\t\tReading RANDSIGN \n"; tlog5 << "\t\tReading RANDSIGN \n";
buf = bitmaph->getTextFile("RANDSIGN.TXT"); buf = bitmaph->getTextFile("RANDSIGN.TXT");
@ -439,4 +448,4 @@ std::string CGeneralTextHandler::getDescr(std::string text)
CGeneralTextHandler::CGeneralTextHandler() CGeneralTextHandler::CGeneralTextHandler()
{ {
} }

1
hch/CGeneralTextHandler.h
View File

@ -57,6 +57,7 @@ public:
std::vector<std::string> advobtxt; std::vector<std::string> advobtxt;
std::vector<std::string> xtrainfo; std::vector<std::string> xtrainfo;
std::vector<std::string> restypes; std::vector<std::string> restypes;
std::vector<std::string> terrainNames;
std::vector<std::string> randsign; std::vector<std::string> randsign;
std::vector<std::pair<std::string,std::string> > mines; //first - name; second - event description std::vector<std::pair<std::string,std::string> > mines; //first - name; second - event description