summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Train.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-31 23:57:18 +0200
committeraap <aap@papnet.eu>2019-07-31 23:57:18 +0200
commit78c15c4828a540fd6ad4f1816b8cc9610409f740 (patch)
tree800fc93cb0226accb1806a8104bc3eccfb4f71f7 /src/vehicles/Train.cpp
parentMerge branch 'master' of github.com:GTAmodding/re3 (diff)
downloadre3-78c15c4828a540fd6ad4f1816b8cc9610409f740.tar
re3-78c15c4828a540fd6ad4f1816b8cc9610409f740.tar.gz
re3-78c15c4828a540fd6ad4f1816b8cc9610409f740.tar.bz2
re3-78c15c4828a540fd6ad4f1816b8cc9610409f740.tar.lz
re3-78c15c4828a540fd6ad4f1816b8cc9610409f740.tar.xz
re3-78c15c4828a540fd6ad4f1816b8cc9610409f740.tar.zst
re3-78c15c4828a540fd6ad4f1816b8cc9610409f740.zip
Diffstat (limited to 'src/vehicles/Train.cpp')
-rw-r--r--src/vehicles/Train.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/vehicles/Train.cpp b/src/vehicles/Train.cpp
index cf00cc63..dada1b21 100644
--- a/src/vehicles/Train.cpp
+++ b/src/vehicles/Train.cpp
@@ -484,8 +484,8 @@ CTrain::InitTrains(void)
void
CTrain::Shutdown(void)
{
- if(pTrackNodes) delete[] pTrackNodes;
- if(pTrackNodes_S) delete[] pTrackNodes_S;
+ delete[] pTrackNodes;
+ delete[] pTrackNodes_S;
pTrackNodes = nil;
pTrackNodes_S = nil;
}
@@ -582,7 +582,7 @@ CTrain::ReadAndInterpretTrackFile(char *filename, CTrainNode **nodes, int16 *num
interpLines[j].speed = 15.0f;
interpLines[j].acceleration = -45.0f/32.0f;
j++;
- time += 16.0f/3.0f;
+ time += 80.0f/15.0f;
position += 40.0f; // at station
// stopping
@@ -601,7 +601,7 @@ CTrain::ReadAndInterpretTrackFile(char *filename, CTrainNode **nodes, int16 *num
interpLines[j].speed = 0.0f;
interpLines[j].acceleration = 45.0f/32.0f;
j++;
- time += 16.0f/3.0f;
+ time += 80.0f/15.0f;
position += 40.0f; // after station
}
// last keyframe
@@ -657,7 +657,7 @@ CTrain::UpdateTrains(void)
}
// time offset for each train
- time += 0x10000;
+ time += 0x20000/2;
}
ProcessTrainAnnouncements();
@@ -687,7 +687,7 @@ CTrain::UpdateTrains(void)
}
// time offset for each train
- time += 0x10000;
+ time += 0x40000/4;
}
}