dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Jump counter is no longer a separate field

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-10-17 15:10:49 +01:00
parent 6e17f9bf5d
commit b9f7db9c7e
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/order_cmd.cpp
View File

@@ -176,12 +176,13 @@ void Order::MakeLoading(bool ordered)
*/
bool Order::UpdateJumpCounter(byte percent, bool dry_run)
{
if (dry_run) return this->jump_counter >= 0;
if (this->jump_counter >= 0) {
this->jump_counter += (percent - 100);
const int8 jump_counter = this->GetJumpCounter();
if (dry_run) return jump_counter >= 0;
if (jump_counter >= 0) {
this->SetJumpCounter(jump_counter + (percent - 100));
return true;
}
this->jump_counter += percent;
this->SetJumpCounter(jump_counter + percent);
return false;
}
@@ -320,7 +321,6 @@ Order::Order(uint32 packed)
this->occupancy = 0;
this->wait_time = 0;
this->travel_time = 0;
this->jump_counter = 0;
this->max_speed = UINT16_MAX;
}
@@ -361,7 +361,6 @@ void Order::AssignOrder(const Order &other)
this->wait_time = other.wait_time;
this->jump_counter = other.jump_counter;
this->travel_time = other.travel_time;
this->max_speed = other.max_speed;