fix a bug that made all blocks turn into dirt after harvest them

FactoryCraft/BasicBlock.cpp

@@ -70,7 +70,7 @@ DirtBlockItemType::DirtBlockItemType()
 
 Item* DirtBlockItemType::createItem() const
 {
-    BasicBlockItem* item = new BasicBlockItem( (ItemType*)this, DirtBlockType::INSTANCE, "Dirt" );
+    BasicBlockItem* item = new BasicBlockItem( this, DirtBlockType::INSTANCE, "Dirt" );
     initializeItem( item, 0, 0, 100, 100, 1, 0, 1 );
     return item;
 }
@@ -90,7 +90,7 @@ StoneBlockItemType::StoneBlockItemType()
 
 Item* StoneBlockItemType::createItem() const
 {
-    BasicBlockItem* item = new BasicBlockItem( (ItemType*)this, StoneBlockType::INSTANCE, "Stone" );
+    BasicBlockItem* item = new BasicBlockItem( this, StoneBlockType::INSTANCE, "Stone" );
     initializeItem( item, 0, 0, 100, 100, 2, 0, 1 );
     return item;
 }
@@ -110,7 +110,7 @@ SandBlockItemType::SandBlockItemType()
 
 Item* SandBlockItemType::createItem() const
 {
-    BasicBlockItem* item = new BasicBlockItem( (ItemType*)this, SandBlockType::INSTANCE, "Sand" );
+    BasicBlockItem* item = new BasicBlockItem( this, SandBlockType::INSTANCE, "Sand" );
     initializeItem( item, 0, 0, 100, 100, 0.5f, 0, 1 );
     return item;
 }
@@ -130,7 +130,7 @@ OakBlockItemType::OakBlockItemType()
 
 Item* OakBlockItemType::createItem() const
 {
-    BasicBlockItem* item = new BasicBlockItem( (ItemType*)this, OakBlockType::INSTANCE, "Oak" );
+    BasicBlockItem* item = new BasicBlockItem( this, OakBlockType::INSTANCE, "Oak" );
     initializeItem( item, 0, 0, 100, 100, 1.5f, 0, 1 );
     return item;
 }
@@ -150,7 +150,7 @@ LeavesBlockItemType::LeavesBlockItemType()
 
 Item* LeavesBlockItemType::createItem() const
 {
-    BasicBlockItem* item = new BasicBlockItem( (ItemType*)this, LeavesBlockType::INSTANCE, "Leaves" );
+    BasicBlockItem* item = new BasicBlockItem( this, LeavesBlockType::INSTANCE, "Leaves" );
     initializeItem( item, 0, 0, 100, 100, 0.1f, 0, 1 );
     return item;
 }
@@ -170,7 +170,7 @@ GravelBlockItemType::GravelBlockItemType()
 
 Item* GravelBlockItemType::createItem() const
 {
-    BasicBlockItem* item = new BasicBlockItem( (ItemType*)this, GravelBlockType::INSTANCE, "Gravel" );
+    BasicBlockItem* item = new BasicBlockItem( this, GravelBlockType::INSTANCE, "Gravel" );
     initializeItem( item, 0, 0, 100, 100, 0.75f, 0, 1 );
     return item;
 }
@@ -190,7 +190,7 @@ GraniteBlockItemType::GraniteBlockItemType()
 
 Item* GraniteBlockItemType::createItem() const
 {
-    BasicBlockItem* item = new BasicBlockItem( (ItemType*)this, GraniteBlockType::INSTANCE, "Granite" );
+    BasicBlockItem* item = new BasicBlockItem( this, GraniteBlockType::INSTANCE, "Granite" );
     initializeItem( item, 0, 0, 100, 100, 3.f, 0, 1 );
     return item;
 }
@@ -210,7 +210,7 @@ CobbleBlockItemType::CobbleBlockItemType()
 
 Item* CobbleBlockItemType::createItem() const
 {
-    BasicBlockItem* item = new BasicBlockItem( (ItemType*)this, CobbleBlockType::INSTANCE, "Cobble" );
+    BasicBlockItem* item = new BasicBlockItem( this, CobbleBlockType::INSTANCE, "Cobble" );
     initializeItem( item, 0, 0, 100, 100, 1.f, 0, 1 );
     return item;
 }
@@ -230,7 +230,7 @@ BirchBlockItemType::BirchBlockItemType()
 
 Item* BirchBlockItemType::createItem() const
 {
-    BasicBlockItem* item = new BasicBlockItem( (ItemType*)this, BirchBlockType::INSTANCE, "Birch" );
+    BasicBlockItem* item = new BasicBlockItem( this, BirchBlockType::INSTANCE, "Birch" );
     initializeItem( item, 0, 0, 100, 100, 1.5f, 0, 1 );
     return item;
 }
@@ -250,7 +250,7 @@ BeechBlockItemType::BeechBlockItemType()
 
 Item* BeechBlockItemType::createItem() const
 {
-    BasicBlockItem* item = new BasicBlockItem( (ItemType*)this, BeechBlockType::INSTANCE, "Beech" );
+    BasicBlockItem* item = new BasicBlockItem( this, BeechBlockType::INSTANCE, "Beech" );
     initializeItem( item, 0, 0, 100, 100, 1.5f, 0, 1 );
     return item;
 }
@@ -270,7 +270,7 @@ BasaltBlockItemType::BasaltBlockItemType()
 
 Item* BasaltBlockItemType::createItem() const
 {
-    BasicBlockItem* item = new BasicBlockItem( (ItemType*)this, BasaltBlockType::INSTANCE, "Basalt" );
+    BasicBlockItem* item = new BasicBlockItem( this, BasaltBlockType::INSTANCE, "Basalt" );
     initializeItem( item, 0, 0, 100, 100, 2.f, 0, 1 );
     return item;
 }

FactoryCraft/BasicBlocks.h

@@ -41,15 +41,6 @@ public:
 };
 
 // Dirt
-class DirtBlockType : public BasicBlockType
-{
-    REGISTRABLE( DirtBlockType )
-
-protected:
-    DirtBlockType();
-};
-REGISTER( DirtBlockType, BlockType )
-
 class DirtBlockItemType : public BasicBlockItemType
 {
     REGISTRABLE( DirtBlockItemType )
@@ -62,16 +53,16 @@ public:
 };
 REGISTER( DirtBlockItemType, ItemType )
 
-// Stone
-class StoneBlockType : public BasicBlockType
+class DirtBlockType : public BasicBlockType
 {
-    REGISTRABLE( StoneBlockType )
+    REGISTRABLE( DirtBlockType )
 
 protected:
-    StoneBlockType();
+    DirtBlockType();
 };
-REGISTER( StoneBlockType, BlockType )
+REGISTER( DirtBlockType, BlockType )
 
+// Stone
 class StoneBlockItemType : public BasicBlockItemType
 {
     REGISTRABLE( StoneBlockItemType )
@@ -84,16 +75,16 @@ public:
 };
 REGISTER( StoneBlockItemType, ItemType )
 
-// Sand
-class SandBlockType : public BasicBlockType
+class StoneBlockType : public BasicBlockType
 {
-    REGISTRABLE( SandBlockType )
+    REGISTRABLE( StoneBlockType )
 
 protected:
-    SandBlockType();
+    StoneBlockType();
 };
-REGISTER( SandBlockType, BlockType )
+REGISTER( StoneBlockType, BlockType )
 
+// Sand
 class SandBlockItemType : public BasicBlockItemType
 {
     REGISTRABLE( SandBlockItemType )
@@ -106,16 +97,16 @@ public:
 };
 REGISTER( SandBlockItemType, ItemType )
 
-// Oak Wood
-class OakBlockType : public BasicBlockType
+class SandBlockType : public BasicBlockType
 {
-    REGISTRABLE( OakBlockType )
+    REGISTRABLE( SandBlockType )
 
 protected:
-    OakBlockType();
+    SandBlockType();
 };
-REGISTER( OakBlockType, BlockType )
+REGISTER( SandBlockType, BlockType )
 
+// Oak Wood
 class OakBlockItemType : public BasicBlockItemType
 {
     REGISTRABLE( OakBlockItemType )
@@ -128,16 +119,16 @@ public:
 };
 REGISTER( OakBlockItemType, ItemType )
 
-// Leaves
-class LeavesBlockType : public BasicBlockType
+class OakBlockType : public BasicBlockType
 {
-    REGISTRABLE( LeavesBlockType )
+    REGISTRABLE( OakBlockType )
 
 protected:
-    LeavesBlockType();
+    OakBlockType();
 };
-REGISTER( LeavesBlockType, BlockType )
+REGISTER( OakBlockType, BlockType )
 
+// Leaves
 class LeavesBlockItemType : public BasicBlockItemType
 {
     REGISTRABLE( LeavesBlockItemType )
@@ -150,16 +141,16 @@ public:
 };
 REGISTER( LeavesBlockItemType, ItemType )
 
-// Gravel
-class GravelBlockType : public BasicBlockType
+class LeavesBlockType : public BasicBlockType
 {
-    REGISTRABLE( GravelBlockType )
+    REGISTRABLE( LeavesBlockType )
 
 protected:
-    GravelBlockType();
+    LeavesBlockType();
 };
-REGISTER( GravelBlockType, BlockType )
+REGISTER( LeavesBlockType, BlockType )
 
+// Gravel
 class GravelBlockItemType : public BasicBlockItemType
 {
     REGISTRABLE( GravelBlockItemType )
@@ -172,16 +163,16 @@ public:
 };
 REGISTER( GravelBlockItemType, ItemType )
 
-// Granite
-class GraniteBlockType : public BasicBlockType
+class GravelBlockType : public BasicBlockType
 {
-    REGISTRABLE( GraniteBlockType )
+    REGISTRABLE( GravelBlockType )
 
 protected:
-    GraniteBlockType();
+    GravelBlockType();
 };
-REGISTER( GraniteBlockType, BlockType )
+REGISTER( GravelBlockType, BlockType )
 
+// Granite
 class GraniteBlockItemType : public BasicBlockItemType
 {
     REGISTRABLE( GraniteBlockItemType )
@@ -194,16 +185,16 @@ public:
 };
 REGISTER( GraniteBlockItemType, ItemType )
 
-// Cobble
-class CobbleBlockType : public BasicBlockType
+class GraniteBlockType : public BasicBlockType
 {
-    REGISTRABLE( CobbleBlockType )
+    REGISTRABLE( GraniteBlockType )
 
 protected:
-    CobbleBlockType();
+    GraniteBlockType();
 };
-REGISTER( CobbleBlockType, BlockType )
+REGISTER( GraniteBlockType, BlockType )
 
+// Cobble
 class CobbleBlockItemType : public BasicBlockItemType
 {
     REGISTRABLE( CobbleBlockItemType )
@@ -216,16 +207,16 @@ public:
 };
 REGISTER( CobbleBlockItemType, ItemType )
 
-// Birch Wood
-class BirchBlockType : public BasicBlockType
+class CobbleBlockType : public BasicBlockType
 {
-    REGISTRABLE( BirchBlockType )
+    REGISTRABLE( CobbleBlockType )
 
 protected:
-    BirchBlockType();
+    CobbleBlockType();
 };
-REGISTER( BirchBlockType, BlockType )
+REGISTER( CobbleBlockType, BlockType )
 
+// Birch Wood
 class BirchBlockItemType : public BasicBlockItemType
 {
     REGISTRABLE( BirchBlockItemType )
@@ -238,16 +229,16 @@ public:
 };
 REGISTER( BirchBlockItemType, ItemType )
 
-// Beech Wood
-class BeechBlockType : public BasicBlockType
+class BirchBlockType : public BasicBlockType
 {
-    REGISTRABLE( BeechBlockType )
+    REGISTRABLE( BirchBlockType )
 
 protected:
-    BeechBlockType();
+    BirchBlockType();
 };
-REGISTER( BeechBlockType, BlockType )
+REGISTER( BirchBlockType, BlockType )
 
+// Beech Wood
 class BeechBlockItemType : public BasicBlockItemType
 {
     REGISTRABLE( BeechBlockItemType )
@@ -260,16 +251,16 @@ public:
 };
 REGISTER( BeechBlockItemType, ItemType )
 
-// Basalt
-class BasaltBlockType : public BasicBlockType
+class BeechBlockType : public BasicBlockType
 {
-    REGISTRABLE( BasaltBlockType )
+    REGISTRABLE( BeechBlockType )
 
 protected:
-    BasaltBlockType();
+    BeechBlockType();
 };
-REGISTER( BasaltBlockType, BlockType )
+REGISTER( BeechBlockType, BlockType )
 
+// Basalt
 class BasaltBlockItemType : public BasicBlockItemType
 {
     REGISTRABLE( BasaltBlockItemType )
@@ -280,4 +271,13 @@ protected:
 public:
     virtual Item* createItem() const override;
 };
-REGISTER( BasaltBlockItemType, ItemType )
+REGISTER( BasaltBlockItemType, ItemType )
+
+class BasaltBlockType : public BasicBlockType
+{
+    REGISTRABLE( BasaltBlockType )
+
+protected:
+    BasaltBlockType();
+};
+REGISTER( BasaltBlockType, BlockType )