From fa9067941672d55aef13d40f1898e2a1e539f0da Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Tue, 16 Nov 2021 22:01:13 +0000 Subject: [PATCH] game_assets.* -> assets.* --- CMakeLists.txt | 2 +- Source/DiabloUI/art.cpp | 2 +- Source/engine/{game_assets.cpp => assets.cpp} | 2 +- Source/engine/{game_assets.hpp => assets.hpp} | 0 Source/engine/load_file.hpp | 2 +- Source/init.cpp | 2 +- Source/sound.cpp | 2 +- Source/storm/storm_svid.cpp | 2 +- Source/utils/language.cpp | 2 +- Source/utils/png.h | 2 +- Source/utils/soundsample.cpp | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename Source/engine/{game_assets.cpp => assets.cpp} (95%) rename Source/engine/{game_assets.hpp => assets.hpp} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e7e77649..0358e6861 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -399,7 +399,7 @@ set(libdevilutionx_SRCS Source/encrypt.cpp Source/engine.cpp Source/error.cpp - Source/engine/game_assets.cpp + Source/engine/assets.cpp Source/gamemenu.cpp Source/gendung.cpp Source/gmenu.cpp diff --git a/Source/DiabloUI/art.cpp b/Source/DiabloUI/art.cpp index 6a6c07d1f..3dad2117c 100644 --- a/Source/DiabloUI/art.cpp +++ b/Source/DiabloUI/art.cpp @@ -4,7 +4,7 @@ #include #include -#include "engine/game_assets.hpp" +#include "engine/assets.hpp" #include "utils/display.h" #include "utils/log.hpp" #include "utils/sdl_compat.h" diff --git a/Source/engine/game_assets.cpp b/Source/engine/assets.cpp similarity index 95% rename from Source/engine/game_assets.cpp rename to Source/engine/assets.cpp index 5d6e4a3ce..380125dd4 100644 --- a/Source/engine/game_assets.cpp +++ b/Source/engine/assets.cpp @@ -1,4 +1,4 @@ -#include "engine/game_assets.hpp" +#include "engine/assets.hpp" #include #include diff --git a/Source/engine/game_assets.hpp b/Source/engine/assets.hpp similarity index 100% rename from Source/engine/game_assets.hpp rename to Source/engine/assets.hpp diff --git a/Source/engine/load_file.hpp b/Source/engine/load_file.hpp index be90003a5..495aa6e35 100644 --- a/Source/engine/load_file.hpp +++ b/Source/engine/load_file.hpp @@ -7,7 +7,7 @@ #include "appfat.h" #include "diablo.h" -#include "engine/game_assets.hpp" +#include "engine/assets.hpp" #include "utils/stdcompat/cstddef.hpp" namespace devilution { diff --git a/Source/init.cpp b/Source/init.cpp index f3e366607..098cfc9d0 100644 --- a/Source/init.cpp +++ b/Source/init.cpp @@ -16,7 +16,7 @@ #include "dx.h" #include "options.h" #include "pfile.h" -#include "engine/game_assets.hpp" +#include "engine/assets.hpp" #include "mpq/mpq_reader.hpp" #include "utils/language.h" #include "utils/log.hpp" diff --git a/Source/sound.cpp b/Source/sound.cpp index 479c9db80..a9c87f3dd 100644 --- a/Source/sound.cpp +++ b/Source/sound.cpp @@ -18,7 +18,7 @@ #include "init.h" #include "options.h" -#include "engine/game_assets.hpp" +#include "engine/assets.hpp" #include "utils/log.hpp" #include "utils/math.h" #include "utils/sdl_mutex.h" diff --git a/Source/storm/storm_svid.cpp b/Source/storm/storm_svid.cpp index 1a99f6bfd..7662cecd7 100644 --- a/Source/storm/storm_svid.cpp +++ b/Source/storm/storm_svid.cpp @@ -16,7 +16,7 @@ #include "dx.h" #include "options.h" #include "palette.h" -#include "engine/game_assets.hpp" +#include "engine/assets.hpp" #include "utils/display.h" #include "utils/log.hpp" #include "utils/sdl_compat.h" diff --git a/Source/utils/language.cpp b/Source/utils/language.cpp index 37205f9fd..2c8846aa0 100644 --- a/Source/utils/language.cpp +++ b/Source/utils/language.cpp @@ -6,7 +6,7 @@ #include #include "options.h" -#include "engine/game_assets.hpp" +#include "engine/assets.hpp" #include "utils/file_util.h" #include "utils/paths.h" diff --git a/Source/utils/png.h b/Source/utils/png.h index fdc19a05b..a48374a69 100644 --- a/Source/utils/png.h +++ b/Source/utils/png.h @@ -3,7 +3,7 @@ #include #include "miniwin/miniwin.h" -#include "engine/game_assets.hpp" +#include "engine/assets.hpp" #ifdef __cplusplus extern "C" { diff --git a/Source/utils/soundsample.cpp b/Source/utils/soundsample.cpp index 618497b14..347b4adcc 100644 --- a/Source/utils/soundsample.cpp +++ b/Source/utils/soundsample.cpp @@ -14,7 +14,7 @@ #endif #include "options.h" -#include "engine/game_assets.hpp" +#include "engine/assets.hpp" #include "utils/log.hpp" #include "utils/math.h" #include "utils/stubs.h"