diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2018-03-30 18:32:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-30 18:32:52 +0200 |
| commit | ce873108aa91d19104f46c5acd3350385e7a4541 (patch) | |
| tree | 58672a3c803469de71c9ae270beb9a052ba5559a /src/clientenvironment.cpp | |
| parent | 2c490dddc037d7d1cf211bbf28309e31b0abdadd (diff) | |
| download | minetest-ce873108aa91d19104f46c5acd3350385e7a4541.tar.gz minetest-ce873108aa91d19104f46c5acd3350385e7a4541.tar.bz2 minetest-ce873108aa91d19104f46c5acd3350385e7a4541.zip | |
Client eventmanager refactor (#7179)
* Drop EventManager from GameDef & do some client cleanups
* EventManager is only used by Client. Don't expose it on Server & GameDef for nothing
* Drop Client::event() in favor of direct calls to getEventManager
* Cleanup some event put from new + put to put(new)
* MtEvent: add Type(u8) enum
* This will enhance event performance & ensure stricter type
* Drop MtEvent::checkIs (unused)
* clang-tidy reported fixes
* Code style
* Move event_manager.h to the client directory as it's only used by client
Add EventManager unittests + switch to unordered_map as order is not important here
Drop a unused function
Diffstat (limited to 'src/clientenvironment.cpp')
| -rw-r--r-- | src/clientenvironment.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/clientenvironment.cpp b/src/clientenvironment.cpp index 8de073258..76ac080d4 100644 --- a/src/clientenvironment.cpp +++ b/src/clientenvironment.cpp @@ -227,7 +227,7 @@ void ClientEnvironment::step(float dtime) get(m_map->getNodeNoEx(info.node_p)); // Determine fall damage multiplier int addp = itemgroup_get(f.groups, "fall_damage_add_percent"); - pre_factor = 1.0 + (float)addp/100.0; + pre_factor = 1.0f + (float)addp / 100.0f; } float speed = pre_factor * speed_diff.getLength(); if (speed > tolerance && !player_immortal) { @@ -235,8 +235,7 @@ void ClientEnvironment::step(float dtime) u8 damage = (u8)MYMIN(damage_f + 0.5, 255); if (damage != 0) { damageLocalPlayer(damage, true); - MtEvent *e = new SimpleTriggerEvent("PlayerFallingDamage"); - m_client->event()->put(e); + m_client->getEventManager()->put(new SimpleTriggerEvent(MtEvent::PLAYER_FALLING_DAMAGE)); } } } |