mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fixed formatting using clang-format

pull/8497/head
morfidon 3 weeks ago
parent
422ff48e86
commit
b254733fba
6 changed files with 189 additions and 189 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      Source/gamemenu.cpp
  2. 40
      Source/loadsave.cpp
  3. 26
      Source/options.cpp
  4. 276
      Source/pfile.cpp
  5. 8
      Source/pfile.h
  6. 2
      Source/player.cpp

26
Source/gamemenu.cpp
Unescape View File

@ -104,14 +104,14 @@ void GamemenuUpdateSingle()
sgSingleMenu[0].setEnabled(enable);
}
std::string_view GetSaveGameMenuLabel()
{
#ifndef _DEBUG
return _("Save Game");
#else
if (HasPendingAutoSave()) {
saveGameMenuLabel = fmt::format(fmt::runtime(_("Save Game ({:s})")), _("ready"));
return saveGameMenuLabel;
std::string_view GetSaveGameMenuLabel()
{
#ifndef _DEBUG
return _("Save Game");
#else
if (HasPendingAutoSave()) {
saveGameMenuLabel = fmt::format(fmt::runtime(_("Save Game ({:s})")), _("ready"));
return saveGameMenuLabel;
}
const int seconds = GetSecondsUntilNextAutoSave();
@ -119,11 +119,11 @@ std::string_view GetSaveGameMenuLabel()
saveGameMenuLabel = _("Save Game");
return saveGameMenuLabel;
}
saveGameMenuLabel = fmt::format(fmt::runtime(_("Save Game ({:d})")), seconds);
return saveGameMenuLabel;
#endif
}
saveGameMenuLabel = fmt::format(fmt::runtime(_("Save Game ({:d})")), seconds);
return saveGameMenuLabel;
#endif
}
void GamemenuPrevious(bool /*bActivate*/)
{

40
Source/loadsave.cpp
Unescape View File

@ -2926,26 +2926,26 @@ void SaveGameData(SaveWriter &saveWriter)
SaveLevelSeeds(saveWriter);
}
void SaveGame()
{
gbValidSaveFile = true;
#if defined(UNPACKED_SAVES) && defined(DVL_NO_FILESYSTEM)
pfile_write_hero(/*writeGameData=*/true);
sfile_write_stash();
#else
const bool gameSaved = pfile_write_game_with_backup();
if (!gameSaved) {
gbValidSaveFile = false;
return;
}
if (!pfile_write_stash_with_backup()) {
gbValidSaveFile = false;
return;
}
#endif
}
void SaveGame()
{
gbValidSaveFile = true;
#if defined(UNPACKED_SAVES) && defined(DVL_NO_FILESYSTEM)
pfile_write_hero(/*writeGameData=*/true);
sfile_write_stash();
#else
const bool gameSaved = pfile_write_game_with_backup();
if (!gameSaved) {
gbValidSaveFile = false;
return;
}
if (!pfile_write_stash_with_backup()) {
gbValidSaveFile = false;
return;
}
#endif
}
void SaveLevel(SaveWriter &saveWriter)
{

26
Source/options.cpp
Unescape View File

@ -865,12 +865,12 @@ GameplayOptions::GameplayOptions()
, autoRefillBelt("Auto Refill Belt", OptionEntryFlags::None, N_("Auto Refill Belt"), N_("Refill belt from inventory when belt item is consumed."), false)
, disableCripplingShrines("Disable Crippling Shrines", OptionEntryFlags::None, N_("Disable Crippling Shrines"), N_("When enabled Cauldrons, Fascinating Shrines, Goat Shrines, Ornate Shrines, Sacred Shrines and Murphy's Shrines are not able to be clicked on and labeled as disabled."), false)
, quickCast("Quick Cast", OptionEntryFlags::None, N_("Quick Cast"), N_("Spell hotkeys instantly cast the spell, rather than switching the readied spell."), false)
, autoSaveEnabled("Auto Save", OptionEntryFlags::CantChangeInMultiPlayer, N_("Auto Save"), N_("Autosave works only in single player and only at safe moments."), false)
#ifdef _DEBUG
, autoSaveIntervalSeconds("Auto Save Interval", OptionEntryFlags::CantChangeInMultiPlayer, N_("Autosave interval (seconds)"), N_("Time between periodic autosave attempts."), 120, { 30, 60, 90, 120, 180, 300, 600 })
#else
, autoSaveIntervalSeconds("Auto Save Interval", OptionEntryFlags::CantChangeInMultiPlayer | OptionEntryFlags::Invisible, "", "", 120, { 30, 60, 90, 120, 180, 300, 600 })
#endif
, autoSaveEnabled("Auto Save", OptionEntryFlags::CantChangeInMultiPlayer, N_("Auto Save"), N_("Autosave works only in single player and only at safe moments."), false)
#ifdef _DEBUG
, autoSaveIntervalSeconds("Auto Save Interval", OptionEntryFlags::CantChangeInMultiPlayer, N_("Autosave interval (seconds)"), N_("Time between periodic autosave attempts."), 120, { 30, 60, 90, 120, 180, 300, 600 })
#else
, autoSaveIntervalSeconds("Auto Save Interval", OptionEntryFlags::CantChangeInMultiPlayer | OptionEntryFlags::Invisible, "", "", 120, { 30, 60, 90, 120, 180, 300, 600 })
#endif
, numHealPotionPickup("Heal Potion Pickup", OptionEntryFlags::None, N_("Heal Potion Pickup"), N_("Number of Healing potions to pick up automatically."), 0, { 0, 1, 2, 4, 8, 16 })
, numFullHealPotionPickup("Full Heal Potion Pickup", OptionEntryFlags::None, N_("Full Heal Potion Pickup"), N_("Number of Full Healing potions to pick up automatically."), 0, { 0, 1, 2, 4, 8, 16 })
, numManaPotionPickup("Mana Potion Pickup", OptionEntryFlags::None, N_("Mana Potion Pickup"), N_("Number of Mana potions to pick up automatically."), 0, { 0, 1, 2, 4, 8, 16 })
@ -890,13 +890,13 @@ std::vector<OptionEntryBase *> GameplayOptions::GetEntries()
&randomizeQuests,
&theoQuest,
&cowQuest,
&runInTown,
&quickCast,
&autoSaveEnabled,
#ifdef _DEBUG
&autoSaveIntervalSeconds,
#endif
&testBard,
&runInTown,
&quickCast,
&autoSaveEnabled,
#ifdef _DEBUG
&autoSaveIntervalSeconds,
#endif
&testBard,
&testBarbarian,
&experienceBar,
&showItemGraphicsInStores,

276
Source/pfile.cpp
Unescape View File

@ -76,12 +76,12 @@ std::string GetSavePath(uint32_t saveNum, std::string_view savePrefix = {})
);
}
std::string GetStashSavePath(std::string_view savePrefix = {})
{
return StrCat(paths::PrefPath(), savePrefix,
gbIsSpawn ? "stash_spawn" : "stash",
#ifdef UNPACKED_SAVES
gbIsHellfire ? "_hsv" DIRECTORY_SEPARATOR_STR : "_sv" DIRECTORY_SEPARATOR_STR
std::string GetStashSavePath(std::string_view savePrefix = {})
{
return StrCat(paths::PrefPath(), savePrefix,
gbIsSpawn ? "stash_spawn" : "stash",
#ifdef UNPACKED_SAVES
gbIsHellfire ? "_hsv" DIRECTORY_SEPARATOR_STR : "_sv" DIRECTORY_SEPARATOR_STR
#else
gbIsHellfire ? ".hsv" : ".sv"
#endif
@ -165,44 +165,44 @@ SaveWriter GetSaveWriter(uint32_t saveNum)
return SaveWriter(GetSavePath(saveNum));
}
SaveWriter GetStashWriter()
{
return SaveWriter(GetStashSavePath());
}
#if !(defined(UNPACKED_SAVES) && defined(DVL_NO_FILESYSTEM))
void CopySaveLocation(const std::string &sourceLocation, const std::string &targetLocation)
{
#if defined(UNPACKED_SAVES)
if (!targetLocation.empty()) {
CreateDir(targetLocation.c_str());
}
for (const std::filesystem::directory_entry &entry : std::filesystem::directory_iterator(sourceLocation)) {
const std::filesystem::path targetFilePath = std::filesystem::path(targetLocation) / entry.path().filename();
CopyFileOverwrite(entry.path().string().c_str(), targetFilePath.string().c_str());
}
#else
CopyFileOverwrite(sourceLocation.c_str(), targetLocation.c_str());
#endif
}
void RestoreSaveLocation(const std::string &targetLocation, const std::string &backupLocation)
{
#if defined(UNPACKED_SAVES)
if (DirectoryExists(targetLocation.c_str())) {
for (const std::filesystem::directory_entry &entry : std::filesystem::directory_iterator(targetLocation))
RemoveFile(entry.path().string().c_str());
}
CreateDir(targetLocation.c_str());
for (const std::filesystem::directory_entry &entry : std::filesystem::directory_iterator(backupLocation)) {
const std::filesystem::path restoredFilePath = std::filesystem::path(targetLocation) / entry.path().filename();
CopyFileOverwrite(entry.path().string().c_str(), restoredFilePath.string().c_str());
}
#else
CopyFileOverwrite(backupLocation.c_str(), targetLocation.c_str());
#endif
}
#endif
SaveWriter GetStashWriter()
{
return SaveWriter(GetStashSavePath());
}
#if !(defined(UNPACKED_SAVES) && defined(DVL_NO_FILESYSTEM))
void CopySaveLocation(const std::string &sourceLocation, const std::string &targetLocation)
{
#if defined(UNPACKED_SAVES)
if (!targetLocation.empty()) {
CreateDir(targetLocation.c_str());
}
for (const std::filesystem::directory_entry &entry : std::filesystem::directory_iterator(sourceLocation)) {
const std::filesystem::path targetFilePath = std::filesystem::path(targetLocation) / entry.path().filename();
CopyFileOverwrite(entry.path().string().c_str(), targetFilePath.string().c_str());
}
#else
CopyFileOverwrite(sourceLocation.c_str(), targetLocation.c_str());
#endif
}
void RestoreSaveLocation(const std::string &targetLocation, const std::string &backupLocation)
{
#if defined(UNPACKED_SAVES)
if (DirectoryExists(targetLocation.c_str())) {
for (const std::filesystem::directory_entry &entry : std::filesystem::directory_iterator(targetLocation))
RemoveFile(entry.path().string().c_str());
}
CreateDir(targetLocation.c_str());
for (const std::filesystem::directory_entry &entry : std::filesystem::directory_iterator(backupLocation)) {
const std::filesystem::path restoredFilePath = std::filesystem::path(targetLocation) / entry.path().filename();
CopyFileOverwrite(entry.path().string().c_str(), restoredFilePath.string().c_str());
}
#else
CopyFileOverwrite(backupLocation.c_str(), targetLocation.c_str());
#endif
}
#endif
void Game2UiPlayer(const Player &player, _uiheroinfo *heroinfo, bool bHasSaveFile)
{
@ -637,73 +637,73 @@ const char *pfile_get_password()
return gbIsMultiplayer ? PASSWORD_MULTI : PASSWORD_SINGLE;
}
void pfile_write_hero(bool writeGameData)
{
SaveWriter saveWriter = GetSaveWriter(gSaveNumber);
pfile_write_hero(saveWriter, writeGameData);
}
#if !(defined(UNPACKED_SAVES) && defined(DVL_NO_FILESYSTEM))
bool pfile_write_game_with_backup()
{
const std::string backupPrefix = "backup_";
const std::string backupLocation = GetSavePath(gSaveNumber, backupPrefix);
const std::string saveLocation = GetSavePath(gSaveNumber);
if (FileExists(saveLocation) || DirectoryExists(saveLocation.c_str()))
CopySaveLocation(saveLocation, backupLocation);
pfile_write_hero(/*writeGameData=*/true);
auto archive = OpenSaveArchive(gSaveNumber);
const bool saveIsValid = archive && ArchiveContainsGame(*archive);
if (saveIsValid || !(FileExists(backupLocation) || DirectoryExists(backupLocation.c_str())))
return saveIsValid;
RestoreSaveLocation(saveLocation, backupLocation);
return false;
}
bool pfile_write_stash_with_backup()
{
if (!Stash.dirty)
return true;
const std::string backupPrefix = "backup_";
const std::string backupLocation = GetStashSavePath(backupPrefix);
const std::string stashLocation = GetStashSavePath();
if (FileExists(stashLocation) || DirectoryExists(stashLocation.c_str()))
CopySaveLocation(stashLocation, backupLocation);
SaveWriter stashWriter = GetStashWriter();
SaveStash(stashWriter);
auto archive = OpenStashArchive();
const char *stashFileName = gbIsMultiplayer ? "mpstashitems" : "spstashitems";
const bool stashIsValid = archive && ReadArchive(*archive, stashFileName) != nullptr;
if (stashIsValid || !(FileExists(backupLocation) || DirectoryExists(backupLocation.c_str()))) {
if (stashIsValid)
Stash.dirty = false;
return stashIsValid;
}
RestoreSaveLocation(stashLocation, backupLocation);
return false;
}
#endif
#ifndef DISABLE_DEMOMODE
#if !(defined(UNPACKED_SAVES) && defined(DVL_NO_FILESYSTEM))
void pfile_write_hero_demo(int demo)
{
const std::string saveLocation = GetSavePath(gSaveNumber, StrCat("demo_", demo, "_reference_"));
CopySaveLocation(GetSavePath(gSaveNumber), saveLocation);
auto saveWriter = SaveWriter(saveLocation.c_str());
pfile_write_hero(saveWriter, true);
}
void pfile_write_hero(bool writeGameData)
{
SaveWriter saveWriter = GetSaveWriter(gSaveNumber);
pfile_write_hero(saveWriter, writeGameData);
}
#if !(defined(UNPACKED_SAVES) && defined(DVL_NO_FILESYSTEM))
bool pfile_write_game_with_backup()
{
const std::string backupPrefix = "backup_";
const std::string backupLocation = GetSavePath(gSaveNumber, backupPrefix);
const std::string saveLocation = GetSavePath(gSaveNumber);
if (FileExists(saveLocation) || DirectoryExists(saveLocation.c_str()))
CopySaveLocation(saveLocation, backupLocation);
pfile_write_hero(/*writeGameData=*/true);
auto archive = OpenSaveArchive(gSaveNumber);
const bool saveIsValid = archive && ArchiveContainsGame(*archive);
if (saveIsValid || !(FileExists(backupLocation) || DirectoryExists(backupLocation.c_str())))
return saveIsValid;
RestoreSaveLocation(saveLocation, backupLocation);
return false;
}
bool pfile_write_stash_with_backup()
{
if (!Stash.dirty)
return true;
const std::string backupPrefix = "backup_";
const std::string backupLocation = GetStashSavePath(backupPrefix);
const std::string stashLocation = GetStashSavePath();
if (FileExists(stashLocation) || DirectoryExists(stashLocation.c_str()))
CopySaveLocation(stashLocation, backupLocation);
SaveWriter stashWriter = GetStashWriter();
SaveStash(stashWriter);
auto archive = OpenStashArchive();
const char *stashFileName = gbIsMultiplayer ? "mpstashitems" : "spstashitems";
const bool stashIsValid = archive && ReadArchive(*archive, stashFileName) != nullptr;
if (stashIsValid || !(FileExists(backupLocation) || DirectoryExists(backupLocation.c_str()))) {
if (stashIsValid)
Stash.dirty = false;
return stashIsValid;
}
RestoreSaveLocation(stashLocation, backupLocation);
return false;
}
#endif
#ifndef DISABLE_DEMOMODE
#if !(defined(UNPACKED_SAVES) && defined(DVL_NO_FILESYSTEM))
void pfile_write_hero_demo(int demo)
{
const std::string saveLocation = GetSavePath(gSaveNumber, StrCat("demo_", demo, "_reference_"));
CopySaveLocation(GetSavePath(gSaveNumber), saveLocation);
auto saveWriter = SaveWriter(saveLocation.c_str());
pfile_write_hero(saveWriter, true);
}
HeroCompareResult pfile_compare_hero_demo(int demo, bool logDetails)
{
@ -712,33 +712,33 @@ HeroCompareResult pfile_compare_hero_demo(int demo, bool logDetails)
if (!FileExists(referenceSavePath.c_str()))
return { HeroCompareResult::ReferenceNotFound, {} };
const std::string actualSavePath = GetSavePath(gSaveNumber, StrCat("demo_", demo, "_actual_"));
{
CopySaveLocation(GetSavePath(gSaveNumber), actualSavePath);
SaveWriter saveWriter(actualSavePath.c_str());
pfile_write_hero(saveWriter, true);
}
return CompareSaves(actualSavePath, referenceSavePath, logDetails);
}
#else
// Demo save comparison is unavailable on UNPACKED_SAVES targets without filesystem support.
void pfile_write_hero_demo(int demo)
{
(void)demo;
}
HeroCompareResult pfile_compare_hero_demo(int demo, bool logDetails)
{
(void)demo;
(void)logDetails;
return { HeroCompareResult::ReferenceNotFound, {} };
}
#endif
#endif
void sfile_write_stash()
{
const std::string actualSavePath = GetSavePath(gSaveNumber, StrCat("demo_", demo, "_actual_"));
{
CopySaveLocation(GetSavePath(gSaveNumber), actualSavePath);
SaveWriter saveWriter(actualSavePath.c_str());
pfile_write_hero(saveWriter, true);
}
return CompareSaves(actualSavePath, referenceSavePath, logDetails);
}
#else
// Demo save comparison is unavailable on UNPACKED_SAVES targets without filesystem support.
void pfile_write_hero_demo(int demo)
{
(void)demo;
}
HeroCompareResult pfile_compare_hero_demo(int demo, bool logDetails)
{
(void)demo;
(void)logDetails;
return { HeroCompareResult::ReferenceNotFound, {} };
}
#endif
#endif
void sfile_write_stash()
{
if (!Stash.dirty)
return;

8
Source/pfile.h
Unescape View File

@ -100,9 +100,9 @@ std::optional<SaveReader> OpenSaveArchive(uint32_t saveNum);
std::optional<SaveReader> OpenStashArchive();
const char *pfile_get_password();
std::unique_ptr<std::byte[]> ReadArchive(SaveReader &archive, const char *pszName, size_t *pdwLen = nullptr);
void pfile_write_hero(bool writeGameData = false);
bool pfile_write_game_with_backup();
bool pfile_write_stash_with_backup();
void pfile_write_hero(bool writeGameData = false);
bool pfile_write_game_with_backup();
bool pfile_write_stash_with_backup();
#ifndef DISABLE_DEMOMODE
/**
@ -119,7 +119,7 @@ void pfile_write_hero_demo(int demo);
HeroCompareResult pfile_compare_hero_demo(int demo, bool logDetails);
#endif
void sfile_write_stash();
void sfile_write_stash();
bool pfile_ui_set_hero_infos(bool (*uiAddHeroInfo)(_uiheroinfo *));
void pfile_ui_set_class_stats(HeroClass playerClass, _uidefaultstats *classStats);
uint32_t pfile_ui_get_first_unused_save_num();

2
Source/player.cpp
Unescape View File

@ -1531,7 +1531,7 @@ uint16_t GetPlayerSpriteWidth(HeroClass cls, player_graphic graphic, PlayerWeapo
return spriteData.bow;
return spriteData.attack;
case player_graphic::Hit:
return spriteData.swHit;
return spriteData.swHit;
case player_graphic::Block:
return spriteData.block;
case player_graphic::Lightning:

Write Preview
Loading…
Cancel
Save