Jelajahi Sumber

fix duplicated function

Kolja Strohm 3 tahun lalu
induk
melakukan
2bdf78004c
3 mengubah file dengan 1 tambahan dan 8 penghapusan
  1. 1 1
      FactoryCraft/BasicBlocks.h
  2. 0 5
      FactoryCraft/Block.cpp
  3. 0 2
      FactoryCraft/Block.h

+ 1 - 1
FactoryCraft/BasicBlocks.h

@@ -9,7 +9,7 @@
 class BlockType;
 class ItemType;
 class DirtBlockType;
-class DirtBlockItemType;
+class BasicBlockType;
 
 class BasicBlock : public Block
 {

+ 0 - 5
FactoryCraft/Block.cpp

@@ -85,11 +85,6 @@ Framework::Model3DData* BasicBlockItemType::getItemModel() const
     return window->zBildschirm()->zGraphicsApi()->getModel( "itemCube" );
 }
 
-Framework::Model3DTextur* BasicBlockItemType::getItemTextur() const
-{
-    return 0;
-}
-
 Item* BasicBlockItemType::createItem() const
 {
     return new BasicBlockItem( this, name );

+ 0 - 2
FactoryCraft/Block.h

@@ -71,7 +71,5 @@ protected:
 public:
     virtual Framework::Model3DData* getItemModel() const override;
     virtual Framework::Model3DTextur* getItemTextur() const override;
-
     virtual Item* createItem() const override;
-    virtual Framework::Model3DTextur* getItemTextur() const override;
 };