summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-11 23:44:22 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-11 23:44:22 +0300
commit4b2c8bdc668289d8ca8ab3e3c3fa2ececbd7419c (patch)
treee53f2bcda374d132de9fe51a9170ed1f2a58a53e /src/resources
parent16cc2e4a4204ee95e8256f3d7eacaada99f53309 (diff)
downloadplus-4b2c8bdc668289d8ca8ab3e3c3fa2ececbd7419c.tar.gz
plus-4b2c8bdc668289d8ca8ab3e3c3fa2ececbd7419c.tar.bz2
plus-4b2c8bdc668289d8ca8ab3e3c3fa2ececbd7419c.tar.xz
plus-4b2c8bdc668289d8ca8ab3e3c3fa2ececbd7419c.zip
Fix code style.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/atlas/atlasmanager.h1
-rw-r--r--src/resources/beingcommon.cpp2
-rw-r--r--src/resources/db/npcdialogdb.cpp2
-rw-r--r--src/resources/mapreader.h1
-rw-r--r--src/resources/resourcemanager.h4
5 files changed, 4 insertions, 6 deletions
diff --git a/src/resources/atlas/atlasmanager.h b/src/resources/atlas/atlasmanager.h
index 998b5d177..b824a3c9d 100644
--- a/src/resources/atlas/atlasmanager.h
+++ b/src/resources/atlas/atlasmanager.h
@@ -30,7 +30,6 @@
#include <SDL.h>
class AtlasResource;
-class Resource;
struct AtlasItem;
struct TextureAtlas;
diff --git a/src/resources/beingcommon.cpp b/src/resources/beingcommon.cpp
index af1f8e138..a64f33593 100644
--- a/src/resources/beingcommon.cpp
+++ b/src/resources/beingcommon.cpp
@@ -60,7 +60,7 @@ void BeingCommon::readBasicAttributes(BeingInfo *const info,
BlockMask::AIR;
StringVect tokens;
splitToStringVector(tokens, walkStr, ',');
- FOR_EACH(StringVectCIter, it, tokens)
+ FOR_EACH (StringVectCIter, it, tokens)
{
if (walkStr == "walk" || walkStr == "ground")
block |= BlockMask::GROUND;
diff --git a/src/resources/db/npcdialogdb.cpp b/src/resources/db/npcdialogdb.cpp
index 8b2e19d48..526561935 100644
--- a/src/resources/db/npcdialogdb.cpp
+++ b/src/resources/db/npcdialogdb.cpp
@@ -203,7 +203,7 @@ void NpcDialogDB::unload()
{
logger->log1("Unloading npcdialog database...");
- FOR_EACH(DialogsIter, it, mDialogs)
+ FOR_EACH (DialogsIter, it, mDialogs)
{
NpcDialogInfo *dialog = (*it).second;
delete_all(dialog->menu.buttons);
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index 27fc44271..781a52cca 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -29,7 +29,6 @@
class Map;
class MapHeights;
-class MapLayer;
class Properties;
class Tileset;
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 350c9b97f..e518883fa 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -52,8 +52,8 @@ class ResourceManager final
friend class Resource;
public:
- typedef Resource *(*loader)(SDL_RWops *);
- typedef Resource *(&generator)(const void *const);
+ typedef Resource *(*loader)(SDL_RWops *rw);
+ typedef Resource *(&generator)(const void *const data);
ResourceManager();