cpp/openttd-patchpack/source Changeset - r1538:9b83bdd8ee42

Changeset - r1538:9b83bdd8ee42

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

truelight - 19 years ago 2005-03-24 14:31:27
truelight@openttd.org

(svn r2042) -Fix: forgot to remove a printf ;)

5 files changed with 7 insertions and 7 deletions:

dedicated.c

economy.c

engine.c

functions.h

misc.c

0 comments (0 inline, 0 general)

dedicated.c

➞

Show inline comments

@@ @@ -299,13 +299,13 @@ static int DedicatedVideoMainLoop(void) @@
 #else
 		gettimeofday(&tim, NULL);
 		cur_ticks = (tim.tv_usec / 1000) + (tim.tv_sec * 1000);
 #endif
 		if (cur_ticks >= next_tick) {
 			next_tick += 30;
+//			next_tick += 30;
 			GameLoop();
 			_screen.dst_ptr = _dedicated_video_mem;
 			UpdateWindows();
+		}
 		CSleep(1);

economy.c

➞

Show inline comments

@@ @@ -1343,15 +1343,12 @@ int LoadUnloadVehicle(Vehicle *v) @@
 	byte old_player;
 	bool completely_empty = true;
 	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) {
 		if (v->cargo_cap == 0) continue;
 		ge = &st->goods[v->cargo_type];
@@ @@ -1452,12 +1449,15 @@ int LoadUnloadVehicle(Vehicle *v) @@
 	v->load_unload_time_rem = unloading_time;
 	if (completely_empty) {
 		TriggerVehicle(v, VEHICLE_TRIGGER_EMPTY);
+	}
 	old_player = _current_player;
 	_current_player = v->owner;
 	if (result != 0) {
 		InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
 		if (result & 2)
 			InvalidateWindow(WC_STATION_VIEW, last_visited);

engine.c

➞

Show inline comments

@@ @@ -564,12 +564,14 @@ static RealSpriteGroup *TriggerVehicleSp @@
 static void DoTriggerVehicle(Vehicle *veh, VehicleTrigger trigger, byte base_random_bits, bool first)
+{
 	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,
 	                                (resolve_callback) TriggerVehicleSpriteGroup);
 	if (rsg->sprites_per_set == 0 && veh->cargo_type != 29) { /* XXX magic number */
 		// This group turned out to be empty but perhaps there'll be a default one.

functions.h

➞

Show inline comments

@@ @@ -89,13 +89,13 @@ void NORETURN CDECL error(const char *st @@
 // *  stdout if the first client joins (or if you are a client). This
 // *  is to help finding desync problems.
 // *
 // * 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__)
 	uint32 DoRandom(int line, const char *file);
 	#define RandomRange(max) DoRandomRange(max, __LINE__, __FILE__)
 	uint DoRandomRange(uint max, int line, const char *file);

misc.c

➞

Show inline comments

@@ @@ -606,14 +606,12 @@ void IncreaseDate(void) @@
 	_date_fract++;
 	if (_date_fract < DAY_TICKS)
 		return;
 	_date_fract = 0;
 	printf("%d\n", _frame_counter);
 	/* yeah, increse day counter and call various daily loops */
 	_date++;
 	/* We have a hole because of rounding errors, between the last vehicle checked and the max amount
 	 *  of vehicles.. correct for that problem here */
 	RunVehicleDayProc(total_vehicles - _vehicle_id_ctr_day);

0 comments (0 inline, 0 general)