summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--loader-impl.cpp2
-rw-r--r--main.cpp2
-rw-r--r--texture-atlas.cpp (renamed from atlas.cpp)2
-rw-r--r--texture-atlas.hpp (renamed from atlas.hpp)0
-rw-r--r--tile.hpp2
5 files changed, 4 insertions, 4 deletions
diff --git a/loader-impl.cpp b/loader-impl.cpp
index 6d760330..2008dbae 100644
--- a/loader-impl.cpp
+++ b/loader-impl.cpp
@@ -1,6 +1,6 @@
#include "defs.hpp"
#include "loader.hpp"
-#include "atlas.hpp"
+#include "texture-atlas.hpp"
#include <Corrade/Containers/Optional.h>
#include <Corrade/Containers/StringView.h>
#include <Corrade/PluginManager/PluginManager.h>
diff --git a/main.cpp b/main.cpp
index 8cab32ed..7a7aafe7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,4 +1,4 @@
-#include "atlas.hpp"
+#include "texture-atlas.hpp"
#include "loader.hpp"
#include "tile-shader.hpp"
#include "defs.hpp"
diff --git a/atlas.cpp b/texture-atlas.cpp
index 041df3f8..e8e44900 100644
--- a/atlas.cpp
+++ b/texture-atlas.cpp
@@ -1,4 +1,4 @@
-#include "atlas.hpp"
+#include "texture-atlas.hpp"
#include "defs.hpp"
#include <Magnum/ImageView.h>
#include <Magnum/GL/TextureFormat.h>
diff --git a/atlas.hpp b/texture-atlas.hpp
index e7f8a260..e7f8a260 100644
--- a/atlas.hpp
+++ b/texture-atlas.hpp
diff --git a/tile.hpp b/tile.hpp
index 88b1ade3..cf12ca05 100644
--- a/tile.hpp
+++ b/tile.hpp
@@ -1,5 +1,5 @@
#pragma once
-#include "atlas.hpp"
+#include "texture-atlas.hpp"
#include "hash.hpp"
#include "defs.hpp"