josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Some fix. Finally usable.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2008-12-26 21:45:02 -06:00
parent ce5d661061
commit 566ed175e4
10 changed files with 44 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Language.h
+6 -6
View File
@@ -650,7 +650,7 @@ enum TrinityStrings
// LANG_YOUR_ARENA_TEAM_FULL = 716, an opcode exists for this
/*LANG_BG_AV_ALLY = 717,
LANG_BG_AV_ALLY = 717,
LANG_BG_AV_HORDE = 718,
LANG_BG_AV_TOWER_TAKEN = 719,
LANG_BG_AV_TOWER_ASSAULTED = 720,
@@ -677,7 +677,7 @@ enum TrinityStrings
LANG_BG_AV_NODE_GRAVE_FROST = 739,
LANG_BG_AV_NODE_TOWER_FROST_E = 740,
LANG_BG_AV_NODE_TOWER_FROST_W = 741,
LANG_BG_AV_NODE_GRAVE_FROST_HUT = 742,*/
LANG_BG_AV_NODE_GRAVE_FROST_HUT = 742,
LANG_BG_AV_ONEMINTOSTART = 743,
LANG_BG_AV_HALFMINTOSTART = 744,
@@ -689,7 +689,7 @@ enum TrinityStrings
// Room for BG/ARENA 750-769 not used
/* LANG_ARENA_TESTING = 785,
LANG_ARENA_TESTING = 785,
LANG_AUTO_ANN = 786,
LANG_ANNOUNCE_COLOR = 787,
@@ -711,14 +711,14 @@ enum TrinityStrings
LANG_CANNOT_TELE_TO_BG = 1135, // "You cannot teleport to a battleground or arena map."
LANG_CANNOT_SUMMON_TO_BG = 1136, // "You cannot summon players to a battleground or arena map."
LANG_CANNOT_GO_TO_BG_GM = 1137, // "You must be in GM mode to teleport to a player in a battleground."
LANG_CANNOT_GO_TO_BG_FROM_BG = 1138, // "You cannot teleport to a battleground from another battleground. Please leave the current battleground first."*/
LANG_CANNOT_GO_TO_BG_FROM_BG = 1138, // "You cannot teleport to a battleground from another battleground. Please leave the current battleground first."
// = 716, not used
LANG_BG_STARTED_ANNOUNCE_WORLD = 717,
LANG_ARENA_QUEUE_ANNOUNCE_WORLD_JOIN= 718,
LANG_ARENA_QUEUE_ANNOUNCE_WORLD_EXIT= 719,
LANG_BG_GROUP_TOO_LARGE = 720, // "Your group is too large for this battleground. Please regroup to join."
/*LANG_BG_GROUP_TOO_LARGE = 720, // "Your group is too large for this battleground. Please regroup to join."
LANG_ARENA_GROUP_TOO_LARGE = 721, // "Your group is too large for this arena. Please regroup to join."
LANG_ARENA_YOUR_TEAM_ONLY = 722, // "Your group has members not in your arena team. Please regroup to join."
LANG_ARENA_NOT_ENOUGH_PLAYERS = 723, // "Your group does not have enough players to join this match."
@@ -735,7 +735,7 @@ enum TrinityStrings
LANG_CANNOT_TELE_TO_BG = 733, // "You cannot teleport to a battleground or arena map."
LANG_CANNOT_SUMMON_TO_BG = 734, // "You cannot summon players to a battleground or arena map."
LANG_CANNOT_GO_TO_BG_GM = 735, // "You must be in GM mode to teleport to a player in a battleground."
LANG_CANNOT_GO_TO_BG_FROM_BG = 736, // "You cannot teleport to a battleground from another battleground. Please leave the current battleground first."
LANG_CANNOT_GO_TO_BG_FROM_BG = 736, // "You cannot teleport to a battleground from another battleground. Please leave the current battleground first."*/
// Room for batleground/arena strings 737-799 not used
// in game strings
src/game/Level1.cpp
+12 -12
View File
@@ -123,8 +123,7 @@ bool ChatHandler::HandleNameAnnounceCommand(const char* args)
WorldPacket data;
if(!*args)
return false;
//char str[1024];
//sprintf(str, GetTrinityString(LANG_ANNOUNCE_COLOR), m_session->GetPlayer()->GetName(), args);
sWorld.SendWorldText(LANG_ANNOUNCE_COLOR, m_session->GetPlayer()->GetName(), args);
return true;
}
@@ -1761,9 +1760,9 @@ bool ChatHandler::HandleLookupAreaCommand(const char* args)
// send area in "id - [name]" format
std::ostringstream ss;
if (m_session)
ss << areaEntry->ID << " - |cffffffff|Harea:" << areaEntry->ID << "|h[" << name << " " << localeNames[loc]<< "]|h|r";
else
ss << areaEntry->ID << " - " << name << " " << localeNames[loc];
ss << areaEntry->ID << " - |cffffffff|Harea:" << areaEntry->ID << "|h[" << name << " " << localeNames[loc]<< "]|h|r";
else
ss << areaEntry->ID << " - " << name << " " << localeNames[loc];
SendSysMessage (ss.str ().c_str());
@@ -1771,8 +1770,10 @@ bool ChatHandler::HandleLookupAreaCommand(const char* args)
}
}
}
if (counter == 0) // if counter == 0 then we found nth
SendSysMessage (LANG_COMMAND_NOAREAFOUND);
return true;
}
@@ -1801,7 +1802,7 @@ bool ChatHandler::HandleLookupTeleCommand(const char * args)
std::ostringstream reply;
GameTeleMap const & teleMap = objmgr.GetGameTeleMap();
GameTeleMap const & teleMap = objmgr.GetGameTeleMap();
for(GameTeleMap::const_iterator itr = teleMap.begin(); itr != teleMap.end(); ++itr)
{
GameTele const* tele = &itr->second;
@@ -1810,9 +1811,9 @@ bool ChatHandler::HandleLookupTeleCommand(const char * args)
continue;
if (m_session)
reply << " |cffffffff|Htele:" << itr->first << "|h[" << tele->name << "]|h|r\n";
else
reply << " " << itr->first << " " << tele->name << "\n";
reply << " |cffffffff|Htele:" << itr->first << "|h[" << tele->name << "]|h|r\n";
else
reply << " " << itr->first << " " << tele->name << "\n";
}
if(reply.str().empty())
@@ -1959,7 +1960,6 @@ bool ChatHandler::HandleSendMailCommand(const char* args)
return false;
}
uint32 mailId = objmgr.GenerateMailID();
// from console show not existed sender
uint32 sender_guidlo = m_session ? m_session->GetPlayer()->GetGUIDLow() : 0;
@@ -2157,7 +2157,7 @@ bool ChatHandler::HandleGroupgoCommand(const char* args)
return false;
}
Map* gmMap = MapManager::Instance().GetMap(m_session->GetPlayer()->GetMapId(),m_session->GetPlayer());
Map* gmMap = m_session->GetPlayer()->GetMap();
bool to_instance = gmMap->Instanceable();
// we are in instance, and can summon only player in our group with us as lead
@@ -2187,7 +2187,7 @@ bool ChatHandler::HandleGroupgoCommand(const char* args)
if (to_instance)
{
Map* plMap = MapManager::Instance().GetMap(pl->GetMapId(),pl);
Map* plMap = pl->GetMap();
if ( plMap->Instanceable() && plMap->GetInstanceId() != gmMap->GetInstanceId() )
{