Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-14 11:34:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix to creature name formatting and scrollarea maximum option

Browse Source
This commit is contained in:
Henrique Santiago
2012-08-09 21:36:52 -03:00
parent 96af3d3fcc
commit 47f0d7f3a6
5 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/otclient/game.cpp
View File

@@ -1199,3 +1199,11 @@ void Game::setFollowingCreature(const CreaturePtr& creature)
g_lua.callGlobalField("g_game", "onFollowingCreatureChange", creature, oldCreature);
}
std::string Game::formatCreatureName(const std::string& name)
{
std::string formatedName = name;
if(g_lua.callGlobalField<bool>("g_game", "isCreatureNameFormatEnabled") && name.length() > 0)
formatedName[0] = stdext::upchar(formatedName[0]);
return formatedName;
}

2
src/otclient/game.h
View File

@@ -268,6 +268,8 @@ public:
std::string getWorldName() { return m_worldName; }
std::vector<uint8> getGMActions() { return m_gmActions; }
std::string formatCreatureName(const std::string &name);
protected:
void enableBotCall() { m_denyBotCall = false; }
void disableBotCall() { m_denyBotCall = true; }

22
src/otclient/protocolgameparse.cpp
View File

@@ -626,7 +626,7 @@ void ProtocolGame::parseCloseNpcTrade(const InputMessagePtr&)
void ProtocolGame::parseOwnTrade(const InputMessagePtr& msg)
{
std::string name = msg->getString();
std::string name = g_game.formatCreatureName(msg->getString());
int count = msg->getU8();
std::vector<ItemPtr> items(count);
@@ -638,7 +638,7 @@ void ProtocolGame::parseOwnTrade(const InputMessagePtr& msg)
void ProtocolGame::parseCounterTrade(const InputMessagePtr& msg)
{
std::string name = msg->getString();
std::string name = g_game.formatCreatureName(msg->getString());
int count = msg->getU8();
std::vector<ItemPtr> items(count);
@@ -962,7 +962,7 @@ void ProtocolGame::parseTalk(const InputMessagePtr& msg)
{
msg->getU32(); // channel statement guid
std::string name = msg->getString();
std::string name = g_game.formatCreatureName(msg->getString());
int level = msg->getU16();
Otc::MessageMode mode = Proto::translateMessageModeFromServer(msg->getU8());
int channelId = 0;
@@ -1025,10 +1025,10 @@ void ProtocolGame::parseOpenChannel(const InputMessagePtr& msg)
if(g_game.getFeature(Otc::GameChannelPlayerList)) {
int joinedPlayers = msg->getU16();
for(int i=0;i<joinedPlayers;++i)
msg->getString(); // player name
g_game.formatCreatureName(msg->getString()); // player name
int invitedPlayers = msg->getU16();
for(int i=0;i<invitedPlayers;++i)
msg->getString(); // player name
g_game.formatCreatureName(msg->getString()); // player name
}
g_game.processOpenChannel(channelId, name);
@@ -1036,7 +1036,7 @@ void ProtocolGame::parseOpenChannel(const InputMessagePtr& msg)
void ProtocolGame::parseOpenPrivateChannel(const InputMessagePtr& msg)
{
std::string name = msg->getString();
std::string name = g_game.formatCreatureName(msg->getString());
g_game.processOpenPrivateChannel(name);
}
@@ -1226,7 +1226,7 @@ void ProtocolGame::parseOpenOutfitWindow(const InputMessagePtr& msg)
void ProtocolGame::parseVipAdd(const InputMessagePtr& msg)
{
uint id = msg->getU32();
std::string name = msg->getString();
std::string name = g_game.formatCreatureName(msg->getString());
bool online = msg->getU8() != 0;
g_game.processVipAdd(id, name, online);
@@ -1289,7 +1289,7 @@ void ProtocolGame::parseQuestLine(const InputMessagePtr& msg)
void ProtocolGame::parseChannelEvent(const InputMessagePtr& msg)
{
msg->getU16(); // channel id
msg->getString(); // player name
g_game.formatCreatureName(msg->getString()); // player name
msg->getU8(); // event type
}
@@ -1517,11 +1517,7 @@ CreaturePtr ProtocolGame::getCreature(const InputMessagePtr& msg, int type)
creatureType = Proto::CreatureTypeNpc;
}
std::string name = msg->getString();
// every creature name must start with a capital letter
if(name.length() > 0)
name[0] = toupper(name[0]);
std::string name = g_game.formatCreatureName(msg->getString());
if(id == m_localPlayer->getId())
creature = m_localPlayer;