Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-19 08:30:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix warnings" and fix warning properly

Browse Source
This commit is contained in:
Ovahlord
2018-07-23 15:58:39 +02:00
parent a0e288e761
commit cd60e908c0
11 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/Commands/cs_go.cpp
View File

@@ -431,7 +431,7 @@ public:
if (map->Instanceable())
{
handler->PSendSysMessage(LANG_INVALID_ZONE_MAP, areaEntry->ID, areaEntry->area_name->Str[handler->GetSessionDbcLocale()], map->GetId(), map->GetMapName());
handler->PSendSysMessage(LANG_INVALID_ZONE_MAP, areaEntry->ID, areaEntry->area_name, map->GetId(), map->GetMapName());
handler->SetSentErrorMessage(true);
return false;
}

2
src/server/scripts/Commands/cs_group.cpp
View File

@@ -432,7 +432,7 @@ public:
{
AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->zone);
if (zone)
zoneName = zone->area_name->Str[localeConstant];
zoneName = zone->area_name[localeConstant];
}
}
else

2
src/server/scripts/Commands/cs_list.cpp
View File

@@ -681,7 +681,7 @@ public:
static char const* GetZoneName(uint32 zoneId, LocaleConstant locale)
{
AreaTableEntry const* zoneEntry = sAreaTableStore.LookupEntry(zoneId);
return zoneEntry ? zoneEntry->area_name->Str[locale] : "<unknown zone>";
return zoneEntry ? zoneEntry->area_name : "<unknown zone>";
}
static bool HandleListRespawnsCommand(ChatHandler* handler, char const* args)
{

2
src/server/scripts/Commands/cs_lookup.cpp
View File

@@ -104,7 +104,7 @@ public:
// Search in AreaTable.dbc
for (AreaTableEntry const* areaEntry : sAreaTableStore)
{
std::string name = areaEntry->area_name->Str[handler->GetSessionDbcLocale()];
std::string name = areaEntry->area_name;
if (name.empty())
continue;

2
src/server/scripts/Commands/cs_message.cpp
View File

@@ -88,7 +88,7 @@ public:
AreaTableEntry const* zoneEntry = nullptr;
for (AreaTableEntry const* entry : sAreaTableStore)
{
if (strstr(entry->area_name->Str[handler->GetSessionDbcLocale()], channelStr))
if (strstr(entry->area_name, channelStr))
{
zoneEntry = entry;
break;

8
src/server/scripts/Commands/cs_misc.cpp
View File

@@ -277,8 +277,8 @@ public:
handler->PSendSysMessage(LANG_MAP_POSITION,
mapId, (mapEntry ? mapEntry->name : unknown),
zoneId, (zoneEntry ? zoneEntry->area_name->Str[handler->GetSessionDbcLocale()] : unknown),
areaId, (areaEntry ? areaEntry->area_name->Str[handler->GetSessionDbcLocale()] : unknown),
zoneId, (zoneEntry ? zoneEntry->area_name : unknown),
areaId, (areaEntry ? areaEntry->area_name : unknown),
object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation());
if (Transport* transport = object->GetTransport())
handler->PSendSysMessage(LANG_TRANSPORT_POSITION,
@@ -1833,11 +1833,11 @@ public:
AreaTableEntry const* area = sAreaTableStore.LookupEntry(areaId);
if (area)
{
areaName = area->area_name->Str[handler->GetSessionDbcLocale()];;
areaName = area->area_name;
AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->zone);
if (zone)
zoneName = zone->area_name->Str[handler->GetSessionDbcLocale()];
zoneName = zone->area_name;
}
if (target)