From 86a991c5a85a9771143320de91d87f6e986300a9 Mon Sep 17 00:00:00 2001 From: "lapayo94@gmail.com" Date: Mon, 16 Jul 2012 19:20:37 +0000 Subject: Some code improvements git-svn-id: http://mc-server.googlecode.com/svn/trunk@677 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/blocks/Block.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blocks/Block.cpp') diff --git a/source/blocks/Block.cpp b/source/blocks/Block.cpp index 1fd7a1af8..215a6c618 100644 --- a/source/blocks/Block.cpp +++ b/source/blocks/Block.cpp @@ -42,7 +42,7 @@ bool cBlockHandler::m_HandlerInitialized = false; cBlockHandler *cBlockHandler::m_BlockHandler[256]; -cBlockHandler *cBlockHandler::GetBlockHandler(char a_BlockID) +cBlockHandler *cBlockHandler::GetBlockHandler(BLOCKTYPE a_BlockID) { if(!m_HandlerInitialized) { //We have to initialize @@ -227,7 +227,7 @@ void cBlockHandler::OnClick(cWorld *a_World, cPlayer *a_Player, int a_X, int a_Y } -void cBlockHandler::PlaceBlock(cWorld *a_World, cPlayer *a_Player, char a_BlockMeta, int a_X, int a_Y, int a_Z, char a_Dir) +void cBlockHandler::PlaceBlock(cWorld *a_World, cPlayer *a_Player, NIBBLETYPE a_BlockMeta, int a_X, int a_Y, int a_Z, char a_Dir) { a_World->SetBlock(a_X, a_Y, a_Z, m_BlockID, a_BlockMeta); OnPlacedByPlayer(a_World, a_Player, a_X, a_Y, a_Z, a_Dir); @@ -249,7 +249,7 @@ int cBlockHandler::GetDropID() return m_BlockID; } -char cBlockHandler::GetDropMeta(char a_BlockMeta) +NIBBLETYPE cBlockHandler::GetDropMeta(NIBBLETYPE a_BlockMeta) { return a_BlockMeta; //This keeps most textures. The few other blocks have to override this } @@ -257,7 +257,7 @@ char cBlockHandler::GetDropMeta(char a_BlockMeta) void cBlockHandler::DropBlock(cWorld *a_World, int a_X, int a_Y, int a_Z) { cItems Drops; - char Meta = a_World->GetBlockMeta(a_X, a_Y, a_Z); + NIBBLETYPE Meta = a_World->GetBlockMeta(a_X, a_Y, a_Z); char DropCount = GetDropCount(); int DropItem = GetDropID(); if(DropCount > 0 && DropItem != E_ITEM_EMPTY) -- cgit v1.2.3