From 5b2f176c27e7550858d0b4226b4a61274d6464b5 Mon Sep 17 00:00:00 2001
From: alexvins <alexvins@users.noreply.github.com>
Date: Mon, 21 Jan 2013 18:27:00 +0000
Subject: [PATCH] compile fix

---
 lib/CArtHandler.h | 10 +++++-----
 vcmi.workspace    |  3 ---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/CArtHandler.h b/lib/CArtHandler.h
index 076cff8ed..04ad22e87 100644
--- a/lib/CArtHandler.h
+++ b/lib/CArtHandler.h
@@ -25,9 +25,9 @@ namespace ArtifactPosition
 {
 	enum ArtifactPosition
 	{
-		PRE_FIRST = -1, 
+		PRE_FIRST = -1,
 		HEAD, SHOULDERS, NECK, RIGHT_HAND, LEFT_HAND, TORSO, RIGHT_RING, LEFT_RING, FEET, MISC1, MISC2, MISC3, MISC4,
-		MACH1, MACH2, MACH3, MACH4, SPELLBOOK, MISC5, 
+		MACH1, MACH2, MACH3, MACH4, SPELLBOOK, MISC5,
 		AFTER_LAST,
 		//cres
 		CREATURE_SLOT = 0,
@@ -139,7 +139,7 @@ protected:
 public:
 	CArtifactInstance();
 
-	ConstTransitivePtr<CArtifact> artType; 
+	ConstTransitivePtr<CArtifact> artType;
 	TArtifactInstanceID id;
 
 	//CArtifactInstance(int aid);
@@ -243,7 +243,7 @@ public:
 	void clearHlpLists();
 	ui16 getRandomArt (int flags);
 	ui16 getArtSync (ui32 rand, int flags);
-	bool CArtHandler::legalArtifact(int id);
+	bool legalArtifact(int id);
 	void getAllowedArts(std::vector<ConstTransitivePtr<CArtifact> > &out, std::vector<CArtifact*> *arts, int flag);
 	void getAllowed(std::vector<ConstTransitivePtr<CArtifact> > &out, int flags);
 	void erasePickedArt (TArtifactInstanceID id);
@@ -314,6 +314,6 @@ public:
 	{
 		h & artifactsInBackpack & artifactsWorn;
 	}
-	
+
 	void artDeserializationFix(CBonusSystemNode *node);
 };
diff --git a/vcmi.workspace b/vcmi.workspace
index 8cd868135..42eab8ba7 100644
--- a/vcmi.workspace
+++ b/vcmi.workspace
@@ -22,8 +22,5 @@
 		<Project filename="AI/BattleAI/BattleAI.cbp">
 			<Depends filename="lib/VCMI_lib.cbp" />
 		</Project>
-		<Project filename="Scripting/ERM/ERM.cbp">
-			<Depends filename="lib/VCMI_lib.cbp" />
-		</Project>
 	</Workspace>
 </CodeBlocks_workspace_file>