From 27d22b3573a946cc4f6334e870caea9a1184a187 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 26 Apr 2016 15:36:32 +0300 Subject: Move doublerect into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/render/vertexes/graphicsvertexes.h | 12 +++--------- src/resources/rect/doublerect.h | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 src/resources/rect/doublerect.h (limited to 'src') 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 - #include -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 . + */ + +#ifndef RESOURCES_RECT_DOUBLERECT_H +#define RESOURCES_RECT_DOUBLERECT_H + +#include "localconsts.h" + +#include + +struct DoubleRect final +{ + SDL_Rect src; + SDL_Rect dst; +}; + +#endif // RESOURCES_RECT_DOUBLERECT_H -- cgit v1.2.3-60-g2f50