Browse Source

- compile fix

Ivan Savenko 12 years ago
parent
commit
b78c4c19ea
2 changed files with 2 additions and 2 deletions
  1. 1 1
      client/CPreGame.cpp
  2. 1 1
      lib/HeroBonus.h

+ 1 - 1
client/CPreGame.cpp

@@ -4091,7 +4091,7 @@ void CLoadingScreen::showAll(SDL_Surface *to)
 }
 
 CPrologEpilogVideo::CPrologEpilogVideo( CCampaignScenario::SScenarioPrologEpilog _spe, std::function<void()> callback )
-	: spe(_spe), exitCb(callback), decrementDelayCounter(0)
+	: spe(_spe), decrementDelayCounter(0), exitCb(callback)
 {
 	OBJ_CONSTRUCTION_CAPTURING_ALL;
 	addUsedEvents(LCLICK);

+ 1 - 1
lib/HeroBonus.h

@@ -209,7 +209,7 @@ typedef boost::function<bool(const Bonus*)> 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
 	{