From 0b30838d20f7227ace5b4e8555608c556a0d2cae Mon Sep 17 00:00:00 2001 From: Antz Date: Fri, 12 Nov 2021 17:36:26 +0000 Subject: [PATCH] [Styling] Some minor styling fixes --- src/game/WorldHandlers/World.cpp | 6 +++--- src/game/WorldHandlers/World.h | 1 + src/game/vmap/WorldModel.cpp | 36 ++++++++++++++++++-------------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/game/WorldHandlers/World.cpp b/src/game/WorldHandlers/World.cpp index 55fb4414..a35aff7a 100644 --- a/src/game/WorldHandlers/World.cpp +++ b/src/game/WorldHandlers/World.cpp @@ -1816,9 +1816,9 @@ namespace MaNGOS do_helper(data_list, &str[0]); } else - { - do_helper(data_list, (char*)text); - } + { + do_helper(data_list, (char*)text); + } } private: char* lineFromMessage(char*& pos) diff --git a/src/game/WorldHandlers/World.h b/src/game/WorldHandlers/World.h index 11fcea03..59c73332 100644 --- a/src/game/WorldHandlers/World.h +++ b/src/game/WorldHandlers/World.h @@ -364,6 +364,7 @@ enum eConfigBoolValues CONFIG_BOOL_PLAYERBOT_COLLECT_OBJECTS, CONFIG_BOOL_PLAYERBOT_SELL_TRASH, #endif + // Warden CONFIG_BOOL_WARDEN_WIN_ENABLED, CONFIG_BOOL_WARDEN_OSX_ENABLED, CONFIG_BOOL_GM_TICKET_OFFLINE_CLOSING, diff --git a/src/game/vmap/WorldModel.cpp b/src/game/vmap/WorldModel.cpp index 1557c8d8..f93ea107 100644 --- a/src/game/vmap/WorldModel.cpp +++ b/src/game/vmap/WorldModel.cpp @@ -384,9 +384,11 @@ namespace VMAP result = false; } 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 @@ -410,9 +412,11 @@ namespace VMAP result = false; } if (chunkSize) - if (result) { - result = iLiquid->WriteToFile(wf); + if (result) + { + result = iLiquid->WriteToFile(wf); + } } return result; @@ -483,14 +487,14 @@ namespace VMAP } if (count) { - if (result) - { - triangles.resize(count); - } - if (result && fread(&triangles[0], sizeof(MeshTriangle), count, rf) != count) - { - result = false; - } + if (result) + { + triangles.resize(count); + } + if (result && fread(&triangles[0], sizeof(MeshTriangle), count, rf) != count) + { + result = false; + } } // read mesh BIH @@ -729,10 +733,10 @@ namespace VMAP count = groupModels.size(); if (count) { - if (result && fwrite("GMOD", 1, 4, wf) != 4) - { - result = false; - } + if (result && fwrite("GMOD", 1, 4, wf) != 4) + { + result = false; + } // chunkSize = sizeof(uint32)+ sizeof(GroupModel)*count; // if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; if (result && fwrite(&count, sizeof(uint32), 1, wf) != 1)