cpp/openttd-patchpack/source Changeset - r2235:5593fd36d118

Changeset - r2235:5593fd36d118

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

ludde - 19 years ago 2005-07-29 21:55:49
ludde@openttd.org

(svn r2755) Fix: Fix a desync issue with autoreplace

3 files changed with 10 insertions and 10 deletions:

network.c

network_server.c

network_server.h

0 comments (0 inline, 0 general)

network.c

➞

Show inline comments

@@ @@ -1205,8 +1205,15 @@ void NetworkGameLoop(void) @@
 	if (!NetworkReceive()) return;
 	if (_network_server) {
 		bool send_frame = false;
 		// We first increase the _frame_counter
 		_frame_counter++;
 		// Update max-frame-counter
 		if (_frame_counter > _frame_counter_max) {
 			_frame_counter_max = _frame_counter + _network_frame_freq;
 			send_frame = true;
+		}
 		NetworkHandleLocalQueue();
@@ @@ -1218,7 +1225,7 @@ void NetworkGameLoop(void) @@
 		_sync_seed_2 = _random_seeds[0][1];
 #endif
 		NetworkServer_Tick();
+		NetworkServer_Tick(send_frame);
 	} else {
 		// Client

network_server.c

➞

Show inline comments

@@ @@ -1499,20 +1499,13 @@ void NetworkHandleCommandQueue(NetworkCl @@
+}
 // This is called every tick if this is a _network_server
-void NetworkServer_Tick(void)
+void NetworkServer_Tick(bool send_frame)
+{
 	NetworkClientState *cs;
 	bool send_frame = false;
 #ifndef ENABLE_NETWORK_SYNC_EVERY_FRAME
 	bool send_sync = false;
 #endif
 	// Update max-frame-counter
 	if (_frame_counter > _frame_counter_max) {
 		_frame_counter_max = _frame_counter + _network_frame_freq;
 		send_frame = true;
+	}
 #ifndef ENABLE_NETWORK_SYNC_EVERY_FRAME
 	if (_frame_counter >= _last_sync_frame + _network_sync_freq) {
 		_last_sync_frame = _frame_counter;

network_server.h

➞

Show inline comments

@@ @@ -16,7 +16,7 @@ bool NetworkFindName(char new_name[NETWO @@
 void NetworkServer_HandleChat(NetworkAction action, DestType desttype, int dest, const char *msg, uint16 from_index);
 bool NetworkServer_ReadPackets(NetworkClientState *cs);
-void NetworkServer_Tick(void);
+void NetworkServer_Tick(bool send_frame);
 void NetworkServerMonthlyLoop(void);
 void NetworkServerYearlyLoop(void);

0 comments (0 inline, 0 general)