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

build 171224. support for radio-transmitted sound events, configurable wheel flat sound

Browse Source
This commit is contained in:
tmj-fstate
2017-12-25 16:01:32 +01:00
parent 1b5e6aafd1
commit c780f3efbf
11 changed files with 166 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Event.cpp
View File

@@ -407,14 +407,15 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org)
*parser >> token;
break;
case tp_Sound:
// Params[0].asRealSound->Init(asNodeName.c_str(),Parser->GetNextSymbol().ToDouble(),Parser->GetNextSymbol().ToDouble(),Parser->GetNextSymbol().ToDouble(),Parser->GetNextSymbol().ToDouble());
// McZapkie-070502: dzwiek przestrzenny (ale do poprawy)
// Params[1].asdouble=Parser->GetNextSymbol().ToDouble();
// Params[2].asdouble=Parser->GetNextSymbol().ToDouble();
// Params[3].asdouble=Parser->GetNextSymbol().ToDouble(); //polozenie X,Y,Z - do poprawy!
parser->getTokens();
*parser >> Params[0].asInt; // 0: wylaczyc, 1: wlaczyc; -1: wlaczyc zapetlone
Params[1].asdouble = 0.0;
parser->getTokens();
if( parser->peek() != "endevent" ) {
// optional parameter, radio channel to receive/broadcast the sound
*parser >> Params[1].asdouble;
parser->getTokens();
}
*parser >> token;
break;
case tp_Exit:
@@ -1032,7 +1033,14 @@ event_manager::CheckQuery() {
break;
}
case 1: {
m_workevent->Params[ 9 ].tsTextSound->play( sound_flags::exclusive );
if( m_workevent->Params[ 1 ].asdouble > 0.0 ) {
Global::pWorld->radio_message(
m_workevent->Params[ 9 ].tsTextSound,
static_cast<int>( m_workevent->Params[ 1 ].asdouble ) );
}
else {
m_workevent->Params[ 9 ].tsTextSound->play( sound_flags::exclusive );
}
break;
}
case -1: {