oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Increase node id/param0 to 16 bits, leaving param2 always with 8 bits

Browse source
This commit is contained in:
darkrose 2012-07-18 05:04:38 +10:00 • committed by Perttu Ahola
parent cd6becd442
commit ea62ee4b61
4 changed files with 78 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/mapnode.h
View file

@ -85,9 +85,9 @@ struct MapNode
/*
Main content
0x00-0x7f: Short content type
0x80-0xff: Long content type (param2>>4 makes up low bytes)
0x80-0xff: Long content type
*/
u8 param0;
u16 param0;
/*
Misc parameter. Initialized to 0.
@ -102,7 +102,6 @@ struct MapNode
/*
The second parameter. Initialized to 0.
E.g. direction for torches and flowing water.
If param0 >= 0x80, bits 0xf0 of this is extended content type data
*/
u8 param2;
@ -113,11 +112,9 @@ struct MapNode
MapNode(content_t content=CONTENT_AIR, u8 a_param1=0, u8 a_param2=0)
{
param0 = content;
param1 = a_param1;
param2 = a_param2;
// Set content (param0 and (param2&0xf0)) after other params
// because this needs to override part of param2
setContent(content);
}
// Create directly from a nodename
@ -135,25 +132,11 @@ struct MapNode
// To be used everywhere
content_t getContent() const
{
if(param0 < 0x80)
return param0;
else
return (param0<<4) + (param2>>4);
return param0;
}
void setContent(content_t c)
{
if(c < 0x80)
{
if(param0 >= 0x80)
param2 &= ~(0xf0);
param0 = c;
}
else
{
param0 = c>>4;
param2 &= ~(0xf0);
param2 |= (c&0x0f)<<4;
}
param0 = c;
}
u8 getParam1() const
{
@ -165,19 +148,11 @@ struct MapNode
}
u8 getParam2() const
{
if(param0 < 0x80)
return param2;
else
return param2 & 0x0f;
return param2;
}
void setParam2(u8 p)
{
if(param0 < 0x80)
param2 = p;
else{
param2 &= 0xf0;
param2 |= (p&0x0f);
}
param2 = p;
}
void setLight(enum LightBank bank, u8 a_light, INodeDefManager *nodemgr);