X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FLevel%2FCampaign.hpp;h=0a3d734202b24ad37cf58dd76197bc3352b2d726;hb=8f372db25c010303cc25868b48cb5c0d0a540067;hp=5381672f8fd2402a37079172519a79433a091038;hpb=ed3662c0852c4312a612b4fc35bd03aba8d13db7;p=lugaru.git diff --git a/Source/Level/Campaign.hpp b/Source/Level/Campaign.hpp index 5381672..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. @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Math/Quaternions.hpp" +#include "Math/XYZ.hpp" #include #include @@ -26,6 +26,7 @@ along with Lugaru. If not, see . extern bool campaign; extern int actuallevel; +extern std::string campaignEndText[3]; std::vector ListCampaigns(); void LoadCampaign(); @@ -34,9 +35,11 @@ class CampaignLevel { private: int width; - struct Position { + struct Position + { int x, y; }; + public: std::string mapname; std::string description; @@ -56,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; } };