Browse Source

Something that compiles.

DjWarmonger 10 years ago
parent
commit
f7b5ecf642

+ 0 - 3
lib/VCMI_lib.vcxproj.filters

@@ -5,9 +5,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{132126f1-89bb-4505-a77e-d4c3a18103be}</UniqueIdentifier>
-    </Filter>
     <Filter Include="filesystem">
       <UniqueIdentifier>{a2ca6977-50bf-4585-aa6e-779a10863922}</UniqueIdentifier>
     </Filter>

+ 2 - 2
lib/spells/BattleSpellMechanics.h

@@ -33,7 +33,7 @@ class DLL_LINKAGE CureMechanics : public DefaultSpellMechanics
 public:
 	CureMechanics(CSpell * s): DefaultSpellMechanics(s){};
 
-	void applyBattle(BattleInfo * battle, const BattleSpellCast * packet) const override;
+	void applyBattle(BattleInfo * battle, const BattleSpellCast * packet) const override final;
 };
 
 class DLL_LINKAGE DispellMechanics : public DefaultSpellMechanics
@@ -41,7 +41,7 @@ class DLL_LINKAGE DispellMechanics : public DefaultSpellMechanics
 public:
 	DispellMechanics(CSpell * s): DefaultSpellMechanics(s){};
 
-	void applyBattle(BattleInfo * battle, const BattleSpellCast * packet) const override;
+	void applyBattle(BattleInfo * battle, const BattleSpellCast * packet) const override final;
 };
 
 class DLL_LINKAGE HypnotizeMechanics : public DefaultSpellMechanics

+ 1 - 1
lib/spells/CreatureSpellMechanics.h

@@ -34,7 +34,7 @@ class DLL_LINKAGE DispellHelpfulMechanics : public DefaultSpellMechanics
 public:
 	DispellHelpfulMechanics(CSpell * s): DefaultSpellMechanics(s){};
 
-	void applyBattle(BattleInfo * battle, const BattleSpellCast * packet) const override;
+	void applyBattle(BattleInfo * battle, const BattleSpellCast * packet) const override final;
 
 	ESpellCastProblem::ESpellCastProblem isImmuneByStack(const CGHeroInstance * caster, const CStack * obj) const override;
 };

+ 3 - 1
lib/spells/ISpellMechanics.h

@@ -12,6 +12,8 @@
 
 #include "CSpellHandler.h"
 #include "../BattleHex.h"
+#include "../BattleState.h"
+#include "../NetPacks.h"
 
 class DLL_LINKAGE ISpellMechanics
 {
@@ -39,9 +41,9 @@ public:
 
 	virtual ESpellCastProblem::ESpellCastProblem isImmuneByStack(const CGHeroInstance * caster, const CStack * obj) const = 0;
 
+	virtual void applyBattle(BattleInfo * battle, const BattleSpellCast * packet) const = 0;
 	virtual bool adventureCast(const SpellCastEnvironment * env, AdventureSpellCastParameters & parameters) const = 0;
 	virtual void battleCast(const SpellCastEnvironment * env, BattleSpellCastParameters & parameters) const = 0;
-	virtual void applyBattle(BattleInfo * battle, const BattleSpellCast * packet) const = 0;
 
 	static ISpellMechanics * createMechanics(CSpell * s);
 protected: