Browse Source

game_assets.* -> assets.*

pull/3533/head
Gleb Mazovetskiy 4 years ago committed by Anders Jenbo
parent
commit
fa90679416
  1. 2
      CMakeLists.txt
  2. 2
      Source/DiabloUI/art.cpp
  3. 2
      Source/engine/assets.cpp
  4. 0
      Source/engine/assets.hpp
  5. 2
      Source/engine/load_file.hpp
  6. 2
      Source/init.cpp
  7. 2
      Source/sound.cpp
  8. 2
      Source/storm/storm_svid.cpp
  9. 2
      Source/utils/language.cpp
  10. 2
      Source/utils/png.h
  11. 2
      Source/utils/soundsample.cpp

2
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

2
Source/DiabloUI/art.cpp

@ -4,7 +4,7 @@
#include <cstdint>
#include <memory>
#include "engine/game_assets.hpp"
#include "engine/assets.hpp"
#include "utils/display.h"
#include "utils/log.hpp"
#include "utils/sdl_compat.h"

2
Source/engine/game_assets.cpp → Source/engine/assets.cpp

@ -1,4 +1,4 @@
#include "engine/game_assets.hpp"
#include "engine/assets.hpp"
#include <algorithm>
#include <cstdint>

0
Source/engine/game_assets.hpp → Source/engine/assets.hpp

2
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 {

2
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"

2
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"

2
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"

2
Source/utils/language.cpp

@ -6,7 +6,7 @@
#include <vector>
#include "options.h"
#include "engine/game_assets.hpp"
#include "engine/assets.hpp"
#include "utils/file_util.h"
#include "utils/paths.h"

2
Source/utils/png.h

@ -3,7 +3,7 @@
#include <SDL.h>
#include "miniwin/miniwin.h"
#include "engine/game_assets.hpp"
#include "engine/assets.hpp"
#ifdef __cplusplus
extern "C" {

2
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"

Loading…
Cancel
Save