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

Merge branch 'tmj-dev'

Browse Source
This commit is contained in:
milek7
2018-02-16 15:25:53 +01:00
parent 910b0b1dd6 2dd82bf71b
commit 61836eb2e4
113 changed files with 4617 additions and 4057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Event.cpp
View File

@@ -17,11 +17,10 @@ http://mozilla.org/MPL/2.0/.
#include "event.h"
#include "simulation.h"
#include "World.h"
#include "Globals.h"
#include "Timer.h"
#include "Logs.h"
#include "World.h"
#include "messaging.h"
TEvent::TEvent( std::string const &m ) :
asNodeName( m )
@@ -773,7 +772,7 @@ event_manager::insert( TEvent *Event ) {
}
auto *duplicate = m_events[ lookup->second ];
if( Global::bJoinEvents ) {
if( Global.bJoinEvents ) {
// doczepka (taki wirtualny multiple bez warunków)
duplicate->Append( Event );
}
@@ -952,7 +951,7 @@ event_manager::CheckQuery() {
case tp_GetValues: {
if( m_workevent->Activator ) {
// TODO: re-enable when messaging module is in place
if( Global::iMultiplayer ) {
if( Global.iMultiplayer ) {
// potwierdzenie wykonania dla serwera (odczyt semafora już tak nie działa)
multiplayer::WyslijEvent( m_workevent->asName, m_workevent->Activator->name() );
}
@@ -1003,7 +1002,7 @@ event_manager::CheckQuery() {
}
case tp_Visible: {
if( m_workevent->Params[ 9 ].asEditorNode )
m_workevent->Params[ 9 ].asEditorNode->visible( m_workevent->Params[ i ].asInt > 0 );
m_workevent->Params[ 9 ].asEditorNode->visible( m_workevent->Params[ 0 ].asInt > 0 );
break;
}
case tp_Velocity: {
@@ -1011,7 +1010,7 @@ event_manager::CheckQuery() {
break;
}
case tp_Exit: {
Global::iTextMode = -1; // wyłączenie takie samo jak sekwencja F10 -> Y
Global.iTextMode = -1; // wyłączenie takie samo jak sekwencja F10 -> Y
return false;
}
case tp_Sound: {
@@ -1025,7 +1024,7 @@ event_manager::CheckQuery() {
}
case 1: {
if( m_workevent->Params[ 1 ].asdouble > 0.0 ) {
Global::pWorld->radio_message(
Global.pWorld->radio_message(
m_workevent->Params[ 9 ].tsTextSound,
static_cast<int>( m_workevent->Params[ 1 ].asdouble ) );
}
@@ -1089,7 +1088,7 @@ event_manager::CheckQuery() {
m_workevent->Params[ 1 ].asdouble,
m_workevent->Params[ 2 ].asdouble );
}
if( Global::iMultiplayer ) {
if( Global.iMultiplayer ) {
// dajemy znać do serwera o przełożeniu
multiplayer::WyslijEvent( m_workevent->asName, "" ); // wysłanie nazwy eventu przełączajacego
}
@@ -1132,7 +1131,7 @@ event_manager::CheckQuery() {
}
}
}
if( Global::iMultiplayer ) {
if( Global.iMultiplayer ) {
// dajemy znać do serwera o wykonaniu
if( ( m_workevent->iFlags & conditional_anyelse ) == 0 ) {
// jednoznaczne tylko, gdy nie było else
@@ -1246,7 +1245,7 @@ event_manager::CheckQuery() {
case tp_Friction: // zmiana tarcia na scenerii
{ // na razie takie chamskie ustawienie napięcia zasilania
WriteLog("Type: Friction");
Global::fFriction = (m_workevent->Params[0].asdouble);
Global.fFriction = (m_workevent->Params[0].asdouble);
}
break;
case tp_Message: // wyświetlenie komunikatu
@@ -1420,8 +1419,10 @@ event_manager::InitEvents() {
}
if( node != nullptr )
event->Params[ 9 ].asEditorNode = node;
else
else {
event->m_ignored = true;
ErrorLog( "Bad event: visibility event \"" + event->asName + "\" cannot find item \"" + event->asNodeName + "\"" );
}
event->asNodeName = "";
break;
}