gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix particle removal, static messages colors

This commit is contained in:
Henrique Santiago 2011-12-30 06:19:43 -02:00
parent f7dd35f0dd
commit ded2133e7c
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/otclient/core/statictext.cpp
View File

@ -83,25 +83,28 @@ void StaticText::compose()
if(m_type == Otc::SpeakSay) { if(m_type == Otc::SpeakSay) {
m_text += m_name; m_text += m_name;
m_text += " says:\n"; m_text += " says:\n";
m_color = Fw::yellow; m_color = Color(239, 239, 0);
} }
else if(m_type == Otc::SpeakWhisper) { else if(m_type == Otc::SpeakWhisper) {
m_text += m_name; m_text += m_name;
m_text += " whispers:\n"; m_text += " whispers:\n";
m_color = Fw::yellow; m_color = Color(239, 239, 0);
} }
else if(m_type == Otc::SpeakYell) { else if(m_type == Otc::SpeakYell) {
m_text += m_name; m_text += m_name;
m_text += " yells:\n"; m_text += " yells:\n";
m_color = Fw::yellow; m_color = Color(239, 239, 0);
} }
else if(m_type == Otc::SpeakMonsterSay || m_type == Otc::SpeakMonsterYell) { else if(m_type == Otc::SpeakMonsterSay || m_type == Otc::SpeakMonsterYell) {
m_color = Fw::orange; m_color = Color(254, 101, 0);
} }
else if(m_type == Otc::SpeakPrivateNpcToPlayer) { else if(m_type == Otc::SpeakPrivateNpcToPlayer) {
m_text += m_name; m_text += m_name;
m_text += " says:\n"; m_text += " says:\n";
m_color = Fw::blue; m_color = Color(95, 247, 247);
}
else {
logWarning("unknown message type: ", m_type);
} }
// Todo: add break lines // Todo: add break lines

22
src/otclient/net/protocolgameparse.cpp
View File

@ -533,15 +533,11 @@ void ProtocolGame::parseMagicEffect(InputMessage& msg)
Position pos = parsePosition(msg); Position pos = parsePosition(msg);
int effectId = msg.getU8(); int effectId = msg.getU8();
if(effectId != 37) { EffectPtr effect = EffectPtr(new Effect());
EffectPtr effect = EffectPtr(new Effect()); effect->setId(effectId);
effect->setId(effectId); effect->setPosition(pos);
effect->setPosition(pos);
g_map.addThing(effect, pos); g_map.addThing(effect, pos);
}
else
g_particleManager.load("particle.otpa");
} }
void ProtocolGame::parseAnimatedText(InputMessage& msg) void ProtocolGame::parseAnimatedText(InputMessage& msg)
@ -564,12 +560,10 @@ void ProtocolGame::parseDistanceMissile(InputMessage& msg)
Position toPos = parsePosition(msg); Position toPos = parsePosition(msg);
int shotId = msg.getU8(); int shotId = msg.getU8();
if(shotId != 4) { MissilePtr shot = MissilePtr(new Missile());
MissilePtr shot = MissilePtr(new Missile()); shot->setId(shotId);
shot->setId(shotId); shot->setPath(fromPos, toPos);
shot->setPath(fromPos, toPos); g_map.addThing(shot, fromPos);
g_map.addThing(shot, fromPos);
}
} }
void ProtocolGame::parseCreatureSquare(InputMessage& msg) void ProtocolGame::parseCreatureSquare(InputMessage& msg)