eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2018-09-20 22:07:56 +02:00
parent 7c6501bb07 d9020b5881
commit f5d7b1bfa9
39 changed files with 2994 additions and 2168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Track.cpp
View File

@@ -124,7 +124,7 @@ void TIsolated::Modify(int i, TDynamicObject *o)
multiplayer::WyslijString(asName, 10); // wysłanie pakietu o zwolnieniu
if (pMemCell) // w powiązanej komórce
pMemCell->UpdateValues( "", 0, int( pMemCell->Value2() ) & ~0xFF,
update_memval2 ); //"zerujemy" ostatnią wartość
basic_event::flags::value_2 ); //"zerujemy" ostatnią wartość
}
}
else
@@ -137,7 +137,7 @@ void TIsolated::Modify(int i, TDynamicObject *o)
if (Global.iMultiplayer) // jeśli multiplayer
multiplayer::WyslijString(asName, 11); // wysłanie pakietu o zajęciu
if (pMemCell) // w powiązanej komórce
pMemCell->UpdateValues( "", 0, int( pMemCell->Value2() ) | 1, update_memval2 ); // zmieniamy ostatnią wartość na nieparzystą
pMemCell->UpdateValues( "", 0, int( pMemCell->Value2() ) | 1, basic_event::flags::value_2 ); // zmieniamy ostatnią wartość na nieparzystą
}
}
// pass the event to the parent
@@ -915,7 +915,7 @@ bool TTrack::AssignEvents() {
m_events = true;
}
else {
ErrorLog( "Bad event: event \"" + event.first + "\" assigned to track \"" + m_name + "\" does not exist" );
ErrorLog( "Bad track: \"" + m_name + "\" can't find assigned event \"" + event.first + "\"" );
lookupfail = true;
}
}
@@ -939,7 +939,7 @@ bool TTrack::AssignEvents() {
return ( lookupfail == false );
}
bool TTrack::AssignForcedEvents(TEvent *NewEventPlus, TEvent *NewEventMinus)
bool TTrack::AssignForcedEvents(basic_event *NewEventPlus, basic_event *NewEventMinus)
{ // ustawienie eventów sygnalizacji rozprucia
if (SwitchExtension)
{
@@ -965,7 +965,7 @@ void TTrack::QueueEvents( event_sequence const &Events, TDynamicObject const *Ow
for( auto const &event : Events ) {
if( ( event.second != nullptr )
&& ( event.second->fDelay <= Delaylimit) ) {
&& ( event.second->m_delay <= Delaylimit) ) {
simulation::Events.AddToQuery( event.second, Owner );
}
}
@@ -1121,7 +1121,7 @@ bool TTrack::InMovement()
return false;
};
void TTrack::RaAssign( TAnimModel *am, TEvent *done, TEvent *joined )
void TTrack::RaAssign( TAnimModel *am, basic_event *done, basic_event *joined )
{ // Ra: wiązanie toru z modelem obrotnicy
if (eType == tt_Table)
{
@@ -2854,7 +2854,7 @@ TTrack::export_as_text_( std::ostream &Output ) const {
Output
<< eventsequence.first << ' '
<< ( event.second != nullptr ?
event.second->asName :
event.second->m_name :
event.first )
<< ' ';
}