Merge remote-tracking branch 'origin/emotes' into lugstuff
This commit is contained in:
commit
289df7ab3e
1 file changed
+2
-1
+2
-1
@@ -1752,7 +1752,8 @@ static void HU_drawChatLog(INT32 offset)
|
||||
}
|
||||
else if (msg[j] == ':' && (emote = M_VerifyEmote(msg+j, &emotelen)))
|
||||
{
|
||||
dx += HU_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT) - charwidth;
|
||||
if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
|
||||
dx += HU_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT) - charwidth;
|
||||
j += emotelen;
|
||||
}
|
||||
else
|
||||
|
||||
Reference in new issue
Block a user