compiling issues

luotao4428 · Jan 24, 2013 · f2d81c2 · f2d81c2
1 parent eadf16f
commit f2d81c2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/package/god.cpp b/src/package/god.cpp
@@ -1442,7 +1442,6 @@ GodPackage::GodPackage()
     addMetaObject<ShenfenCard>();
     addMetaObject<GreatYeyanCard>();
     addMetaObject<SmallYeyanCard>();
-    addMetaObject<WushenSlash>();
     addMetaObject<KuangfengCard>();
     addMetaObject<DawuCard>();
     addMetaObject<WuqianCard>();

diff --git a/src/package/standard-cards.cpp b/src/package/standard-cards.cpp
@@ -514,7 +514,6 @@ Halberd::Halberd(Suit suit, int number)
     :Weapon(suit, number, 4)
 {
     setObjectName("Halberd");
-	skill = new HalberdSkill
 }
 
 class KylinBowSkill: public WeaponSkill{
@@ -1362,7 +1361,7 @@ StandardCardPackage::StandardCardPackage()
     foreach(Card *card, cards)
         card->setParent(this);
 
-    skills << new SpearSkill << new AxeViewAsSkill;
+    skills << new SpearSkill << new AxeViewAsSkill << new HalberdSkill;
 }
 
 StandardExCardPackage::StandardExCardPackage()