From 8b2a26c84a37317918ee96a91f282201e338cfda Mon Sep 17 00:00:00 2001 From: staphen Date: Sun, 25 May 2025 10:39:25 -0400 Subject: [PATCH] Apply clang-format --- Source/dapi/Player.h | 1 - Source/dapi/Server.cpp | 41 ++++++++++++++++------------------------- Source/dapi/Server.h | 22 +++++++++++----------- Source/diablo.h | 1 - Source/stores.cpp | 2 -- Source/stores.h | 2 +- 6 files changed, 28 insertions(+), 41 deletions(-) diff --git a/Source/dapi/Player.h b/Source/dapi/Player.h index bbb07286a..0ec03fa7e 100644 --- a/Source/dapi/Player.h +++ b/Source/dapi/Player.h @@ -1,7 +1,6 @@ #pragma once #include "Item.h" - namespace DAPI { const int NUM_INVLOC = 7; const int MAXINV = 40; diff --git a/Source/dapi/Server.cpp b/Source/dapi/Server.cpp index bb90a8f9f..45855c886 100644 --- a/Source/dapi/Server.cpp +++ b/Source/dapi/Server.cpp @@ -3,8 +3,6 @@ #include "Server.h" #include "qol/stash.h" - - namespace DAPI { Server::Server() : FPS(20) @@ -417,18 +415,15 @@ void Server::updateGameData() update->set_connectedto(1); - for (auto chatLogLine = data->lastLogSize; chatLogLine < devilution::ChatLogLines.size(); chatLogLine++) - { + for (auto chatLogLine = data->lastLogSize; chatLogLine < devilution::ChatLogLines.size(); chatLogLine++) { std::stringstream message; - for (auto &textLine : devilution::ChatLogLines[chatLogLine].colors) - { + for (auto &textLine : devilution::ChatLogLines[chatLogLine].colors) { if (devilution::HasAnyOf(textLine.color, devilution::UiFlags::ColorWhitegold & devilution::UiFlags::ColorBlue)) message << textLine.text << ": "; if (devilution::HasAnyOf(textLine.color, devilution::UiFlags::ColorWhite)) message << textLine.text; } - if (message.str().size()) - { + if (message.str().size()) { auto chatMessage = update->add_chatmessages(); *chatMessage = message.str(); } @@ -465,8 +460,7 @@ void Server::updateGameData() qtextss << line; } update->set_qtext(qtextss.str().c_str()); - } - else + } else update->set_qtext(""); update->set_fps(FPS); if (!devilution::gbIsMultiplayer) @@ -1057,7 +1051,6 @@ void Server::updateGameData() if (currentItem->_itype != devilution::ItemType::None) { int itemID = static_cast(data->itemList.size()); - for (auto &item : data->itemList) { if (item.compare(*currentItem)) { itemID = item.ID; @@ -1272,7 +1265,7 @@ void Server::updateGameData() } } - for (auto& missile : devilution::Missiles) { + for (auto &missile : devilution::Missiles) { if (isOnScreen(missile.position.tile.x, missile.position.tile.y)) fillMissile(missile); } @@ -1495,13 +1488,12 @@ void Server::buyItem(int itemID) if (idx == -1) return; - devilution::PlaySFX(devilution::SfxID::MenuSelect); + devilution::PlaySFX(devilution::SfxID::MenuSelect); devilution::OldTextLine = devilution::CurrentTextLine; devilution::OldScrollPos = devilution::ScrollPos; devilution::OldActiveStore = devilution::ActiveStore; - if (!devilution::PlayerCanAfford(devilution::WitchItems[idx]._iIvalue)) { devilution::StartStore(devilution::TalkID::NoMoney); return; @@ -1511,14 +1503,13 @@ void Server::buyItem(int itemID) devilution::TakePlrsMoney(devilution::WitchItems[idx]._iIvalue); - if (idx >= 3) { if (idx == devilution::NumWitchItemsHf - 1) devilution::WitchItems[devilution::NumWitchItemsHf - 1].clear(); else { - for (; !devilution::WitchItems[idx + 1].isEmpty(); idx++) { - devilution::WitchItems[idx] = std::move(devilution::WitchItems[idx + 1]); - } + for (; !devilution::WitchItems[idx + 1].isEmpty(); idx++) { + devilution::WitchItems[idx] = std::move(devilution::WitchItems[idx + 1]); + } devilution::WitchItems[idx].clear(); } } @@ -1700,7 +1691,7 @@ void Server::sellItem(int itemID) { int idx; - if (devilution::ActiveStore != devilution::TalkID::WitchSell &&devilution::ActiveStore != devilution::TalkID::SmithSell) + if (devilution::ActiveStore != devilution::TalkID::WitchSell && devilution::ActiveStore != devilution::TalkID::SmithSell) return; idx = -1; @@ -2208,7 +2199,7 @@ void Server::putCursorItem(int location) devilution::Displacement hotPixelCellOffset; if (equipLocation == EquipSlot::LEFTRING) { invRectIndex = 1; - } else if (equipLocation == EquipSlot::RIGHTRING) { + } else if (equipLocation == EquipSlot::RIGHTRING) { invRectIndex = 2; } if (equipLocation < EquipSlot::BELT1) { @@ -2217,11 +2208,11 @@ void Server::putCursorItem(int location) panelOffset = devilution::GetMainPanel().position - devilution::Point { 0, 0 }; } if (EquipSlot::INV1 <= equipLocation && equipLocation <= EquipSlot::INV40) { - const devilution::Size itemSize = devilution::GetInventorySize(devilution::MyPlayer->HoldItem); - if (itemSize.height <= 1 && itemSize.width <= 1) { - hotPixelCellOffset = devilution::Displacement { 1, 1 }; - } - hotPixelCellOffset = { (itemSize.width - 1) / 2 + 19, (itemSize.height - 1) / 2 + 19}; + const devilution::Size itemSize = devilution::GetInventorySize(devilution::MyPlayer->HoldItem); + if (itemSize.height <= 1 && itemSize.width <= 1) { + hotPixelCellOffset = devilution::Displacement { 1, 1 }; + } + hotPixelCellOffset = { (itemSize.width - 1) / 2 + 19, (itemSize.height - 1) / 2 + 19 }; } else { hotPixelCellOffset = devilution::Displacement { 1, 1 }; } diff --git a/Source/dapi/Server.h b/Source/dapi/Server.h index af1247b8d..31d95c51e 100644 --- a/Source/dapi/Server.h +++ b/Source/dapi/Server.h @@ -7,25 +7,25 @@ #include "Backend/DAPIBackendCore/DAPIProtoClient.h" #include "GameData.h" -#include "spelldat.h" -#include "player.h" #include "control.h" -#include "inv.h" -#include "towners.h" -#include "stores.h" +#include "cursor.h" #include "diablo.h" +#include "engine/random.hpp" +#include "gamemenu.h" #include "gmenu.h" -#include "cursor.h" -#include "minitext.h" +#include "inv.h" #include "levels/gendung.h" +#include "minitext.h" +#include "missiles.h" +#include "msg.h" #include "multi.h" #include "objects.h" -#include "missiles.h" +#include "player.h" #include "portal.h" -#include "msg.h" -#include "engine/random.hpp" -#include "gamemenu.h" #include "qol/chatlog.h" +#include "spelldat.h" +#include "stores.h" +#include "towners.h" namespace DAPI { enum struct CommandType { diff --git a/Source/diablo.h b/Source/diablo.h index 8be060669..de321dccb 100644 --- a/Source/diablo.h +++ b/Source/diablo.h @@ -79,7 +79,6 @@ extern clicktype sgbMouseDown; extern uint16_t gnTickDelay; extern char gszProductName[64]; - extern MouseActionType LastMouseButtonAction; void InitKeymapActions(); diff --git a/Source/stores.cpp b/Source/stores.cpp index c2ac52b49..119a610f9 100644 --- a/Source/stores.cpp +++ b/Source/stores.cpp @@ -74,8 +74,6 @@ int CurrentTextLine; namespace { - - /** Is the current dialog full size */ bool IsTextFullSize; diff --git a/Source/stores.h b/Source/stores.h index fc30c26eb..5c2449ec3 100644 --- a/Source/stores.h +++ b/Source/stores.h @@ -13,8 +13,8 @@ #include "engine/clx_sprite.hpp" #include "engine/surface.hpp" #include "game_mode.hpp" -#include "utils/attributes.h" #include "towners.h" +#include "utils/attributes.h" namespace devilution {