games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

compile fix

Browse Source
This commit is contained in:
alexvins
2013-01-21 18:27:00 +00:00
parent cf7108f075
commit 5b2f176c27
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/CArtHandler.h
View File

@@ -25,9 +25,9 @@ namespace ArtifactPosition
{ {
enum 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, 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, AFTER_LAST,
//cres //cres
CREATURE_SLOT = 0, CREATURE_SLOT = 0,
@@ -139,7 +139,7 @@ protected:
public: public:
CArtifactInstance(); CArtifactInstance();
ConstTransitivePtr<CArtifact> artType; ConstTransitivePtr<CArtifact> artType;
TArtifactInstanceID id; TArtifactInstanceID id;
//CArtifactInstance(int aid); //CArtifactInstance(int aid);
@@ -243,7 +243,7 @@ public:
void clearHlpLists(); void clearHlpLists();
ui16 getRandomArt (int flags); ui16 getRandomArt (int flags);
ui16 getArtSync (ui32 rand, 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 getAllowedArts(std::vector<ConstTransitivePtr<CArtifact> > &out, std::vector<CArtifact*> *arts, int flag);
void getAllowed(std::vector<ConstTransitivePtr<CArtifact> > &out, int flags); void getAllowed(std::vector<ConstTransitivePtr<CArtifact> > &out, int flags);
void erasePickedArt (TArtifactInstanceID id); void erasePickedArt (TArtifactInstanceID id);
@@ -314,6 +314,6 @@ public:
{ {
h & artifactsInBackpack & artifactsWorn; h & artifactsInBackpack & artifactsWorn;
} }
void artDeserializationFix(CBonusSystemNode *node); void artDeserializationFix(CBonusSystemNode *node);
}; };

3
vcmi.workspace
View File

@@ -22,8 +22,5 @@
<Project filename="AI/BattleAI/BattleAI.cbp"> <Project filename="AI/BattleAI/BattleAI.cbp">
<Depends filename="lib/VCMI_lib.cbp" /> <Depends filename="lib/VCMI_lib.cbp" />
</Project> </Project>
<Project filename="Scripting/ERM/ERM.cbp">
<Depends filename="lib/VCMI_lib.cbp" />
</Project>
</Workspace> </Workspace>
</CodeBlocks_workspace_file> </CodeBlocks_workspace_file>