1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
This commit is contained in:
Perttu Ahola 2011-08-15 02:04:56 +03:00
parent c4b707bca2
commit 8f42a8be0c
11 changed files with 255 additions and 89 deletions

View file

@ -1632,6 +1632,28 @@ void ClientEnvironment::step(float dtime)
}
}
/*
A quick draft of lava damage
*/
if(m_lava_hurt_interval.step(dtime, 1.0))
{
v3f pf = lplayer->getPosition();
v3s16 p1 = floatToInt(pf + v3f(0, BS*0.0, 0), BS);
MapNode n1 = m_map->getNodeNoEx(p1);
v3s16 p2 = floatToInt(pf + v3f(0, BS*1.5, 0), BS);
MapNode n2 = m_map->getNodeNoEx(p2);
if(n1.getContent() == CONTENT_LAVA ||
n1.getContent() == CONTENT_LAVASOURCE ||
n2.getContent() == CONTENT_LAVA ||
n2.getContent() == CONTENT_LAVASOURCE)
{
ClientEnvEvent event;
event.type = CEE_PLAYER_DAMAGE;
event.player_damage.amount = 4*2; // 4 hearts
m_client_event_queue.push_back(event);
}
}
/*
Stuff that can be done in an arbitarily large dtime
*/
@ -1917,6 +1939,13 @@ void ClientEnvironment::drawPostFx(video::IVideoDriver* driver, v3f camera_pos)
core::rect<s32> rect(0,0, ss.X, ss.Y);
driver->draw2DRectangle(video::SColor(64, 100, 100, 200), rect);
}
else if(content_features(n).solidness == 2 &&
g_settings.getBool("free_move") == false)
{
v2u32 ss = driver->getScreenSize();
core::rect<s32> rect(0,0, ss.X, ss.Y);
driver->draw2DRectangle(video::SColor(255, 0, 0, 0), rect);
}
}
#endif // #ifndef SERVER