eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 01:59:19 +02:00
Code Issues 121 Wiki Activity

Merge branch 'milek-dev' into udpnetwork

Browse Source
This commit is contained in:
milek7
2019-02-21 19:57:08 +01:00
parent 56584dc13e 267c4472a3
commit b5b230902a
30 changed files with 1467 additions and 1072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scene.cpp
View File

@@ -124,7 +124,8 @@ basic_cell::update_events() {
// event launchers
for( auto *launcher : m_eventlaunchers ) {
if (launcher->check_conditions()
&& SquareMagnitude( launcher->location() - Global.pCamera.Pos ) < launcher->dRadius) {
&& (launcher->dRadius < 0.0
|| SquareMagnitude( launcher->location() - Global.pCamera.Pos ) < launcher->dRadius)) {
if (launcher->check_activation())
launch_event(launcher, true);
if (launcher->check_activation_key())