← Back to branch summary

~ubuntu-branches/ubuntu/trusty/manaplus/trusty

« back to all changes in this revision

Viewing changes to src/net/ea/chathandler.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2013-12-02 13:52:14 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20131202135214-75nrorshqrxju2av
Tags: 1.3.11.24-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/net/ea/chathandler.cpp
42
42
 
43
43
#include "debug.h"
44
44
 
 
45
extern unsigned int tmwServerVersion;
 
46
 
45
47
namespace Ea
46
48
{
47
49
 
287
289
    std::string sender_name = ((pos == std::string::npos)
288
290
        ? "" : chatMsg.substr(0, pos));
289
291
 
290
 
    if (sender_name != being->getName() && being->getType() == Being::PLAYER)
 
292
    if (tmwServerVersion > 0)
 
293
    {
 
294
        // work around for "new" tmw server
 
295
        sender_name = being->getName();
 
296
        if (sender_name.empty())
 
297
            sender_name = "?";
 
298
    }
 
299
    else if (sender_name != being->getName()
 
300
             && being->getType() == Being::PLAYER)
291
301
    {
292
302
        if (!being->getName().empty())
293
303
            sender_name = being->getName();