summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-26 15:36:32 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-26 15:36:32 +0300
commit27d22b3573a946cc4f6334e870caea9a1184a187 (patch)
tree4a13a769024cec6ca26c17c5a3b32e125a20cc48
parent7d613787059471c8e7323afd80d3d3f5764a2620 (diff)
downloadmv-27d22b3573a946cc4f6334e870caea9a1184a187.tar.gz
mv-27d22b3573a946cc4f6334e870caea9a1184a187.tar.bz2
mv-27d22b3573a946cc4f6334e870caea9a1184a187.tar.xz
mv-27d22b3573a946cc4f6334e870caea9a1184a187.zip
Move doublerect into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/render/vertexes/graphicsvertexes.h12
-rw-r--r--src/resources/rect/doublerect.h34
4 files changed, 39 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 970d45fa2..2d7791adf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -603,6 +603,7 @@ SET(SRCS
resources/atlas/atlasmanager.h
resources/atlas/atlasresource.cpp
resources/atlas/atlasresource.h
+ resources/rect/doublerect.h
resources/attack.h
resources/db/avatardb.cpp
resources/db/avatardb.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 42d993f47..15eeb379e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -340,6 +340,7 @@ SRC += events/actionevent.h \
resources/atlas/atlasmanager.h \
resources/atlas/atlasresource.cpp \
resources/atlas/atlasresource.h \
+ resources/rect/doublerect.h \
resources/attack.h \
resources/cursor.cpp \
resources/cursor.h \
diff --git a/src/render/vertexes/graphicsvertexes.h b/src/render/vertexes/graphicsvertexes.h
index 8f54c5550..0bf74355b 100644
--- a/src/render/vertexes/graphicsvertexes.h
+++ b/src/render/vertexes/graphicsvertexes.h
@@ -23,7 +23,7 @@
#include "main.h"
-#include "localconsts.h"
+#include "resources/rect/doublerect.h"
#ifdef USE_OPENGL
@@ -38,17 +38,11 @@
#endif
-#include <SDL_video.h>
-
#include <vector>
-class Image;
+#include "localconsts.h"
-struct DoubleRect final
-{
- SDL_Rect src;
- SDL_Rect dst;
-};
+class Image;
class SDLGraphicsVertexes final
{
diff --git a/src/resources/rect/doublerect.h b/src/resources/rect/doublerect.h
new file mode 100644
index 000000000..cee371397
--- /dev/null
+++ b/src/resources/rect/doublerect.h
@@ -0,0 +1,34 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2016 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RESOURCES_RECT_DOUBLERECT_H
+#define RESOURCES_RECT_DOUBLERECT_H
+
+#include "localconsts.h"
+
+#include <SDL_video.h>
+
+struct DoubleRect final
+{
+ SDL_Rect src;
+ SDL_Rect dst;
+};
+
+#endif // RESOURCES_RECT_DOUBLERECT_H