diff options
Diffstat (limited to 'src/Items')
40 files changed, 85 insertions, 85 deletions
diff --git a/src/Items/ItemArmor.h b/src/Items/ItemArmor.h index 2436df5bd..cc7f15078 100644 --- a/src/Items/ItemArmor.h +++ b/src/Items/ItemArmor.h @@ -18,7 +18,7 @@ public: } /** Move the armor to the armor slot of the player's inventory */ - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/ { int SlotNum; if (ItemCategory::IsHelmet(a_Item.m_ItemType)) @@ -60,7 +60,7 @@ public: return true; } - virtual bool CanRepairWithRawMaterial(short a_ItemType) override + virtual bool CanRepairWithRawMaterial(short a_ItemType) /*override*/ { switch (m_ItemType) { diff --git a/src/Items/ItemBed.h b/src/Items/ItemBed.h index 94a14cf16..dd48c57f7 100644 --- a/src/Items/ItemBed.h +++ b/src/Items/ItemBed.h @@ -19,7 +19,7 @@ public: } - virtual bool IsPlaceable(void) override + virtual bool IsPlaceable(void) /*override*/ { return true; } @@ -29,7 +29,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { if (a_BlockFace != BLOCK_FACE_TOP) { diff --git a/src/Items/ItemBoat.h b/src/Items/ItemBoat.h index 7faac1e32..5c50c6321 100644 --- a/src/Items/ItemBoat.h +++ b/src/Items/ItemBoat.h @@ -28,7 +28,7 @@ public: - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/ { if ((a_Dir != BLOCK_FACE_YM) && (a_Dir != BLOCK_FACE_NONE)) { @@ -47,7 +47,7 @@ public: { } - virtual bool OnNextBlock(int a_CBBlockX, int a_CBBlockY, int a_CBBlockZ, BLOCKTYPE a_CBBlockType, NIBBLETYPE a_CBBlockMeta, char a_CBEntryFace) override + virtual bool OnNextBlock(int a_CBBlockX, int a_CBBlockY, int a_CBBlockZ, BLOCKTYPE a_CBBlockType, NIBBLETYPE a_CBBlockMeta, char a_CBEntryFace) /*override*/ { if (a_CBBlockType != E_BLOCK_AIR) { diff --git a/src/Items/ItemBow.h b/src/Items/ItemBow.h index fdc24689c..618b0828f 100644 --- a/src/Items/ItemBow.h +++ b/src/Items/ItemBow.h @@ -27,7 +27,7 @@ public: } - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/ { ASSERT(a_Player != NULL); @@ -42,7 +42,7 @@ public: } - virtual void OnItemShoot(cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override + virtual void OnItemShoot(cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) /*override*/ { // Actual shot - produce the arrow with speed based on the ticks that the bow was charged ASSERT(a_Player != NULL); diff --git a/src/Items/ItemBrewingStand.h b/src/Items/ItemBrewingStand.h index 7be57763c..95e2fedca 100644 --- a/src/Items/ItemBrewingStand.h +++ b/src/Items/ItemBrewingStand.h @@ -17,7 +17,7 @@ public: } - virtual bool IsPlaceable(void) override + virtual bool IsPlaceable(void) /*override*/ { return true; } @@ -28,7 +28,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { a_BlockType = E_BLOCK_BREWING_STAND; a_BlockMeta = 0; diff --git a/src/Items/ItemBucket.h b/src/Items/ItemBucket.h index a17c4838b..6e994555b 100644 --- a/src/Items/ItemBucket.h +++ b/src/Items/ItemBucket.h @@ -22,7 +22,7 @@ public: } - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/ { switch (m_ItemType) { @@ -156,7 +156,7 @@ public: { } - virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) override + virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) /*override*/ { if (IsBlockWater(a_BlockType) || IsBlockLava(a_BlockType)) { @@ -198,7 +198,7 @@ public: Vector3i m_Pos; BLOCKTYPE m_ReplacedBlock; - virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) override + virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) /*override*/ { if (a_BlockType != E_BLOCK_AIR) { diff --git a/src/Items/ItemCake.h b/src/Items/ItemCake.h index d1cb091b6..dab756a3f 100644 --- a/src/Items/ItemCake.h +++ b/src/Items/ItemCake.h @@ -17,7 +17,7 @@ public: } - virtual bool IsPlaceable(void) override + virtual bool IsPlaceable(void) /*override*/ { return true; } @@ -28,7 +28,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { a_BlockType = E_BLOCK_CAKE; a_BlockMeta = 0; diff --git a/src/Items/ItemCauldron.h b/src/Items/ItemCauldron.h index 9617c30ef..4cc222bec 100644 --- a/src/Items/ItemCauldron.h +++ b/src/Items/ItemCauldron.h @@ -17,7 +17,7 @@ public: } - virtual bool IsPlaceable(void) override + virtual bool IsPlaceable(void) /*override*/ { return true; } @@ -28,7 +28,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { a_BlockType = E_BLOCK_CAULDRON; a_BlockMeta = 0; diff --git a/src/Items/ItemComparator.h b/src/Items/ItemComparator.h index fc843c186..ebe207fc9 100644 --- a/src/Items/ItemComparator.h +++ b/src/Items/ItemComparator.h @@ -17,7 +17,7 @@ public: { } - virtual bool IsPlaceable(void) override + virtual bool IsPlaceable(void) /*override*/ { return true; } @@ -27,7 +27,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { a_BlockType = E_BLOCK_INACTIVE_COMPARATOR; a_BlockMeta = cBlockRedstoneRepeaterHandler::RepeaterRotationToMetaData(a_Player->GetYaw()); diff --git a/src/Items/ItemDoor.h b/src/Items/ItemDoor.h index c1b439024..ca89ee65f 100644 --- a/src/Items/ItemDoor.h +++ b/src/Items/ItemDoor.h @@ -18,7 +18,7 @@ public: } - virtual bool IsPlaceable(void) override + virtual bool IsPlaceable(void) /*override*/ { return true; } @@ -28,7 +28,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { a_BlockType = (m_ItemType == E_ITEM_WOODEN_DOOR) ? E_BLOCK_WOODEN_DOOR : E_BLOCK_IRON_DOOR; cChunkInterface ChunkInterface(a_World->GetChunkMap()); diff --git a/src/Items/ItemDye.h b/src/Items/ItemDye.h index ccf4714f7..d57f4700c 100644 --- a/src/Items/ItemDye.h +++ b/src/Items/ItemDye.h @@ -19,7 +19,7 @@ public: } - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/ { // Handle growing the plants: if (a_Item.m_ItemDamage == E_META_DYE_WHITE) diff --git a/src/Items/ItemEmptyMap.h b/src/Items/ItemEmptyMap.h index 953673382..5e16c0d6b 100644 --- a/src/Items/ItemEmptyMap.h +++ b/src/Items/ItemEmptyMap.h @@ -27,7 +27,7 @@ public: { } - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/ { UNUSED(a_Item); UNUSED(a_BlockX); diff --git a/src/Items/ItemFishingRod.h b/src/Items/ItemFishingRod.h index 6350a38ba..63e9a46a6 100644 --- a/src/Items/ItemFishingRod.h +++ b/src/Items/ItemFishingRod.h @@ -31,7 +31,7 @@ public: { } - virtual bool Item(cEntity * a_Entity) override + virtual bool Item(cEntity * a_Entity) /*override*/ { m_CanPickup = ((cFloater *)a_Entity)->CanPickup(); m_Pos = Vector3d(a_Entity->GetPosX(), a_Entity->GetPosY(), a_Entity->GetPosZ()); @@ -67,7 +67,7 @@ public: { } - virtual bool Item(cEntity * a_Entity) override + virtual bool Item(cEntity * a_Entity) /*override*/ { Vector3d Speed = m_PlayerPos - a_Entity->GetPosition(); a_Entity->AddSpeed(Speed); @@ -93,7 +93,7 @@ public: { } - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/ { if (a_Dir != BLOCK_FACE_NONE) { diff --git a/src/Items/ItemFlowerPot.h b/src/Items/ItemFlowerPot.h index 320dce997..9fbc0e978 100644 --- a/src/Items/ItemFlowerPot.h +++ b/src/Items/ItemFlowerPot.h @@ -17,7 +17,7 @@ public: } - virtual bool IsPlaceable(void) override + virtual bool IsPlaceable(void) /*override*/ { return true; } @@ -28,7 +28,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { a_BlockType = E_BLOCK_FLOWER_POT; a_BlockMeta = 0; diff --git a/src/Items/ItemFood.h b/src/Items/ItemFood.h index 98050cad8..fc5607b11 100644 --- a/src/Items/ItemFood.h +++ b/src/Items/ItemFood.h @@ -18,13 +18,13 @@ public: } - virtual bool IsFood(void) override + virtual bool IsFood(void) /*override*/ { return true; } - virtual FoodInfo GetFoodInfo(void) override + virtual FoodInfo GetFoodInfo(void) /*override*/ { switch (m_ItemType) { @@ -56,7 +56,7 @@ public: return FoodInfo(0, 0.f); } - virtual bool GetEatEffect(cEntityEffect::eType & a_EffectType, int & a_EffectDurationTicks, short & a_EffectIntensity, float & a_Chance) override + virtual bool GetEatEffect(cEntityEffect::eType & a_EffectType, int & a_EffectDurationTicks, short & a_EffectIntensity, float & a_Chance) /*override*/ { switch (m_ItemType) { diff --git a/src/Items/ItemGoldenApple.h b/src/Items/ItemGoldenApple.h index 02ac0202c..e5ecf9c3e 100644 --- a/src/Items/ItemGoldenApple.h +++ b/src/Items/ItemGoldenApple.h @@ -18,7 +18,7 @@ public: } - virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) override + virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) /*override*/ { // Feed the player: FoodInfo Info = GetFoodInfo(); @@ -40,13 +40,13 @@ public: } - virtual FoodInfo GetFoodInfo(void) override + virtual FoodInfo GetFoodInfo(void) /*override*/ { return FoodInfo(4, 9.6); } - virtual bool GetEatEffect(cEntityEffect::eType & a_EffectType, int & a_EffectDurationTicks, short & a_EffectIntensity, float & a_Chance) override + virtual bool GetEatEffect(cEntityEffect::eType & a_EffectType, int & a_EffectDurationTicks, short & a_EffectIntensity, float & a_Chance) /*override*/ { return false; } diff --git a/src/Items/ItemHoe.h b/src/Items/ItemHoe.h index 8d0b71478..01e53d636 100644 --- a/src/Items/ItemHoe.h +++ b/src/Items/ItemHoe.h @@ -18,7 +18,7 @@ public: { } - virtual bool OnItemUse(cWorld *a_World, cPlayer *a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override + virtual bool OnItemUse(cWorld *a_World, cPlayer *a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/ { BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ); @@ -33,7 +33,7 @@ public: } - virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) override + virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) /*override*/ { return 0; } diff --git a/src/Items/ItemItemFrame.h b/src/Items/ItemItemFrame.h index 87e20ecf0..ba8300015 100644 --- a/src/Items/ItemItemFrame.h +++ b/src/Items/ItemItemFrame.h @@ -19,7 +19,7 @@ public: } - virtual bool OnItemUse(cWorld *a_World, cPlayer *a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override + virtual bool OnItemUse(cWorld *a_World, cPlayer *a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/ { if ((a_Dir == BLOCK_FACE_NONE) || (a_Dir == BLOCK_FACE_YP) || (a_Dir == BLOCK_FACE_YM)) { diff --git a/src/Items/ItemLeaves.h b/src/Items/ItemLeaves.h index f48126dc5..cce62e687 100644 --- a/src/Items/ItemLeaves.h +++ b/src/Items/ItemLeaves.h @@ -23,7 +23,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { bool res = super::GetPlacementBlockTypeMeta( a_World, a_Player, diff --git a/src/Items/ItemLighter.h b/src/Items/ItemLighter.h index 9f98bf85f..6d6119638 100644 --- a/src/Items/ItemLighter.h +++ b/src/Items/ItemLighter.h @@ -19,7 +19,7 @@ public: { } - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) /*override*/ { if (a_BlockFace < 0) { diff --git a/src/Items/ItemLilypad.h b/src/Items/ItemLilypad.h index b9d837384..f5a8bdabb 100644 --- a/src/Items/ItemLilypad.h +++ b/src/Items/ItemLilypad.h @@ -23,13 +23,13 @@ public: } - virtual bool IsPlaceable(void) override + virtual bool IsPlaceable(void) /*override*/ { return false; // Set as not placeable so OnItemUse is called } - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) /*override*/ { if (a_BlockFace > BLOCK_FACE_NONE) { @@ -53,7 +53,7 @@ public: { } - virtual bool OnNextBlock(int a_CBBlockX, int a_CBBlockY, int a_CBBlockZ, BLOCKTYPE a_CBBlockType, NIBBLETYPE a_CBBlockMeta, char a_CBEntryFace) override + virtual bool OnNextBlock(int a_CBBlockX, int a_CBBlockY, int a_CBBlockZ, BLOCKTYPE a_CBBlockType, NIBBLETYPE a_CBBlockMeta, char a_CBEntryFace) /*override*/ { if (IsBlockWater(a_CBBlockType)) { diff --git a/src/Items/ItemMilk.h b/src/Items/ItemMilk.h index db7bc13be..32932bde9 100644 --- a/src/Items/ItemMilk.h +++ b/src/Items/ItemMilk.h @@ -11,13 +11,13 @@ public: { } - virtual bool IsDrinkable(short a_ItemDamage) override + virtual bool IsDrinkable(short a_ItemDamage) /*override*/ { UNUSED(a_ItemDamage); return true; } - virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) override + virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) /*override*/ { UNUSED(a_Item); a_Player->ClearEntityEffects(); diff --git a/src/Items/ItemMinecart.h b/src/Items/ItemMinecart.h index 63038de51..c0d179fc2 100644 --- a/src/Items/ItemMinecart.h +++ b/src/Items/ItemMinecart.h @@ -27,7 +27,7 @@ public: - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/ { if (a_Dir < 0) { diff --git a/src/Items/ItemMobHead.h b/src/Items/ItemMobHead.h index 4c36fe8d8..6317de555 100644 --- a/src/Items/ItemMobHead.h +++ b/src/Items/ItemMobHead.h @@ -18,7 +18,7 @@ public: } - virtual bool IsPlaceable(void) override + virtual bool IsPlaceable(void) /*override*/ { return true; } @@ -29,7 +29,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { a_BlockType = E_BLOCK_HEAD; a_BlockMeta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage & 0x0f); diff --git a/src/Items/ItemNetherWart.h b/src/Items/ItemNetherWart.h index 10a0864b5..3ada15464 100644 --- a/src/Items/ItemNetherWart.h +++ b/src/Items/ItemNetherWart.h @@ -18,7 +18,7 @@ public: } - virtual bool IsPlaceable(void) override + virtual bool IsPlaceable(void) /*override*/ { return true; } @@ -28,7 +28,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { if (a_BlockFace != BLOCK_FACE_TOP) { diff --git a/src/Items/ItemPainting.h b/src/Items/ItemPainting.h index a2a77ce21..bbe13e21f 100644 --- a/src/Items/ItemPainting.h +++ b/src/Items/ItemPainting.h @@ -19,7 +19,7 @@ public: { } - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/ { if (a_Dir == BLOCK_FACE_NONE) { diff --git a/src/Items/ItemPickaxe.h b/src/Items/ItemPickaxe.h index 17fd96822..ee819e85b 100644 --- a/src/Items/ItemPickaxe.h +++ b/src/Items/ItemPickaxe.h @@ -30,7 +30,7 @@ public: } } - virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) override + virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) /*override*/ { switch (a_BlockType) { @@ -88,7 +88,7 @@ public: return super::CanHarvestBlock(a_BlockType); } - virtual bool CanRepairWithRawMaterial(short a_ItemType) override + virtual bool CanRepairWithRawMaterial(short a_ItemType) /*override*/ { switch (m_ItemType) { diff --git a/src/Items/ItemPotion.h b/src/Items/ItemPotion.h index 24614cd8a..110d47fca 100644 --- a/src/Items/ItemPotion.h +++ b/src/Items/ItemPotion.h @@ -17,8 +17,8 @@ public: } - // cItemHandler overrides: - virtual bool IsDrinkable(short a_ItemDamage) override + // cItemHandler /*override*/s: + virtual bool IsDrinkable(short a_ItemDamage) /*override*/ { // Drinkable potion if 13th lowest bit is set // Ref.: http://minecraft.gamepedia.com/Potions#Data_value_table @@ -26,7 +26,7 @@ public: } - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/ { short PotionDamage = a_Item.m_ItemDamage; @@ -53,7 +53,7 @@ public: } - virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) override + virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) /*override*/ { short PotionDamage = a_Item->m_ItemDamage; diff --git a/src/Items/ItemRedstoneDust.h b/src/Items/ItemRedstoneDust.h index a2289239c..709c84a2d 100644 --- a/src/Items/ItemRedstoneDust.h +++ b/src/Items/ItemRedstoneDust.h @@ -15,7 +15,7 @@ public: { } - virtual bool IsPlaceable(void) override + virtual bool IsPlaceable(void) /*override*/ { return true; } @@ -25,7 +25,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { if (!cBlockInfo::FullyOccupiesVoxel(a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ))) // Some solid blocks, such as cocoa beans, are not suitable for dust { diff --git a/src/Items/ItemRedstoneRepeater.h b/src/Items/ItemRedstoneRepeater.h index 13a797d00..930acb065 100644 --- a/src/Items/ItemRedstoneRepeater.h +++ b/src/Items/ItemRedstoneRepeater.h @@ -17,7 +17,7 @@ public: { } - virtual bool IsPlaceable() override + virtual bool IsPlaceable() /*override*/ { return true; } @@ -27,7 +27,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { a_BlockType = E_BLOCK_REDSTONE_REPEATER_OFF; a_BlockMeta = cBlockRedstoneRepeaterHandler::RepeaterRotationToMetaData(a_Player->GetYaw()); diff --git a/src/Items/ItemSapling.h b/src/Items/ItemSapling.h index dbcb12be5..a70ae6de5 100644 --- a/src/Items/ItemSapling.h +++ b/src/Items/ItemSapling.h @@ -23,7 +23,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { bool res = super::GetPlacementBlockTypeMeta( a_World, a_Player, diff --git a/src/Items/ItemSeeds.h b/src/Items/ItemSeeds.h index 54a1183d7..249966531 100644 --- a/src/Items/ItemSeeds.h +++ b/src/Items/ItemSeeds.h @@ -18,12 +18,12 @@ public: } - virtual bool IsPlaceable(void) override + virtual bool IsPlaceable(void) /*override*/ { return true; } - virtual bool IsFood(void) override + virtual bool IsFood(void) /*override*/ { switch (m_ItemType) // Special cases, both a seed and food { @@ -33,7 +33,7 @@ public: } } - virtual FoodInfo GetFoodInfo(void) override + virtual FoodInfo GetFoodInfo(void) /*override*/ { switch (m_ItemType) { @@ -48,7 +48,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { if (a_BlockFace != BLOCK_FACE_TOP) { diff --git a/src/Items/ItemShears.h b/src/Items/ItemShears.h index fa2794df2..77d5df3ba 100644 --- a/src/Items/ItemShears.h +++ b/src/Items/ItemShears.h @@ -20,13 +20,13 @@ public: } - virtual bool IsTool(void) override + virtual bool IsTool(void) /*override*/ { return true; } - virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override + virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/ { BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ); if ((Block == E_BLOCK_LEAVES) || (Block == E_BLOCK_NEW_LEAVES)) @@ -47,7 +47,7 @@ public: } - virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) override + virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) /*override*/ { switch (a_BlockType) { @@ -63,13 +63,13 @@ public: } - virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) override + virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) /*override*/ { return 0; } - virtual void OnBlockDestroyed(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ) override + virtual void OnBlockDestroyed(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ) /*override*/ { super::OnBlockDestroyed(a_World, a_Player, a_Item, a_BlockX, a_BlockY, a_BlockZ); diff --git a/src/Items/ItemShovel.h b/src/Items/ItemShovel.h index cd235678d..9c35e755c 100644 --- a/src/Items/ItemShovel.h +++ b/src/Items/ItemShovel.h @@ -21,7 +21,7 @@ public: { } - virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override + virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/ { BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ); if (Block == E_BLOCK_SNOW) @@ -37,7 +37,7 @@ public: return false; } - virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) override + virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) /*override*/ { if (a_BlockType == E_BLOCK_SNOW) { @@ -46,7 +46,7 @@ public: return super::CanHarvestBlock(a_BlockType); } - virtual bool CanRepairWithRawMaterial(short a_ItemType) override + virtual bool CanRepairWithRawMaterial(short a_ItemType) /*override*/ { switch (m_ItemType) { diff --git a/src/Items/ItemSign.h b/src/Items/ItemSign.h index 0fa0fa0be..42d30906b 100644 --- a/src/Items/ItemSign.h +++ b/src/Items/ItemSign.h @@ -20,7 +20,7 @@ public: } - virtual bool IsPlaceable(void) override + virtual bool IsPlaceable(void) /*override*/ { return true; } @@ -31,7 +31,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { if (a_BlockFace == BLOCK_FACE_TOP) { diff --git a/src/Items/ItemSpawnEgg.h b/src/Items/ItemSpawnEgg.h index bba97afa1..971aa9edf 100644 --- a/src/Items/ItemSpawnEgg.h +++ b/src/Items/ItemSpawnEgg.h @@ -19,7 +19,7 @@ public: } - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) /*override*/ { if (a_BlockFace < 0) { diff --git a/src/Items/ItemString.h b/src/Items/ItemString.h index a97fbe0ce..db01462dc 100644 --- a/src/Items/ItemString.h +++ b/src/Items/ItemString.h @@ -16,7 +16,7 @@ public: { } - virtual bool IsPlaceable(void) override + virtual bool IsPlaceable(void) /*override*/ { return true; } @@ -26,7 +26,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { a_BlockType = E_BLOCK_TRIPWIRE; a_BlockMeta = 0; diff --git a/src/Items/ItemSugarcane.h b/src/Items/ItemSugarcane.h index dd2e2ece3..86e90f838 100644 --- a/src/Items/ItemSugarcane.h +++ b/src/Items/ItemSugarcane.h @@ -16,7 +16,7 @@ public: { } - virtual bool IsPlaceable(void) override + virtual bool IsPlaceable(void) /*override*/ { return true; } @@ -26,7 +26,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) /*override*/ { a_BlockType = E_BLOCK_SUGARCANE; a_BlockMeta = 0; diff --git a/src/Items/ItemSword.h b/src/Items/ItemSword.h index 2b2dbfc0d..e806801e0 100644 --- a/src/Items/ItemSword.h +++ b/src/Items/ItemSword.h @@ -20,7 +20,7 @@ public: } - virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) override + virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) /*override*/ { if (a_BlockType == E_BLOCK_COBWEB) { @@ -30,7 +30,7 @@ public: } - virtual bool CanRepairWithRawMaterial(short a_ItemType) override + virtual bool CanRepairWithRawMaterial(short a_ItemType) /*override*/ { switch (m_ItemType) { @@ -44,7 +44,7 @@ public: } - virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) override + virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) /*override*/ { switch ((int)a_Action) { diff --git a/src/Items/ItemThrowable.h b/src/Items/ItemThrowable.h index c151c5d3a..9d1280eb5 100644 --- a/src/Items/ItemThrowable.h +++ b/src/Items/ItemThrowable.h @@ -26,7 +26,7 @@ public: } - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/ { Vector3d Pos = a_Player->GetThrowStartPos(); Vector3d Speed = a_Player->GetLookVector() * m_SpeedCoeff; @@ -128,7 +128,7 @@ public: { } - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) /*override*/ { if (a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ) == E_BLOCK_AIR) { |