another fixes from cpplint.

17 files changed, 20 insertions, 29 deletions

diff --git a/src/resources/animation.h b/src/resources/animation.h
index 3bff740bc..d0217cdc1 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -101,7 +101,6 @@ class Animation final
         static bool isTerminator(const Frame &phase) A_WARN_UNUSED;
 
     protected:
-
         typedef std::vector<Frame> Frames;
         typedef Frames::iterator FramesIter;
         typedef Frames::reverse_iterator FramesRevIter;
diff --git a/src/resources/atlasmanager.h b/src/resources/atlasmanager.h
index bfb2f4368..845e979d8 100644
--- a/src/resources/atlasmanager.h
+++ b/src/resources/atlasmanager.h
@@ -33,7 +33,7 @@ class Resource;
 
 struct AtlasItem final
 {
-    AtlasItem(Image *image0) :
+    explicit AtlasItem(Image *image0) :
         image(image0),
         x(0),
         y(0),
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index f1b978543..b5ca37bf7 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -219,4 +219,4 @@ class BeingInfo final
 typedef std::map<int, BeingInfo*> BeingInfos;
 typedef BeingInfos::iterator BeingInfoIterator;
 
-#endif // BEINGINFO_H
+#endif  // BEINGINFO_H
diff --git a/src/resources/chardb.h b/src/resources/chardb.h
index fd7770061..e6ec15a3c 100644
--- a/src/resources/chardb.h
+++ b/src/resources/chardb.h
@@ -62,6 +62,6 @@ namespace CharDB
     unsigned getSumStat() A_WARN_UNUSED;
 
     const std::vector<int> &getDefaultItems() A_WARN_UNUSED;
-}
+}  // namespace CharDB
 
 #endif
diff --git a/src/resources/colordb.h b/src/resources/colordb.h
index faf9c0a33..75fff94a3 100644
--- a/src/resources/colordb.h
+++ b/src/resources/colordb.h
@@ -82,6 +82,6 @@ namespace ColorDB
     typedef Colors::iterator ColorIterator;
     typedef std::map <std::string, std::map <int, ItemColor> > ColorLists;
     typedef ColorLists::iterator ColorListsIterator;
-}
+}  // namespace ColorDB
 
 #endif
diff --git a/src/resources/cursor.cpp b/src/resources/cursor.cpp
index 5ce5527df..6113bed5d 100644
--- a/src/resources/cursor.cpp
+++ b/src/resources/cursor.cpp
@@ -64,4 +64,4 @@ namespace Cursor
         }
         return CURSOR_POINTER;
     }
-}// namespace Cursor
+}  // namespace Cursor
diff --git a/src/resources/cursor.h b/src/resources/cursor.h
index f6852f447..aaaf2c758 100644
--- a/src/resources/cursor.h
+++ b/src/resources/cursor.h
@@ -57,6 +57,6 @@ namespace Cursor
     };
 
     Cursor stringToCursor(const std::string &name) A_WARN_UNUSED;
-}
+}  // namespace Cursor
 
 #endif
diff --git a/src/resources/dye.h b/src/resources/dye.h
index 557e8524e..442a514d7 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.h
@@ -95,7 +95,6 @@ class DyePalette final
 class Dye final
 {
     public:
-
         /**
          * Creates a set of palettes based on the given string.
          *
@@ -140,7 +139,6 @@ class Dye final
         int getType() const A_WARN_UNUSED;
 
     private:
-
         /**
          * The order of the palettes, as well as their uppercase letter, is:
          *
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 3e4cd7789..d105794b3 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -85,6 +85,6 @@ namespace EmoteDB
     const int &getLast() A_WARN_UNUSED;
 
     typedef EmoteInfos::iterator EmoteInfosIterator;
-}
+}  // namespace EmoteDB
 
 #endif
diff --git a/src/resources/image.h b/src/resources/image.h
index f383354cc..d7316d527 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -32,12 +32,6 @@
 
 #ifdef USE_OPENGL
 
-/* The definition of OpenGL extensions by SDL is giving problems with recent
- * gl.h headers, since they also include these definitions. As we're not using
- * extensions anyway it's safe to just disable the SDL version.
- */
-//#define NO_SDL_GLEXT
-
 #ifdef ANDROID
 #include <GLES/gl.h>
 #else
@@ -184,7 +178,6 @@ class Image : public Resource
         SDL_Rect mBounds;
 
     protected:
-
         // -----------------------
         // Generic protected members
         // -----------------------
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index edfbd31dc..cde9b95b0 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -75,6 +75,6 @@ namespace ItemDB
     };
 
     void setStatsList(const std::vector<Stat> &stats);
-}
+}  // namespace ItemDB
 
 #endif
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 30b22cec8..0a3b20c61 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -63,7 +63,8 @@ enum EquipmentSlot
     EQUIP_FIGHT1_SLOT = 8,
     EQUIP_FIGHT2_SLOT = 9,
     // Projectile:
-    //   this item does not amount to one, it only indicates the chosen projectile.
+    //   this item does not amount to one, it only 
+    //   indicates the chosen projectile.
     EQUIP_PROJECTILE_SLOT = 10
 };
 
@@ -78,17 +79,17 @@ enum ItemType
     ITEM_EQUIPMENT_ONE_HAND_WEAPON,
     ITEM_EQUIPMENT_TWO_HANDS_WEAPON,
     ITEM_EQUIPMENT_TORSO,
-    ITEM_EQUIPMENT_ARMS, // 5
+    ITEM_EQUIPMENT_ARMS,  // 5
     ITEM_EQUIPMENT_HEAD,
     ITEM_EQUIPMENT_LEGS,
     ITEM_EQUIPMENT_SHIELD,
     ITEM_EQUIPMENT_RING,
-    ITEM_EQUIPMENT_NECKLACE, // 10
+    ITEM_EQUIPMENT_NECKLACE,  // 10
     ITEM_EQUIPMENT_FEET,
     ITEM_EQUIPMENT_AMMO,
     ITEM_EQUIPMENT_CHARM,
     ITEM_SPRITE_RACE,
-    ITEM_SPRITE_HAIR // 15
+    ITEM_SPRITE_HAIR  // 15
 };
 
 // sprite, <itemfrom, itemto>
@@ -179,7 +180,8 @@ class ItemInfo final
 
         void setAttackAction(std::string attackAction);
 
-        // Handlers for seting and getting the string used for particles when attacking
+        // Handlers for seting and getting the string 
+        // used for particles when attacking
         void setMissileParticleFile(const std::string &s)
         { mMissileParticleFile = s; }
 
diff --git a/src/resources/mapdb.h b/src/resources/mapdb.h
index 8bee4668a..574c99780 100644
--- a/src/resources/mapdb.h
+++ b/src/resources/mapdb.h
@@ -66,6 +66,6 @@ namespace MapDB
     // atlas to files map
     typedef std::map<std::string, StringVect> Atlases;
     typedef Atlases::iterator AtlasIter;
-}
+}  // namespace MapDB
 
 #endif
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index e2352136e..32def7446 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -58,7 +58,6 @@ class ResourceManager final
     friend class Resource;
 
     public:
-
         typedef Resource *(*loader)(SDL_RWops *);
         typedef Resource *(*generator)(const void *const);
 
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index c375fa0f8..33a406128 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -77,4 +77,4 @@ class SoundEffect final : public Resource
         Mix_Chunk *mChunk;
 };
 
-#endif // SOUND_EFFECT_H
+#endif  // SOUND_EFFECT_H
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 3a8fe5a01..02090e809 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -90,7 +90,7 @@ namespace SpriteAction
     static const std::string USE_ITEM = "item";
     static const std::string SPAWN = "spawn";
     static const std::string INVALID("");
-}
+}  // namespace SpriteAction
 
 enum SpriteDirection
 {
@@ -213,4 +213,4 @@ class SpriteDef final : public Resource
         std::set<std::string> mProcessedFiles;
 };
 
-#endif // SPRITEDEF_H
+#endif  // SPRITEDEF_H
diff --git a/src/resources/wallpaper.h b/src/resources/wallpaper.h
index 283e44a81..cb3078b14 100644
--- a/src/resources/wallpaper.h
+++ b/src/resources/wallpaper.h
@@ -51,4 +51,4 @@ class Wallpaper final
                                         const int height) A_WARN_UNUSED;
 };
 
-#endif // WALLPAPER_H
+#endif  // WALLPAPER_H