mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r2043) -Fix: committed too many files in the last commit

This commit is contained in:
truelight 2005-03-24 14:33:05 +00:00
parent fbb11ea366
commit 9b1e6e6d3e
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dedicated.c
View File

@ -302,7 +302,7 @@ static int DedicatedVideoMainLoop(void)
#endif
if (cur_ticks >= next_tick) {
// next_tick += 30;
next_tick += 30;
GameLoop();
_screen.dst_ptr = _dedicated_video_mem;

6
economy.c
View File

@ -1346,6 +1346,9 @@ int LoadUnloadVehicle(Vehicle *v)
assert(v->current_order.type == OT_LOADING);
v->cur_speed = 0;
old_player = _current_player;
_current_player = v->owner;
st = GetStation(last_visited = v->last_station_visited);
for (; v != NULL; v = v->next) {
@ -1452,9 +1455,6 @@ int LoadUnloadVehicle(Vehicle *v)
TriggerVehicle(v, VEHICLE_TRIGGER_EMPTY);
}
old_player = _current_player;
_current_player = v->owner;
if (result != 0) {
InvalidateWindow(WC_VEHICLE_DETAILS, v->index);

2
engine.c
View File

@ -567,8 +567,6 @@ static void DoTriggerVehicle(Vehicle *veh, VehicleTrigger trigger, byte base_ran
RealSpriteGroup *rsg;
byte new_random_bits;
assert(_current_player >= MAX_PLAYERS);
_vsg_random_triggers = trigger;
_vsg_bits_to_reseed = 0;
rsg = TriggerVehicleSpriteGroup(GetVehicleSpriteGroup(veh->engine_type, veh), veh,

2
functions.h
View File

@ -92,7 +92,7 @@ void NORETURN CDECL error(const char *str, ...);
// * Warning: DO NOT enable this unless you understand what it does
// **************
#define RANDOM_DEBUG
//#define RANDOM_DEBUG
#ifdef RANDOM_DEBUG
#define Random() DoRandom(__LINE__, __FILE__)