From 0425d8c8a5f68ca571da87086180070f26156e82 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Tue, 28 Aug 2012 21:58:33 +0000 Subject: Fixed a few warnings git-svn-id: http://mc-server.googlecode.com/svn/trunk@799 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/blocks/Block.cpp | 6 +++--- source/blocks/BlockCrops.h | 2 -- source/blocks/BlockLeaves.h | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'source/blocks') diff --git a/source/blocks/Block.cpp b/source/blocks/Block.cpp index 2fa1ba718..3d2fe23e6 100644 --- a/source/blocks/Block.cpp +++ b/source/blocks/Block.cpp @@ -261,10 +261,10 @@ void cBlockHandler::DropBlock(cWorld *a_World, int a_X, int a_Y, int a_Z) cItems Drops; NIBBLETYPE Meta = a_World->GetBlockMeta(a_X, a_Y, a_Z); char DropCount = GetDropCount(); - int DropItem = GetDropID(); - if(DropCount > 0 && DropItem != E_ITEM_EMPTY) + short DropItem = (short)GetDropID(); + if (DropCount > 0 && (DropItem != E_ITEM_EMPTY)) { - Drops.push_back(cItem((ENUM_ITEM_ID)DropItem, DropCount, GetDropMeta(Meta))); + Drops.push_back(cItem(DropItem, DropCount, GetDropMeta(Meta))); a_World->SpawnItemPickups(Drops, a_X, a_Y, a_Z); } } diff --git a/source/blocks/BlockCrops.h b/source/blocks/BlockCrops.h index fb4934540..b5b543e76 100644 --- a/source/blocks/BlockCrops.h +++ b/source/blocks/BlockCrops.h @@ -31,8 +31,6 @@ public: MTRand rand; NIBBLETYPE Meta = a_World->GetBlockMeta(a_X, a_Y, a_Z); - ENUM_ITEM_ID Drop = E_ITEM_EMPTY; - cItems Drops; if(Meta & 0x7) //Is Wheat diff --git a/source/blocks/BlockLeaves.h b/source/blocks/BlockLeaves.h index 57cfad5da..c7bca92ac 100644 --- a/source/blocks/BlockLeaves.h +++ b/source/blocks/BlockLeaves.h @@ -12,7 +12,7 @@ #define PROCESS_NEIGHBOR(x,y,z) \ switch (a_Area.GetBlockType(x, y, z)) \ { \ - case E_BLOCK_LEAVES: a_Area.SetBlockType(x, y, z, E_BLOCK_SPONGE + i + 1); break; \ + case E_BLOCK_LEAVES: a_Area.SetBlockType(x, y, z, (BLOCKTYPE)(E_BLOCK_SPONGE + i + 1)); break; \ case E_BLOCK_LOG: return true; \ } -- cgit v1.2.3