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

Merge remote-tracking branch 'upstream/master' into utilities-simplification

Browse Source
This commit is contained in:
docentYT
2026-05-05 23:08:43 +02:00
parent d464628a8e 5ce03b5bcb
commit 5367cb9940
17 changed files with 10693 additions and 9119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vehicle/DynObj.cpp
View File

@@ -293,7 +293,7 @@ material_data::assign( std::string const &Replacableskin ) {
// check for the pipe method first
if( contains( Replacableskin, '|' ) ) {
cParser nameparser( Replacableskin );
nameparser.getTokens( 4, true, "|" );
nameparser.getTokens( 4, false, "|" );
int skinindex = 0;
std::string texturename; nameparser >> texturename;
while( ( texturename != "" ) && ( skinindex < 4 ) ) {

19427
vehicle/Train.cpp
View File

File diff suppressed because it is too large Load Diff

8
vehicle/Train.h
View File

@@ -236,11 +236,19 @@ class TTrain {
static void OnCommand_aidriverenable( TTrain *Train, command_data const &Command );
static void OnCommand_aidriverdisable( TTrain *Train, command_data const &Command );
static void OnCommand_jointcontrollerset( TTrain *Train, command_data const &Command );
static void OnCommand_mastercontrollerincrease( TTrain *Train, command_data const &Command );
static void OnCommand_mastercontrollerincreasefast( TTrain *Train, command_data const &Command );
static void OnCommand_mastercontrollerdecrease( TTrain *Train, command_data const &Command );
static void OnCommand_mastercontrollerdecreasefast( TTrain *Train, command_data const &Command );
static void OnCommand_mastercontrollerset( TTrain *Train, command_data const &Command );
static void OnCommand_DynamicBrakeControllerIncrease( TTrain *Train, command_data const &Command );
static void OnCommand_DynamicBrakeControllerIncreaseFast( TTrain *Train, command_data const &Command );
static void OnCommand_DynamicBrakeControllerDecrease( TTrain *Train, command_data const &Command );
static void OnCommand_DynamicBrakeControllerDecreaseFast( TTrain *Train, command_data const &Command );
static void OnCommand_DynamicBrakeControllerSet( TTrain *Train, command_data const &Command );
static void OnCommand_secondcontrollerincrease( TTrain *Train, command_data const &Command );
static void OnCommand_secondcontrollerincreasefast( TTrain *Train, command_data const &Command );
static void OnCommand_secondcontrollerdecrease( TTrain *Train, command_data const &Command );