oerkki/voxelands
oerkki
/
voxelands
2
1
Fork 1
Code Issues 19 Pull Requests Releases Activity

tweak fire timing a bit

This commit is contained in:
darkrose 2015-01-23 06:46:12 +10:00
parent 56f8114d1c
commit 3d7ca4426a
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/content_mapnode_special.cpp
View File

@ -652,6 +652,7 @@ void content_mapnode_special(bool repeat)
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->solidness = 0;
content_nodebox_book(f);
//f->setFaceText(0,FaceText(0.05,0.175,0.9875,0.7375));
f->setInventoryTextureNodeBox(i, "book_cover.png", "book_end.png^[transformFX", "book_side.png^[transformFY");
f->type = CMT_DIRT;
f->hardness = 1.0;

1
src/content_nodemeta.h
View File

@ -463,6 +463,7 @@ public:
NodeMetadata* clone();
static NodeMetadata* create(std::istream &is);
virtual void serializeBody(std::ostream &os);
virtual std::string getText() {return m_title;}
virtual std::wstring infoText() {return narrow_to_wide(m_title);}
virtual bool nodeRemovalDisabled();
virtual bool import(NodeMetadata *meta);

4
src/environment.cpp
View File

@ -1820,7 +1820,7 @@ void ServerEnvironment::step(float dtime)
// fire that goes out
case CONTENT_FIRE_SHORTTERM:
{
if (n.envticks > 10) {
if (n.envticks > 2) {
m_map->removeNodeWithEvent(p);
v3f ash_pos = intToFloat(p, BS);
ash_pos += v3f(myrand_range(-1500,1500)*1.0/1000, 0, myrand_range(-1500,1500)*1.0/1000);
@ -1836,7 +1836,7 @@ void ServerEnvironment::step(float dtime)
MapNode n_below = m_map->getNodeNoEx(p+v3s16(0,-1,0));
if (!content_features(n_below).flammable) {
m_map->removeNodeWithEvent(p);
}else if (n.envticks > 10) {
}else{
s16 bs_rad = g_settings->getS16("borderstone_radius");
bs_rad += 2;
// if any node is border stone protected, don't spread