X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FLevel%2FCampaign.hpp;h=0a3d734202b24ad37cf58dd76197bc3352b2d726;hb=6a8cb464330e92163c8feaf101b8b5837c973bba;hp=a9b83439da6a5b1bf23b1afe6e7d16524d95e782;hpb=f4bb5680c5056f3df67e0068b10f267a91268874;p=lugaru.git diff --git a/Source/Level/Campaign.hpp b/Source/Level/Campaign.hpp index a9b8343..0a3d734 100644 --- a/Source/Level/Campaign.hpp +++ b/Source/Level/Campaign.hpp @@ -1,6 +1,6 @@ /* Copyright (C) 2003, 2010 - Wolfire Games -Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) +Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file) This file is part of Lugaru. @@ -35,9 +35,11 @@ class CampaignLevel { private: int width; - struct Position { + struct Position + { int x, y; }; + public: std::string mapname; std::string description; @@ -57,8 +59,9 @@ public: int getEndY(); XYZ getCenter(); int getWidth(); - std::istream& operator<< (std::istream& is); - friend std::istream& operator>> (std::istream& is, CampaignLevel& cl) { + std::istream& operator<<(std::istream& is); + friend std::istream& operator>>(std::istream& is, CampaignLevel& cl) + { return cl << is; } };