openttd-ottdgrfs: comparison src/network/network

equal deleted inserted replaced

-:4cc327ad39d5
+:35756db7e577
 #include "../vehicle.h"
 #include "../station.h"
 #include "../variables.h"
 #include "../genworld.h"
 #include "../helpers.hpp"
+#include "../fileio.h"
 // This file handles all the server-commands
 static void NetworkHandleCommandQueue(NetworkTCPSocketHandler* cs);
 	Packet *p = NetworkSend_Init(PACKET_SERVER_CHECK_NEWGRFS);
 	const GRFConfig *c;
 	uint grf_count = 0;
-	for (c = _grfconfig; c != NULL; c = c->next) grf_count++;
+	for (c = _grfconfig; c != NULL; c = c->next) {
+		if (!HASBIT(c->flags, GCF_STATIC)) grf_count++;
+	}
 	p->Send_uint8 (grf_count);
 	for (c = _grfconfig; c != NULL; c = c->next) {
-		cs->Send_GRFIdentifier(p, c);
+		if (!HASBIT(c->flags, GCF_STATIC)) cs->Send_GRFIdentifier(p, c);
 	}
 	cs->Send_Packet(p);
 }
 		SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_NOT_AUTHORIZED);
 		return;
 	}
 	if (cs->status == STATUS_AUTH) {
-		char filename[256];
+		const char *filename = "network_server.tmp";
 		Packet *p;
 		// Make a dump of the current game
-		snprintf(filename, lengthof(filename), "%s%snetwork_server.tmp",  _paths.autosave_dir, PATHSEP);
+		if (SaveOrLoad(filename, SL_SAVE, AUTOSAVE_DIR) != SL_OK) error("network savedump failed");
-		if (SaveOrLoad(filename, SL_SAVE) != SL_OK) error("network savedump failed");
+		file_pointer = FioFOpenFile(filename, "rb", AUTOSAVE_DIR);
-		file_pointer = fopen(filename, "rb");
 		fseek(file_pointer, 0, SEEK_END);
 		if (ftell(file_pointer) == 0) error("network savedump failed - zero sized savegame?");
 		// Now send the _frame_counter and how many packets are coming
 	p->Send_uint32(cp->p2);
 	p->Send_uint32(cp->tile);
 	p->Send_string(cp->text);
 	p->Send_uint8 (cp->callback);
 	p->Send_uint32(cp->frame);
+	p->Send_bool  (cp->my_cmd);
 	cs->Send_Packet(p);
 }
 DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_CHAT)(NetworkTCPSocketHandler *cs, NetworkAction action, uint16 client_index, bool self_send, const char *msg)
 {
 	NetworkTCPSocketHandler *new_cs;
 	const NetworkClientInfo *ci;
 	byte callback;
-	CommandPacket *cp = MallocT<CommandPacket>(1);
 	// The client was never joined.. so this is impossible, right?
 	//  Ignore the packet, give the client a warning, and close his connection
 	if (cs->status < STATUS_DONE_MAP || cs->has_quit) {
 		SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_NOT_EXPECTED);
 		return;
 	}
+	CommandPacket *cp = MallocT<CommandPacket>(1);
 	cp->player = (Owner)p->Recv_uint8();
 	cp->cmd    = p->Recv_uint32();
 	cp->p1     = p->Recv_uint32();
 	cp->p2     = p->Recv_uint32();
 	cp->tile   = p->Recv_uint32();
 	p->Recv_string(cp->text, lengthof(cp->text));
 	callback = p->Recv_uint8();
-	if (cs->has_quit) return;
+	if (cs->has_quit) {
+		free(cp);
+		return;
+	}
 	ci = DEREF_CLIENT_INFO(cs);
 	/* Check if cp->cmd is valid */
 	if (!IsValidCommand(cp->cmd)) {
 		IConsolePrintF(_icolour_err, "WARNING: invalid command from client %d (IP: %s).", ci->client_index, GetPlayerIP(ci));
 		SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_NOT_EXPECTED);
+		free(cp);
 		return;
 	}
 	if (!CheckCommandFlags(cp, ci)) {
 		SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_KICKED);
+		free(cp);
 		return;
 	}
 	/** Only CMD_PLAYER_CTRL is always allowed, for the rest, playas needs
 	 * to match the player in the packet. If it doesn't, the client has done
 	 */
 	if (!(cp->cmd == CMD_PLAYER_CTRL && cp->p1 == 0) && ci->client_playas != cp->player) {
 		IConsolePrintF(_icolour_err, "WARNING: player %d (IP: %s) tried to execute a command as player %d, kicking...",
 		               ci->client_playas + 1, GetPlayerIP(ci), cp->player + 1);
 		SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_PLAYER_MISMATCH);
+		free(cp);
 		return;
 	}
 	/** @todo CMD_PLAYER_CTRL with p1 = 0 announces a new player to the server. To give the
 	 * player the correct ID, the server injects p2 and executes the command. Any other p1
 	 * @see CmdPlayerCtrl() players.c:655
 	 */
 	if (cp->cmd == CMD_PLAYER_CTRL) {
 		if (cp->p1 != 0) {
 			SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_CHEATER);
+			free(cp);
 			return;
 		}
 		/* XXX - Execute the command as a valid player. Normally this would be done by a
 		 * spectator, but that is not allowed any commands. So do an impersonation. The drawback
 	FOR_ALL_CLIENTS(new_cs) {
 		if (new_cs->status >= STATUS_MAP) {
 			// Callbacks are only send back to the client who sent them in the
 			//  first place. This filters that out.
 			cp->callback = (new_cs != cs) ? 0 : callback;
+			cp->my_cmd = (new_cs == cs);
 			NetworkAddCommandQueue(new_cs, cp);
 		}
 	}
 	cp->callback = 0;
+	cp->my_cmd = false;
 	// Queue the command on the server
 	if (_local_command_queue == NULL) {
 		_local_command_queue = cp;
 	} else {
 		// Find last packet
 		// Display the message locally (so you know you have sent it)
 		if (ci != NULL && show_local) {
 			if (from_index == NETWORK_SERVER_INDEX) {
 				char name[NETWORK_NAME_LENGTH];
-				StringID str = IsValidPlayer(ci_to->client_playas) ? GetPlayer(ci_to->client_playas)->name_1 : (uint16)STR_NETWORK_SPECTATORS;
+				StringID str = IsValidPlayer(ci_to->client_playas) ? STR_COMPANY_NAME : STR_NETWORK_SPECTATORS;
+				SetDParam(0, ci_to->client_playas);
 				GetString(name, str, lastof(name));
 				NetworkTextMessage(action, GetDrawStringPlayerColor(ci_own->client_playas), true, name, "%s", msg);
 			} else {
 				FOR_ALL_CLIENTS(cs) {
 					if (cs->index == from_index) {
 		memset(&_network_player_info[p->index], 0, sizeof(NetworkPlayerInfo));
 		_network_player_info[p->index].months_empty = months_empty;
 		ttd_strlcpy(_network_player_info[p->index].password, password, sizeof(_network_player_info[p->index].password));
 		// Grap the company name
-		SetDParam(0, p->name_1);
+		SetDParam(0, p->index);
-		SetDParam(1, p->name_2);
+		GetString(_network_player_info[p->index].company_name, STR_COMPANY_NAME, lastof(_network_player_info[p->index].company_name));
-		GetString(_network_player_info[p->index].company_name, STR_JUST_STRING, lastof(_network_player_info[p->index].company_name));
 		// Check the income
 		if (_cur_year - 1 == p->inaugurated_year) {
 			// The player is here just 1 year, so display [2], else display[1]
 			for (i = 0; i < lengthof(p->yearly_expenses[2]); i++) {
 		}
 		// Set some general stuff
 		_network_player_info[p->index].inaugurated_year = p->inaugurated_year;
 		_network_player_info[p->index].company_value = p->old_economy[0].company_value;
-		_network_player_info[p->index].money = p->money64;
+		_network_player_info[p->index].money = p->player_money;
 		_network_player_info[p->index].performance = p->old_economy[0].performance_history;
 	}
 	// Go through all vehicles and count the type of vehicles
 	FOR_ALL_VEHICLES(v) {

branch	NewGRF_ports
changeset 6720	35756db7e577
parent 6719	4cc327ad39d5
child 6868	7eb395287b3d