diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-04-29 17:25:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-29 17:25:25 +0200 |
| commit | 3db66b453152c3610b858aa1650e1ab3f545a430 (patch) | |
| tree | d1d625c50f8c350ff1f52b7ed446bd0ed2ea4e6b /src/clientenvironment.h | |
| parent | f727f54192644f6427ac1b2c86df8c64c7c5fdf0 (diff) | |
| download | minetest-3db66b453152c3610b858aa1650e1ab3f545a430.tar.gz minetest-3db66b453152c3610b858aa1650e1ab3f545a430.tar.bz2 minetest-3db66b453152c3610b858aa1650e1ab3f545a430.zip | |
Client & ClientEnvirnment: don't create fake events (#5676)
Instead of create fake events on the stack on each loop call (Game::run), verify is queue is empty or not and handle event directly if there is.
This prevents fake ClientEvent creation & memory allocations
Same fix is also applied on ClientEnvironment, & rename getClientEvent to getClientEnvEvent to match ClientEnvEvent object
Diffstat (limited to 'src/clientenvironment.h')
| -rw-r--r-- | src/clientenvironment.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/clientenvironment.h b/src/clientenvironment.h index c273ede54..79b4797ad 100644 --- a/src/clientenvironment.h +++ b/src/clientenvironment.h @@ -126,8 +126,9 @@ public: void getActiveObjects(v3f origin, f32 max_d, std::vector<DistanceSortedActiveObject> &dest); - // Get event from queue. CEE_NONE is returned if queue is empty. - ClientEnvEvent getClientEvent(); + bool hasClientEnvEvents() const { return !m_client_event_queue.empty(); } + // Get event from queue. If queue is empty, it triggers an assertion failure. + ClientEnvEvent getClientEnvEvent(); /*! * Gets closest object pointed by the shootline. |