server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Styling] Some minor styling fixes

Browse Source
This commit is contained in:
Antz 2021-11-12 17:36:26 +00:00 committed by Antz
parent caa2d98069
commit 0b30838d20
No known key found for this signature in database
GPG Key ID: 0DF907270598C85F
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/WorldHandlers/World.cpp
View File

@ -1816,9 +1816,9 @@ namespace MaNGOS
do_helper(data_list, &str[0]); do_helper(data_list, &str[0]);
} }
else else
{ {
do_helper(data_list, (char*)text); do_helper(data_list, (char*)text);
} }
} }
private: private:
char* lineFromMessage(char*& pos) char* lineFromMessage(char*& pos)

1
src/game/WorldHandlers/World.h
View File

@ -364,6 +364,7 @@ enum eConfigBoolValues
CONFIG_BOOL_PLAYERBOT_COLLECT_OBJECTS, CONFIG_BOOL_PLAYERBOT_COLLECT_OBJECTS,
CONFIG_BOOL_PLAYERBOT_SELL_TRASH, CONFIG_BOOL_PLAYERBOT_SELL_TRASH,
#endif #endif
// Warden
CONFIG_BOOL_WARDEN_WIN_ENABLED, CONFIG_BOOL_WARDEN_WIN_ENABLED,
CONFIG_BOOL_WARDEN_OSX_ENABLED, CONFIG_BOOL_WARDEN_OSX_ENABLED,
CONFIG_BOOL_GM_TICKET_OFFLINE_CLOSING, CONFIG_BOOL_GM_TICKET_OFFLINE_CLOSING,

36
src/game/vmap/WorldModel.cpp
View File

@ -384,9 +384,11 @@ namespace VMAP
result = false; result = false;
} }
if (count) if (count)
if (result && fwrite(&triangles[0], sizeof(MeshTriangle), count, wf) != count)
{ {
result = false; if (result && fwrite(&triangles[0], sizeof(MeshTriangle), count, wf) != count)
{
result = false;
}
} }
// write mesh BIH // write mesh BIH
@ -410,9 +412,11 @@ namespace VMAP
result = false; result = false;
} }
if (chunkSize) if (chunkSize)
if (result)
{ {
result = iLiquid->WriteToFile(wf); if (result)
{
result = iLiquid->WriteToFile(wf);
}
} }
return result; return result;
@ -483,14 +487,14 @@ namespace VMAP
} }
if (count) if (count)
{ {
if (result) if (result)
{ {
triangles.resize(count); triangles.resize(count);
} }
if (result && fread(&triangles[0], sizeof(MeshTriangle), count, rf) != count) if (result && fread(&triangles[0], sizeof(MeshTriangle), count, rf) != count)
{ {
result = false; result = false;
} }
} }
// read mesh BIH // read mesh BIH
@ -729,10 +733,10 @@ namespace VMAP
count = groupModels.size(); count = groupModels.size();
if (count) if (count)
{ {
if (result && fwrite("GMOD", 1, 4, wf) != 4) if (result && fwrite("GMOD", 1, 4, wf) != 4)
{ {
result = false; result = false;
} }
// chunkSize = sizeof(uint32)+ sizeof(GroupModel)*count; // chunkSize = sizeof(uint32)+ sizeof(GroupModel)*count;
// if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; // if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false;
if (result && fwrite(&count, sizeof(uint32), 1, wf) != 1) if (result && fwrite(&count, sizeof(uint32), 1, wf) != 1)