diff options
| author | lapayo94@gmail.com <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-07-16 20:19:25 +0200 |
|---|---|---|
| committer | lapayo94@gmail.com <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-07-16 20:19:25 +0200 |
| commit | d3b7a39f928473366132b37f76fc1bb13b08de43 (patch) | |
| tree | e22b5efcf26ab06eac19340478f77236b4effa14 | |
| parent | Fixed some small bugs :) (diff) | |
| download | cuberite-d3b7a39f928473366132b37f76fc1bb13b08de43.tar cuberite-d3b7a39f928473366132b37f76fc1bb13b08de43.tar.gz cuberite-d3b7a39f928473366132b37f76fc1bb13b08de43.tar.bz2 cuberite-d3b7a39f928473366132b37f76fc1bb13b08de43.tar.lz cuberite-d3b7a39f928473366132b37f76fc1bb13b08de43.tar.xz cuberite-d3b7a39f928473366132b37f76fc1bb13b08de43.tar.zst cuberite-d3b7a39f928473366132b37f76fc1bb13b08de43.zip | |
| -rw-r--r-- | VC2010/MCServer.vcxproj | 3 | ||||
| -rw-r--r-- | VC2010/MCServer.vcxproj.filters | 9 | ||||
| -rw-r--r-- | source/items/Item.cpp | 3 | ||||
| -rw-r--r-- | source/items/ItemRedstoneRepeater.h | 27 |
4 files changed, 38 insertions, 4 deletions
diff --git a/VC2010/MCServer.vcxproj b/VC2010/MCServer.vcxproj index 4d89c215c..54a1a70e4 100644 --- a/VC2010/MCServer.vcxproj +++ b/VC2010/MCServer.vcxproj @@ -531,9 +531,9 @@ <ClInclude Include="..\source\blocks\BlockLeaves.h" />
<ClInclude Include="..\source\blocks\BlockMelon.h" />
<ClInclude Include="..\source\blocks\BlockMushroom.h" />
+ <ClInclude Include="..\source\blocks\BlockOre.h" />
<ClInclude Include="..\source\blocks\BlockPiston.h" />
<ClInclude Include="..\source\blocks\BlockRedstone.h" />
- <ClInclude Include="..\source\blocks\BlockRedstoneOre.h" />
<ClInclude Include="..\source\blocks\BlockRedstoneRepeater.h" />
<ClInclude Include="..\source\blocks\BlockRedstoneTorch.h" />
<ClInclude Include="..\source\blocks\BlockSapling.h" />
@@ -652,6 +652,7 @@ <ClInclude Include="..\source\items\ItemLighter.h" />
<ClInclude Include="..\source\items\ItemPickaxe.h" />
<ClInclude Include="..\source\items\ItemRedstoneDust.h" />
+ <ClInclude Include="..\source\items\ItemRedstoneRepeater.h" />
<ClInclude Include="..\source\items\ItemSapling.h" />
<ClInclude Include="..\source\items\ItemSeeds.h" />
<ClInclude Include="..\source\items\ItemShears.h" />
diff --git a/VC2010/MCServer.vcxproj.filters b/VC2010/MCServer.vcxproj.filters index 65abbe435..c9a39ea6b 100644 --- a/VC2010/MCServer.vcxproj.filters +++ b/VC2010/MCServer.vcxproj.filters @@ -1649,9 +1649,6 @@ <ClInclude Include="..\source\items\ItemSword.h">
<Filter>Items</Filter>
</ClInclude>
- <ClInclude Include="..\source\blocks\BlockRedstoneOre.h">
- <Filter>Blocks</Filter>
- </ClInclude>
<ClInclude Include="..\source\blocks\BlockStone.h">
<Filter>Blocks</Filter>
</ClInclude>
@@ -1664,6 +1661,12 @@ <ClInclude Include="..\source\blocks\BlockIce.h">
<Filter>Blocks</Filter>
</ClInclude>
+ <ClInclude Include="..\source\blocks\BlockOre.h">
+ <Filter>Blocks</Filter>
+ </ClInclude>
+ <ClInclude Include="..\source\items\ItemRedstoneRepeater.h">
+ <Filter>Items</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\source\AllToLua.pkg">
diff --git a/source/items/Item.cpp b/source/items/Item.cpp index b3a525c6b..5c978e8ed 100644 --- a/source/items/Item.cpp +++ b/source/items/Item.cpp @@ -15,6 +15,7 @@ #include "ItemBucket.h"
#include "ItemLighter.h"
#include "ItemRedstoneDust.h"
+#include "ItemRedstoneRepeater.h"
#include "ItemSeeds.h"
#include "ItemDye.h"
#include "ItemSugarcane.h"
@@ -69,6 +70,8 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemID) return new cItemSaplingHandler(a_ItemID);
case E_ITEM_REDSTONE_DUST:
return new cItemRedstoneDustHandler(a_ItemID);
+ case E_ITEM_REDSTONE_REPEATER:
+ return new cItemRedstoneRepeaterHandler(a_ItemID);
case E_ITEM_BUCKET:
case E_ITEM_WATER_BUCKET:
case E_ITEM_LAVA_BUCKET:
diff --git a/source/items/ItemRedstoneRepeater.h b/source/items/ItemRedstoneRepeater.h new file mode 100644 index 000000000..0250cdee0 --- /dev/null +++ b/source/items/ItemRedstoneRepeater.h @@ -0,0 +1,27 @@ +#pragma once
+#include "Item.h"
+
+
+class cItemRedstoneRepeaterHandler : public cItemHandler
+{
+public:
+ cItemRedstoneRepeaterHandler(int a_ItemID)
+ : cItemHandler(a_ItemID)
+ {
+ }
+
+ virtual bool IsPlaceable()
+ {
+ return true;
+ }
+
+ virtual BLOCKTYPE GetBlockType()
+ {
+ return ::E_BLOCK_REDSTONE_REPEATER_OFF;
+ }
+
+ virtual char GetBlockMeta(char a_ItemMeta)
+ {
+ return 0;
+ }
+};
\ No newline at end of file |