games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Fix 2292. Fix chat on adventure map, increase maxOutputPerLine

Browse Source
This commit is contained in:
ArseniyShestakov 2015-11-08 22:16:58 +03:00
parent 3aa5360ac6
commit a49950e958
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/CMT.cpp
View File

@ -529,8 +529,9 @@ void processCommand(const std::string &message)
std::string cn; //command name
readed >> cn;
if(LOCPLINT && LOCPLINT->cingconsole)
LOCPLINT->cingconsole->print(message);
// Check mantis issue 2292 for details
// if(LOCPLINT && LOCPLINT->cingconsole)
// LOCPLINT->cingconsole->print(message);
if(ermInteractiveMode)
{
@ -789,11 +790,12 @@ void processCommand(const std::string &message)
Settings session = settings.write["session"];
session["autoSkip"].Bool() = !session["autoSkip"].Bool();
}
else if(client && client->serv && client->serv->connected && LOCPLINT) //send to server
// Check mantis issue 2292 for details
/* else if(client && client->serv && client->serv->connected && LOCPLINT) //send to server
{
boost::unique_lock<boost::recursive_mutex> un(*LOCPLINT->pim);
LOCPLINT->cb->sendMessage(message);
}
}*/
}
//plays intro, ends when intro is over or button has been pressed (handles events)

6
client/NetPacksClient.cpp
View File

@ -819,10 +819,10 @@ void SaveGame::applyCl(CClient *cl)
void PlayerMessage::applyCl(CClient *cl)
{
std::ostringstream str;
str << "Player "<< player <<" sends a message: " << text;
logNetwork->debugStream() << "Player "<< player <<" sends a message: " << text;
logNetwork->debugStream() << str.str();
std::ostringstream str;
str << cl->getPlayer(player)->nodeName() <<": " << text;
if(LOCPLINT)
LOCPLINT->cingconsole->print(str.str());
}

4
client/windows/CAdvmapInterface.cpp
View File

@ -881,7 +881,7 @@ void CAdvMapInt::showAll(SDL_Surface * to)
statusbar.show(to);
LOCPLINT->cingconsole->showAll(to);
LOCPLINT->cingconsole->show(to);
}
bool CAdvMapInt::isHeroSleeping(const CGHeroInstance *hero)
@ -958,7 +958,7 @@ void CAdvMapInt::show(SDL_Surface * to)
for(int i=0;i<4;i++)
blitAt(gems[i]->ourImages[LOCPLINT->playerID.getNum()].bitmap,ADVOPT.gemX[i],ADVOPT.gemY[i],to);
updateScreen=false;
LOCPLINT->cingconsole->showAll(to);
LOCPLINT->cingconsole->show(to);
}
else if (terrain.needsAnimUpdate())
{

2
config/resolutions.json
View File

@ -3,7 +3,7 @@
[
{
"resolution": { "x": 800, "y": 600 },
"InGameConsole": { "maxInputPerLine": 60, "maxOutputPerLine": 39 },
"InGameConsole": { "maxInputPerLine": 60, "maxOutputPerLine": 60 },
"AdvMap": { "x": 7, "y": 7, "width": 594, "height": 546, "smoothMove": 1, "puzzleSepia": 1, "objectFading" : 1, "screenFading" : 1 },
"InfoBox": { "x": 605, "y": 389 },
"gem0": { "x": 6, "y": 508, "graphic": "agemLL.def" },