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

@@ @@ -1196,38 +1196,45 @@ void NetworkUDPGameLoop(void) @@
+	}
+}
 // The main loop called from ttd.c
 //  Here we also have to do StateGameLoop if needed!
 void NetworkGameLoop(void)
+{
 	if (!_networking) return;
 	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();
 		// Then we make the frame
 		StateGameLoop();
 		_sync_seed_1 = _random_seeds[0][0];
 #ifdef NETWORK_SEND_DOUBLE_SEED
 		_sync_seed_2 = _random_seeds[0][1];
 #endif
 		NetworkServer_Tick();
+		NetworkServer_Tick(send_frame);
 	} else {
 		// Client
 		// Make sure we are at the frame were the server is (quick-frames)
 		if (_frame_counter_server > _frame_counter) {
 			while (_frame_counter_server > _frame_counter) {
 				if (!NetworkDoClientLoop()) break;
+			}
 		} else {
 			// Else, keep on going till _frame_counter_max
 			if (_frame_counter_max > _frame_counter) {
 				NetworkDoClientLoop();

network_server.c

➞

Show inline comments

@@ @@ -1490,38 +1490,31 @@ bool NetworkServer_ReadPackets(NetworkCl @@
 void NetworkHandleCommandQueue(NetworkClientState *cs) {
 	CommandPacket *cp;
 	while ( (cp = cs->command_queue) != NULL) {
 		SEND_COMMAND(PACKET_SERVER_COMMAND)(cs, cp);
 		cs->command_queue = cp->next;
 		free(cp);
+	}
+}
 // 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;
 		send_sync = true;
+	}
 #endif
 	// Now we are done with the frame, inform the clients that they can
 	//  do their frame!
 	FOR_ALL_CLIENTS(cs) {
 		// Check if the speed of the client is what we can expect from a client
 		if (cs->status == STATUS_ACTIVE) {

network_server.h

➞

Show inline comments

@@ @@ -7,19 +7,19 @@ @@
 DEF_SERVER_SEND_COMMAND(PACKET_SERVER_MAP);
 DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_ERROR_QUIT)(NetworkClientState *cs, uint16 client_index, NetworkErrorCode errorno);
 DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_ERROR)(NetworkClientState *cs, NetworkErrorCode error);
 DEF_SERVER_SEND_COMMAND(PACKET_SERVER_SHUTDOWN);
 DEF_SERVER_SEND_COMMAND(PACKET_SERVER_NEWGAME);
 DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_RCON)(NetworkClientState *cs, uint16 color, const char *command);
 bool NetworkFindName(char new_name[NETWORK_NAME_LENGTH]);
 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);
 #endif /* ENABLE_NETWORK */
 #endif // NETWORK_SERVER_H

0 comments (0 inline, 0 general)