diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-08-15 11:49:39 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-08-15 11:49:39 +0300 |
| commit | 472585a7e8e511e7cc210ad8e2c17cad9dfeb186 (patch) | |
| tree | ab131c0da2aa37764d6a27bc269d8e365d3c53f9 /src/environment.cpp | |
| parent | 8f42a8be0c760322207287e50b624bd3d388a2e1 (diff) | |
| download | minetest-472585a7e8e511e7cc210ad8e2c17cad9dfeb186.tar.gz minetest-472585a7e8e511e7cc210ad8e2c17cad9dfeb186.tar.bz2 minetest-472585a7e8e511e7cc210ad8e2c17cad9dfeb186.zip | |
tuned lava/universal damage code
Diffstat (limited to 'src/environment.cpp')
| -rw-r--r-- | src/environment.cpp | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/environment.cpp b/src/environment.cpp index 05efe9eea..d6ff4d826 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -1638,18 +1638,28 @@ void ClientEnvironment::step(float dtime) if(m_lava_hurt_interval.step(dtime, 1.0)) { v3f pf = lplayer->getPosition(); - v3s16 p1 = floatToInt(pf + v3f(0, BS*0.0, 0), BS); + + // Feet, middle and head + v3s16 p1 = floatToInt(pf + v3f(0, BS*0.1, 0), BS); MapNode n1 = m_map->getNodeNoEx(p1); - v3s16 p2 = floatToInt(pf + v3f(0, BS*1.5, 0), BS); + v3s16 p2 = floatToInt(pf + v3f(0, BS*0.8, 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) + v3s16 p3 = floatToInt(pf + v3f(0, BS*1.6, 0), BS); + MapNode n3 = m_map->getNodeNoEx(p2); + + u32 damage_per_second = 0; + damage_per_second = MYMAX(damage_per_second, + content_features(n1).damage_per_second); + damage_per_second = MYMAX(damage_per_second, + content_features(n2).damage_per_second); + damage_per_second = MYMAX(damage_per_second, + content_features(n3).damage_per_second); + + if(damage_per_second != 0) { ClientEnvEvent event; event.type = CEE_PLAYER_DAMAGE; - event.player_damage.amount = 4*2; // 4 hearts + event.player_damage.amount = damage_per_second; m_client_event_queue.push_back(event); } } |