From 69dbc046eb5a82b38c6d5c3302e9b3b0b3c1bcf1 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 21 Feb 2011 16:10:36 +0200 Subject: preliminary lua scripting framework for objects --- src/map.h | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'src/map.h') diff --git a/src/map.h b/src/map.h index adff82db0..d39ede26f 100644 --- a/src/map.h +++ b/src/map.h @@ -157,23 +157,22 @@ public: v3s16 relpos = p - blockpos*MAP_BLOCKSIZE; blockref->setNodeNoCheck(relpos, n); } - - /*MapNode getNodeGenerate(v3s16 p) + + // Returns a CONTENT_IGNORE node if not found + MapNode getNodeNoEx(v3s16 p) { - v3s16 blockpos = getNodeBlockPos(p); - MapBlock * blockref = getBlock(blockpos); - v3s16 relpos = p - blockpos*MAP_BLOCKSIZE; - - return blockref->getNode(relpos); - }*/ + try{ + v3s16 blockpos = getNodeBlockPos(p); + MapBlock * blockref = getBlockNoCreate(blockpos); + v3s16 relpos = p - blockpos*MAP_BLOCKSIZE; - /*void setNodeGenerate(v3s16 p, MapNode & n) - { - v3s16 blockpos = getNodeBlockPos(p); - MapBlock * blockref = getBlock(blockpos); - v3s16 relpos = p - blockpos*MAP_BLOCKSIZE; - blockref->setNode(relpos, n); - }*/ + return blockref->getNodeNoCheck(relpos); + } + catch(InvalidPositionException &e) + { + return MapNode(CONTENT_IGNORE); + } + } void unspreadLight(enum LightBank bank, core::map & from_nodes, -- cgit v1.2.3