From b78c4c19ea6e4c345b7b15064c6d837ba831c659 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Tue, 26 Feb 2013 15:07:21 +0000 Subject: [PATCH] - compile fix --- client/CPreGame.cpp | 2 +- lib/HeroBonus.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/CPreGame.cpp b/client/CPreGame.cpp index 51af670a8..a43727f3f 100644 --- a/client/CPreGame.cpp +++ b/client/CPreGame.cpp @@ -4091,7 +4091,7 @@ void CLoadingScreen::showAll(SDL_Surface *to) } CPrologEpilogVideo::CPrologEpilogVideo( CCampaignScenario::SScenarioPrologEpilog _spe, std::function callback ) - : spe(_spe), exitCb(callback), decrementDelayCounter(0) + : spe(_spe), decrementDelayCounter(0), exitCb(callback) { OBJ_CONSTRUCTION_CAPTURING_ALL; addUsedEvents(LCLICK); diff --git a/lib/HeroBonus.h b/lib/HeroBonus.h index 0d44f834c..a2b1097f0 100644 --- a/lib/HeroBonus.h +++ b/lib/HeroBonus.h @@ -209,7 +209,7 @@ typedef boost::function CSelector; /// Struct for handling bonuses of several types. Can be transferred to any hero struct DLL_LINKAGE Bonus { - #define EVERY_TYPE -1; + enum { EVERY_TYPE = -1 }; enum BonusType {