marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

C4GameMessage now always correctly retains the PictureDef parameter

Controls
David Dormagen 2013-02-02 22:19:46 +01:00
parent 6f9a11b817
commit 70d67c3793
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/C4GameMessage.cpp
View File

@ -57,27 +57,26 @@ void C4GameMessage::Init(int32_t iType, const StdStrBuf & sText, C4Object *pTarg
Delay=Max<int32_t>(C4GM_MinDelay, Text.getLength() * TextMsgDelayFactor);
DecoID=idDecoID;
this->dwFlags=dwFlags;
PictureDef=NULL;
if (pSrc)
{
// for a global message
if (pSrc->GetDef() || pSrc->GetObject())
PictureDef = pSrc;
else // a targeted message
// retain special width/height properties when using a message box on an object-local message
if (Target)
{
C4Value val;
if (pSrc->GetProperty(P_Wdt, &val))
Wdt = val.getInt();
if (pSrc->GetProperty(P_Hgt, &val))
Hgt = val.getInt();
if (pSrc->GetProperty(P_Prototype, &val))
{
PictureDef = val.getPropList();
if (!pSrc->GetDef() && !pSrc->GetObject())
PictureDef = NULL;
}
}
// retain object or definition from the proplist
PictureDef = pSrc->GetObject();
if (!PictureDef) PictureDef = pSrc->GetDef();
}
else
PictureDef = NULL;
// Permanent message
if ('@' == Text[0])
{