1688 unloading_time <<= 1; |
1688 unloading_time <<= 1; |
1689 unloading_time += (overhang * unloading_time) / 8; |
1689 unloading_time += (overhang * unloading_time) / 8; |
1690 } |
1690 } |
1691 } |
1691 } |
1692 |
1692 |
1693 /* Calculate the loading indicator fill percent and display */ |
1693 /* Calculate the loading indicator fill percent and display |
1694 if (_patches.loading_indicators && _game_mode != GM_MENU && v->owner == _local_player) { |
1694 * In the Game Menu do not display indicators |
|
1695 * If _patches.loading_indicators == 2, show indicators (bool can be promoted to int as 0 or 1 - results in 2 > 0,1 ) |
|
1696 * if _patches.loading_indicators == 1, _local_player must be the owner or must be a spectator to show ind., so 1 > 0 |
|
1697 * if _patches.loading_indicators == 0, do not display indicators ... 0 is never greater than anything |
|
1698 */ |
|
1699 if (_game_mode != GM_MENU && (_patches.loading_indicators > (v->owner != _local_player && _local_player != PLAYER_SPECTATOR))) { |
1695 StringID percent_up_down = STR_NULL; |
1700 StringID percent_up_down = STR_NULL; |
1696 int percent = CalcPercentVehicleFilled(v, &percent_up_down); |
1701 int percent = CalcPercentVehicleFilled(v, &percent_up_down); |
1697 if (v->fill_percent_te_id == INVALID_TE_ID) { |
1702 if (v->fill_percent_te_id == INVALID_TE_ID) { |
1698 v->fill_percent_te_id = ShowFillingPercent(v->x_pos, v->y_pos, v->z_pos + 20, percent, percent_up_down); |
1703 v->fill_percent_te_id = ShowFillingPercent(v->x_pos, v->y_pos, v->z_pos + 20, percent, percent_up_down); |
1699 } else { |
1704 } else { |