github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-21 05:43:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

clang format

Browse source
This commit is contained in:
aMannus 2025-06-30 10:48:41 +02:00
commit 1be5ad18f5
38 changed files with 103 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

2
run-clang-format.ps1
View file

@ -45,5 +45,5 @@ for ($i = 0; $i -lt $files.Length; $i++) {
$file = $files[$i] $file = $files[$i]
$relativePath = $file.FullName.Substring($basePath.Length + 1) $relativePath = $file.FullName.Substring($basePath.Length + 1)
Write-Host "Formatting [$($i+1)/$($files.Length)] $relativePath" Write-Host "Formatting [$($i+1)/$($files.Length)] $relativePath"
.\clang-format.exe -i $file.FullName clang-format -i $file.FullName
} }

4
soh/soh/Enhancements/TimeDisplay/TimeDisplay.h
View file

@ -5,9 +5,9 @@ class TimeDisplayWindow final : public Ship::GuiWindow {
using GuiWindow::GuiWindow; using GuiWindow::GuiWindow;
void InitElement() override; void InitElement() override;
void DrawElement() override{}; void DrawElement() override {};
void Draw() override; void Draw() override;
void UpdateElement() override{}; void UpdateElement() override {};
}; };
void TimeDisplayUpdateDisplayOptions(); void TimeDisplayUpdateDisplayOptions();

4
soh/soh/Enhancements/audio/AudioEditor.h
View file

@ -13,8 +13,8 @@ class AudioEditor final : public Ship::GuiWindow {
void DrawElement() override; void DrawElement() override;
void InitElement() override; void InitElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
~AudioEditor(){}; ~AudioEditor() {};
}; };
void AudioEditor_RandomizeAll(); void AudioEditor_RandomizeAll();

8
soh/soh/Enhancements/controls/InputViewer.h
View file

@ -22,9 +22,9 @@ class InputViewer final : public Ship::GuiWindow {
using GuiWindow::GuiWindow; using GuiWindow::GuiWindow;
void Draw() override; void Draw() override;
void InitElement() override{}; void InitElement() override {};
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
InputViewer(); InputViewer();
~InputViewer(); ~InputViewer();
@ -37,9 +37,9 @@ class InputViewerSettingsWindow final : public Ship::GuiWindow {
public: public:
using GuiWindow::GuiWindow; using GuiWindow::GuiWindow;
void InitElement() override{}; void InitElement() override {};
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
InputViewerSettingsWindow(); InputViewerSettingsWindow();
~InputViewerSettingsWindow(); ~InputViewerSettingsWindow();

2
soh/soh/Enhancements/cosmetics/CosmeticsEditor.h
View file

@ -67,6 +67,6 @@ class CosmeticsEditorWindow final : public Ship::GuiWindow {
void InitElement() override; void InitElement() override;
void DrawElement() override; void DrawElement() override;
void ApplyDungeonKeyColors(); void ApplyDungeonKeyColors();
void UpdateElement() override{}; void UpdateElement() override {};
}; };
#endif //__cplusplus #endif //__cplusplus

9
soh/soh/Enhancements/custom-message/CustomMessageTypes.h
View file

@ -206,13 +206,10 @@ typedef struct {
std::string french; std::string french;
} GetItemMessage; } GetItemMessage;
#define GIMESSAGE(giid, iid, english, german, french) \ #define GIMESSAGE(giid, iid, english, german, french) { giid, iid, english, german, french }
{ giid, iid, english, german, french }
#define GIMESSAGE_UNTRANSLATED(giid, iid, message) \ #define GIMESSAGE_UNTRANSLATED(giid, iid, message) { giid, iid, message, message, message }
{ giid, iid, message, message, message }
#define GIMESSAGE_NO_GERMAN(giid, iid, english, french) \ #define GIMESSAGE_NO_GERMAN(giid, iid, english, french) { giid, iid, english, english, french }
{ giid, iid, english, english, french }
#endif #endif

6
soh/soh/Enhancements/debugger/SohStatsWindow.h
View file

@ -6,12 +6,12 @@
class SohStatsWindow final : public Ship::GuiWindow { class SohStatsWindow final : public Ship::GuiWindow {
public: public:
using GuiWindow::GuiWindow; using GuiWindow::GuiWindow;
~SohStatsWindow(){}; ~SohStatsWindow() {};
protected: protected:
void InitElement() override{}; void InitElement() override {};
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
}; };
#endif // SOH_STATS_H #endif // SOH_STATS_H

2
soh/soh/Enhancements/debugger/actorViewer.h
View file

@ -12,7 +12,7 @@ class ActorViewerWindow final : public Ship::GuiWindow {
void DrawElement() override; void DrawElement() override;
void InitElement() override; void InitElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
private: private:
Actor* display = nullptr; Actor* display = nullptr;

2
soh/soh/Enhancements/debugger/colViewer.cpp
View file

@ -159,7 +159,7 @@ void CalcTriNorm(const Vec3f& v1, const Vec3f& v2, const Vec3f& v3, Vec3f& norm)
// Various macros used for creating verticies and rendering that aren't in gbi.h // Various macros used for creating verticies and rendering that aren't in gbi.h
#define G_CC_MODULATERGB_PRIM_ENVA PRIMITIVE, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT #define G_CC_MODULATERGB_PRIM_ENVA PRIMITIVE, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT
#define G_CC_PRIMITIVE_ENVA 0, 0, 0, PRIMITIVE, 0, 0, 0, ENVIRONMENT #define G_CC_PRIMITIVE_ENVA 0, 0, 0, PRIMITIVE, 0, 0, 0, ENVIRONMENT
#define qs105(n) ((int16_t)((n)*0x0020)) #define qs105(n) ((int16_t)((n) * 0x0020))
#define gdSPDefVtxN(x, y, z, s, t, nx, ny, nz, ca) \ #define gdSPDefVtxN(x, y, z, s, t, nx, ny, nz, ca) \
{ \ { \
.n = {.ob = { x, y, z }, .tc = { qs105(s), qs105(t) }, .n = { nx, ny, nz }, .a = ca } \ .n = {.ob = { x, y, z }, .tc = { qs105(s), qs105(t) }, .n = { nx, ny, nz }, .a = ca } \

2
soh/soh/Enhancements/debugger/colViewer.h
View file

@ -11,7 +11,7 @@ class ColViewerWindow final : public Ship::GuiWindow {
void InitElement() override; void InitElement() override;
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
}; };
#endif #endif

2
soh/soh/Enhancements/debugger/debugSaveEditor.h
View file

@ -459,5 +459,5 @@ class SaveEditorWindow final : public Ship::GuiWindow {
void InitElement() override; void InitElement() override;
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
}; };

2
soh/soh/Enhancements/debugger/dlViewer.h
View file

@ -8,5 +8,5 @@ class DLViewerWindow final : public Ship::GuiWindow {
void InitElement() override; void InitElement() override;
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
}; };

2
soh/soh/Enhancements/debugger/hookDebugger.h
View file

@ -6,5 +6,5 @@ class HookDebuggerWindow final : public Ship::GuiWindow {
void InitElement() override; void InitElement() override;
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
}; };

2
soh/soh/Enhancements/debugger/valueViewer.h
View file

@ -39,7 +39,7 @@ class ValueViewerWindow final : public Ship::GuiWindow {
void InitElement() override; void InitElement() override;
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
}; };
#endif #endif

6
soh/soh/Enhancements/game-interactor/GameInteractionEffect.h
View file

@ -23,7 +23,7 @@ class RemovableGameInteractionEffect : public GameInteractionEffectBase {
GameInteractionEffectQueryResult Remove(); GameInteractionEffectQueryResult Remove();
protected: protected:
virtual void _Remove(){}; virtual void _Remove() {};
}; };
class ParameterizedGameInteractionEffect { class ParameterizedGameInteractionEffect {
@ -156,7 +156,7 @@ class ForceEquipBoots : public RemovableGameInteractionEffect, public Parameteri
void _Remove() override; void _Remove() override;
}; };
class ModifyMovementSpeedMultiplier: public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect { class ModifyMovementSpeedMultiplier : public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
GameInteractionEffectQueryResult CanBeApplied() override; GameInteractionEffectQueryResult CanBeApplied() override;
void _Apply() override; void _Apply() override;
void _Remove() override; void _Remove() override;
@ -200,7 +200,7 @@ class SetCollisionViewer : public RemovableGameInteractionEffect {
void _Remove() override; void _Remove() override;
}; };
class RandomizeCosmetics: public GameInteractionEffectBase { class RandomizeCosmetics : public GameInteractionEffectBase {
GameInteractionEffectQueryResult CanBeApplied() override; GameInteractionEffectQueryResult CanBeApplied() override;
void _Apply() override; void _Apply() override;
}; };

2
soh/soh/Enhancements/gameplaystatswindow.h
View file

@ -6,5 +6,5 @@ class GameplayStatsWindow final : public Ship::GuiWindow {
void InitElement() override; void InitElement() override;
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
}; };

18
soh/soh/Enhancements/item-tables/ItemTableTypes.h
View file

@ -30,17 +30,19 @@ typedef enum GetItemCategory {
} GetItemCategory; } GetItemCategory;
#define GET_ITEM(itemId, objectId, drawId, textId, field, chestAnim, itemCategory, modIndex, getItemId) \ #define GET_ITEM(itemId, objectId, drawId, textId, field, chestAnim, itemCategory, modIndex, getItemId) \
{ \ { itemId, field, (int16_t)((chestAnim != CHEST_ANIM_SHORT ? 1 : -1) * (drawId + 1)), \
itemId, field, (int16_t)((chestAnim != CHEST_ANIM_SHORT ? 1 : -1) * (drawId + 1)), textId, objectId, modIndex, \ textId, objectId, modIndex, \
modIndex, getItemId, drawId, true, ITEM_FROM_NPC, itemCategory, itemId, modIndex, NULL \ modIndex, getItemId, drawId, \
} true, ITEM_FROM_NPC, itemCategory, \
itemId, modIndex, NULL }
#define GET_ITEM_CUSTOM_TABLE(itemId, objectId, drawId, textId, field, chestAnim, itemCategory, modIndex, tableId, \ #define GET_ITEM_CUSTOM_TABLE(itemId, objectId, drawId, textId, field, chestAnim, itemCategory, modIndex, tableId, \
getItemId) \ getItemId) \
{ \ { itemId, field, (int16_t)((chestAnim != CHEST_ANIM_SHORT ? 1 : -1) * (drawId + 1)), \
itemId, field, (int16_t)((chestAnim != CHEST_ANIM_SHORT ? 1 : -1) * (drawId + 1)), textId, objectId, modIndex, \ textId, objectId, modIndex, \
tableId, getItemId, drawId, true, ITEM_FROM_NPC, itemCategory, itemId, modIndex, NULL \ tableId, getItemId, drawId, \
} true, ITEM_FROM_NPC, itemCategory, \
itemId, modIndex, NULL }
#define GET_ITEM_NONE \ #define GET_ITEM_NONE \
{ ITEM_NONE, 0, 0, 0, 0, 0, 0, 0, 0, false, ITEM_FROM_NPC, ITEM_CATEGORY_JUNK, ITEM_NONE, 0, NULL } { ITEM_NONE, 0, 0, 0, 0, 0, 0, 0, 0, false, ITEM_FROM_NPC, ITEM_CATEGORY_JUNK, ITEM_NONE, 0, NULL }

2
soh/soh/Enhancements/randomizer/3drando/fill.cpp
View file

@ -9,7 +9,7 @@
#include "hints.hpp" #include "hints.hpp"
#include "shops.hpp" #include "shops.hpp"
#include "pool_functions.hpp" #include "pool_functions.hpp"
//#include "debug.hpp" // #include "debug.hpp"
#include "soh/Enhancements/randomizer/static_data.h" #include "soh/Enhancements/randomizer/static_data.h"
#include "soh/Enhancements/debugger/performanceTimer.h" #include "soh/Enhancements/debugger/performanceTimer.h"

2
soh/soh/Enhancements/randomizer/Plandomizer.h
View file

@ -22,7 +22,7 @@ class PlandomizerWindow final : public Ship::GuiWindow {
void InitElement() override; void InitElement() override;
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
}; };
typedef struct { typedef struct {

19
soh/soh/Enhancements/randomizer/draw.h
View file

@ -29,10 +29,21 @@ void Randomizer_DrawBombchuBag(PlayState* play, GetItemEntry* getItemEntry);
void Randomizer_DrawOverworldKey(PlayState* play, GetItemEntry* getItemEntry); void Randomizer_DrawOverworldKey(PlayState* play, GetItemEntry* getItemEntry);
#define GET_ITEM_MYSTERY \ #define GET_ITEM_MYSTERY \
{ \ { ITEM_NONE_FE, \
ITEM_NONE_FE, 0, 0, 0, 0, MOD_RANDOMIZER, MOD_RANDOMIZER, ITEM_NONE_FE, 0, false, ITEM_FROM_NPC, \ 0, \
ITEM_CATEGORY_JUNK, ITEM_NONE_FE, MOD_RANDOMIZER, (CustomDrawFunc)Randomizer_DrawMysteryItem \ 0, \
} 0, \
0, \
MOD_RANDOMIZER, \
MOD_RANDOMIZER, \
ITEM_NONE_FE, \
0, \
false, \
ITEM_FROM_NPC, \
ITEM_CATEGORY_JUNK, \
ITEM_NONE_FE, \
MOD_RANDOMIZER, \
(CustomDrawFunc)Randomizer_DrawMysteryItem }
#ifdef __cplusplus #ifdef __cplusplus
}; };
#endif #endif

3
soh/soh/Enhancements/randomizer/location_access.h
View file

@ -62,8 +62,7 @@ class EventAccess {
std::string CleanCheckConditionString(std::string condition); std::string CleanCheckConditionString(std::string condition);
#define LOCATION(check, condition) \ #define LOCATION(check, condition) \
LocationAccess( \ LocationAccess(check, [] { return condition; }, CleanCheckConditionString(#condition))
check, [] { return condition; }, CleanCheckConditionString(#condition))
// this class is meant to hold an item location with a boolean function to determine its accessibility from a specific // this class is meant to hold an item location with a boolean function to determine its accessibility from a specific
// area // area

2
soh/soh/Enhancements/randomizer/randomizerTypes.h
View file

@ -5,7 +5,7 @@
#define MAX_TRICK_NAME_SIZE 50 #define MAX_TRICK_NAME_SIZE 50
#define TWO_ACTOR_PARAMS(a, b) ((((a)&0xFFFF) << 16) | ((b)&0xFFFF)) #define TWO_ACTOR_PARAMS(a, b) ((((a) & 0xFFFF) << 16) | ((b) & 0xFFFF))
// This should probably go in a less rando-specific location // This should probably go in a less rando-specific location
// but the best location will probably be in the modding engine // but the best location will probably be in the modding engine

8
soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
View file

@ -11,19 +11,19 @@ namespace CheckTracker {
class CheckTrackerSettingsWindow final : public Ship::GuiWindow { class CheckTrackerSettingsWindow final : public Ship::GuiWindow {
public: public:
using GuiWindow::GuiWindow; using GuiWindow::GuiWindow;
~CheckTrackerSettingsWindow(){}; ~CheckTrackerSettingsWindow() {};
protected: protected:
void InitElement() override{}; void InitElement() override {};
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
}; };
class CheckTrackerWindow final : public Ship::GuiWindow { class CheckTrackerWindow final : public Ship::GuiWindow {
public: public:
using GuiWindow::GuiWindow; using GuiWindow::GuiWindow;
void Draw() override; void Draw() override;
~CheckTrackerWindow(){}; ~CheckTrackerWindow() {};
protected: protected:
void InitElement() override; void InitElement() override;

14
soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h
View file

@ -76,12 +76,8 @@ typedef struct {
extern EntranceTrackingData gEntranceTrackingData; extern EntranceTrackingData gEntranceTrackingData;
#define SINGLE_SCENE_INFO(scene) \ #define SINGLE_SCENE_INFO(scene) { { scene, -1 } }
{ \ #define SCENE_NO_SPAWN(scene) { scene, -1 }
{ scene, -1 } \
}
#define SCENE_NO_SPAWN(scene) \
{ scene, -1 }
void SetCurrentGrottoIDForTracker(int16_t entranceIndex); void SetCurrentGrottoIDForTracker(int16_t entranceIndex);
void SetLastEntranceOverrideForTracker(int16_t entranceIndex); void SetLastEntranceOverrideForTracker(int16_t entranceIndex);
@ -97,9 +93,9 @@ class EntranceTrackerSettingsWindow final : public Ship::GuiWindow {
using GuiWindow::GuiWindow; using GuiWindow::GuiWindow;
protected: protected:
void InitElement() override{}; void InitElement() override {};
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
}; };
class EntranceTrackerWindow final : public Ship::GuiWindow { class EntranceTrackerWindow final : public Ship::GuiWindow {
@ -109,5 +105,5 @@ class EntranceTrackerWindow final : public Ship::GuiWindow {
void InitElement() override; void InitElement() override;
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
}; };

12
soh/soh/Enhancements/randomizer/randomizer_item_tracker.h
View file

@ -19,11 +19,9 @@ bool HasSong(ItemTrackerItem);
bool HasQuestItem(ItemTrackerItem); bool HasQuestItem(ItemTrackerItem);
bool HasEquipment(ItemTrackerItem); bool HasEquipment(ItemTrackerItem);
#define ITEM_TRACKER_ITEM(id, data, drawFunc) \ #define ITEM_TRACKER_ITEM(id, data, drawFunc) { id, #id, #id "_Faded", data, drawFunc }
{ id, #id, #id "_Faded", data, drawFunc }
#define ITEM_TRACKER_ITEM_CUSTOM(id, name, nameFaded, data, drawFunc) \ #define ITEM_TRACKER_ITEM_CUSTOM(id, name, nameFaded, data, drawFunc) { id, #name, #nameFaded "_Faded", data, drawFunc }
{ id, #name, #nameFaded "_Faded", data, drawFunc }
static std::vector<const char*> itemTrackerWindowIDs = { "Item Tracker", static std::vector<const char*> itemTrackerWindowIDs = { "Item Tracker",
"Inventory Items Tracker", "Inventory Items Tracker",
@ -52,9 +50,9 @@ class ItemTrackerSettingsWindow final : public Ship::GuiWindow {
using GuiWindow::GuiWindow; using GuiWindow::GuiWindow;
protected: protected:
void InitElement() override{}; void InitElement() override {};
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
}; };
class ItemTrackerWindow final : public Ship::GuiWindow { class ItemTrackerWindow final : public Ship::GuiWindow {
@ -65,5 +63,5 @@ class ItemTrackerWindow final : public Ship::GuiWindow {
protected: protected:
void InitElement() override; void InitElement() override;
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
}; };

8
soh/soh/Enhancements/savestates.cpp
View file

@ -852,8 +852,8 @@ void SaveStateMgr::ProcessSaveStateRequests(void) {
SPDLOG_ERROR("Invalid SaveState slot: {}", request.slot); SPDLOG_ERROR("Invalid SaveState slot: {}", request.slot);
} }
break; break;
[[unlikely]] default [[unlikely]] default:
: SPDLOG_ERROR("Invalid SaveState request type: Unknown ({})", static_cast<int>(request.type)); SPDLOG_ERROR("Invalid SaveState request type: Unknown ({})", static_cast<int>(request.type));
break; break;
} }
this->requests.pop(); this->requests.pop();
@ -882,8 +882,8 @@ SaveStateReturn SaveStateMgr::AddRequest(const SaveStateRequest request) {
1.0f, true, "state slot %u empty", request.slot); 1.0f, true, "state slot %u empty", request.slot);
return SaveStateReturn::FAIL_INVALID_SLOT; return SaveStateReturn::FAIL_INVALID_SLOT;
} }
[[unlikely]] default [[unlikely]] default:
: SPDLOG_ERROR("Invalid SaveState request type: Unknown ({})", static_cast<int>(request.type)); SPDLOG_ERROR("Invalid SaveState request type: Unknown ({})", static_cast<int>(request.type));
return SaveStateReturn::FAIL_BAD_REQUEST; return SaveStateReturn::FAIL_BAD_REQUEST;
} }
} }

2
soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.cpp
View file

@ -7,7 +7,7 @@
#include "SpeechSynthesizer.h" #include "SpeechSynthesizer.h"
SpeechSynthesizer::SpeechSynthesizer() : mInitialized(false){}; SpeechSynthesizer::SpeechSynthesizer() : mInitialized(false) {};
bool SpeechSynthesizer::Init(void) { bool SpeechSynthesizer::Init(void) {
if (mInitialized) { if (mInitialized) {

2
soh/soh/Enhancements/timesplits/TimeSplits.h
View file

@ -24,7 +24,7 @@ class TimeSplitWindow final : public Ship::GuiWindow {
void InitElement() override; void InitElement() override;
void Draw() override; void Draw() override;
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
}; };
typedef enum SplitAction { typedef enum SplitAction {

4
soh/soh/Extractor/Extract.cpp
View file

@ -24,10 +24,10 @@
#define BSWAP32 bswap_32 #define BSWAP32 bswap_32
#define BSWAP16 bswap_16 #define BSWAP16 bswap_16
#else #else
#define BSWAP16(value) ((((value)&0xff) << 8) | ((value) >> 8)) #define BSWAP16(value) ((((value) & 0xff) << 8) | ((value) >> 8))
#define BSWAP32(value) \ #define BSWAP32(value) \
(((uint32_t)BSWAP16((uint16_t)((value)&0xffff)) << 16) | (uint32_t)BSWAP16((uint16_t)((value) >> 16))) (((uint32_t)BSWAP16((uint16_t)((value) & 0xffff)) << 16) | (uint32_t)BSWAP16((uint16_t)((value) >> 16)))
#endif #endif
#if defined(_MSC_VER) #if defined(_MSC_VER)

4
soh/soh/Notification/Notification.h
View file

@ -23,8 +23,8 @@ class Window final : public Ship::GuiWindow {
public: public:
using GuiWindow::GuiWindow; using GuiWindow::GuiWindow;
void InitElement() override{}; void InitElement() override {};
void DrawElement() override{}; void DrawElement() override {};
void Draw() override; void Draw() override;
void UpdateElement() override; void UpdateElement() override;
}; };

6
soh/soh/OTRGlobals.cpp
View file

@ -1411,7 +1411,8 @@ extern "C" void Graph_StartFrame() {
case SaveStateReturn::FAIL_WRONG_GAMESTATE: case SaveStateReturn::FAIL_WRONG_GAMESTATE:
SPDLOG_ERROR("[SOH] Can not save a state outside of \"GamePlay\""); SPDLOG_ERROR("[SOH] Can not save a state outside of \"GamePlay\"");
break; break;
[[unlikely]] default : break; [[unlikely]] default:
break;
} }
break; break;
} }
@ -1453,7 +1454,8 @@ extern "C" void Graph_StartFrame() {
case SaveStateReturn::FAIL_WRONG_GAMESTATE: case SaveStateReturn::FAIL_WRONG_GAMESTATE:
SPDLOG_ERROR("[SOH] Can not load a state outside of \"GamePlay\""); SPDLOG_ERROR("[SOH] Can not load a state outside of \"GamePlay\"");
break; break;
[[unlikely]] default : break; [[unlikely]] default:
break;
} }
break; break;

2
soh/soh/ShipUtils.h
View file

@ -2,7 +2,7 @@
#define SHIP_UTILS_H #define SHIP_UTILS_H
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
//#include "PR/ultratypes.h" // #include "PR/ultratypes.h"
#ifdef __cplusplus #ifdef __cplusplus

2
soh/soh/SohGui/SohMenuBar.h
View file

@ -12,6 +12,6 @@ class SohMenuBar : public Ship::GuiMenuBar {
protected: protected:
void DrawElement() override; void DrawElement() override;
void InitElement() override; void InitElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
}; };
} // namespace SohGui } // namespace SohGui

4
soh/soh/SohGui/SohMenuNetwork.cpp
View file

@ -166,8 +166,8 @@ void SohMenu::AddMenuNetwork() {
AddWidget(path, "Spawned Enemies Ignored Ingame", WIDGET_CVAR_CHECKBOX) AddWidget(path, "Spawned Enemies Ignored Ingame", WIDGET_CVAR_CHECKBOX)
.CVar(CVAR_REMOTE_CROWD_CONTROL("SpawnedEnemiesIgnoredIngame")) .CVar(CVAR_REMOTE_CROWD_CONTROL("SpawnedEnemiesIgnoredIngame"))
.RaceDisable(true) .RaceDisable(true)
.Options(CheckboxOptions().Tooltip( .Options(CheckboxOptions().Tooltip("Enemies spawned by CrowdControl won't be considered for \"clear enemy "
"Enemies spawned by CrowdControl won't be considered for \"clear enemy rooms\", so they don't need to be killed to complete these rooms.")); "rooms\", so they don't need to be killed to complete these rooms."));
} }
} // namespace SohGui } // namespace SohGui

4
soh/soh/SohGui/SohModals.h
View file

@ -9,9 +9,9 @@ class SohModalWindow final : public Ship::GuiWindow {
using GuiWindow::GuiWindow; using GuiWindow::GuiWindow;
void Draw() override; void Draw() override;
void InitElement() override{}; void InitElement() override {};
void DrawElement() override; void DrawElement() override;
void UpdateElement() override{}; void UpdateElement() override {};
void RegisterPopup(std::string title, std::string message, std::string button1 = "OK", std::string button2 = "", void RegisterPopup(std::string title, std::string message, std::string button1 = "OK", std::string button2 = "",
std::function<void()> button1callback = nullptr, std::function<void()> button1callback = nullptr,
std::function<void()> button2callback = nullptr); std::function<void()> button2callback = nullptr);