src/settings.cpp
changeset 9451 0d6806ba5504
parent 9447 d5d0e9d2c1ee
child 9457 75f11a6caef8
equal deleted inserted replaced
9450:9e7d05b0b1e5 9451:0d6806ba5504
  1445 {
  1445 {
  1446 	NetworkUpdatePlayerName();
  1446 	NetworkUpdatePlayerName();
  1447 	return 0;
  1447 	return 0;
  1448 }
  1448 }
  1449 
  1449 
  1450 static int32 UpdateServerName(int32 p1)
       
  1451 {
       
  1452 	ttd_strlcpy(_network_game_info.server_name, _settings_client.network.server_name, sizeof(_network_game_info.server_name));
       
  1453 	return 0;
       
  1454 }
       
  1455 
       
  1456 static int32 UpdateServerPassword(int32 p1)
  1450 static int32 UpdateServerPassword(int32 p1)
  1457 {
  1451 {
  1458 	if (strcmp(_settings_client.network.server_password, "*") == 0) {
  1452 	if (strcmp(_settings_client.network.server_password, "*") == 0) {
  1459 		_settings_client.network.server_password[0] = '\0';
  1453 		_settings_client.network.server_password[0] = '\0';
  1460 		_network_game_info.use_password = false;
       
  1461 	} else {
       
  1462 		ttd_strlcpy(_network_game_info.server_password, _settings_client.network.server_password, sizeof(_network_game_info.server_password));
       
  1463 		_network_game_info.use_password = true;
       
  1464 	}
  1454 	}
  1465 
  1455 
  1466 	return 0;
  1456 	return 0;
  1467 }
  1457 }
  1468 
  1458 
  1469 static int32 UpdateRconPassword(int32 p1)
  1459 static int32 UpdateRconPassword(int32 p1)
  1470 {
  1460 {
  1471 	if (strcmp(_settings_client.network.rcon_password, "*") == 0) {
  1461 	if (strcmp(_settings_client.network.rcon_password, "*") == 0) {
  1472 		_settings_client.network.rcon_password[0] = '\0';
  1462 		_settings_client.network.rcon_password[0] = '\0';
  1473 	}
  1463 	}
  1474 
       
  1475 	ttd_strlcpy(_network_game_info.rcon_password, _settings_client.network.rcon_password, sizeof(_network_game_info.rcon_password));
       
  1476 
  1464 
  1477 	return 0;
  1465 	return 0;
  1478 }
  1466 }
  1479 
  1467 
  1480 #endif /* ENABLE_NETWORK */
  1468 #endif /* ENABLE_NETWORK */
  1811 	  SDTC_VAR(network.lan_internet,          SLE_UINT8, S, NO,     0,        0,        1, 0, STR_NULL,                                       NULL),
  1799 	  SDTC_VAR(network.lan_internet,          SLE_UINT8, S, NO,     0,        0,        1, 0, STR_NULL,                                       NULL),
  1812 	  SDTC_STR(network.player_name,            SLE_STRB, S,  0,  NULL,                        STR_NULL,                                       UpdatePlayerName),
  1800 	  SDTC_STR(network.player_name,            SLE_STRB, S,  0,  NULL,                        STR_NULL,                                       UpdatePlayerName),
  1813 	  SDTC_STR(network.server_password,        SLE_STRB, S, NO,  NULL,                        STR_NULL,                                       UpdateServerPassword),
  1801 	  SDTC_STR(network.server_password,        SLE_STRB, S, NO,  NULL,                        STR_NULL,                                       UpdateServerPassword),
  1814 	  SDTC_STR(network.rcon_password,          SLE_STRB, S, NO,  NULL,                        STR_NULL,                                       UpdateRconPassword),
  1802 	  SDTC_STR(network.rcon_password,          SLE_STRB, S, NO,  NULL,                        STR_NULL,                                       UpdateRconPassword),
  1815 	  SDTC_STR(network.default_company_pass,   SLE_STRB, S,  0,  NULL,                        STR_NULL,                                       NULL),
  1803 	  SDTC_STR(network.default_company_pass,   SLE_STRB, S,  0,  NULL,                        STR_NULL,                                       NULL),
  1816 	  SDTC_STR(network.server_name,            SLE_STRB, S, NO,  NULL,                        STR_NULL,                                       UpdateServerName),
  1804 	  SDTC_STR(network.server_name,            SLE_STRB, S, NO,  NULL,                        STR_NULL,                                       NULL),
  1817 	  SDTC_STR(network.connect_to_ip,          SLE_STRB, S,  0,  NULL,                        STR_NULL,                                       NULL),
  1805 	  SDTC_STR(network.connect_to_ip,          SLE_STRB, S,  0,  NULL,                        STR_NULL,                                       NULL),
  1818 	  SDTC_STR(network.network_id,             SLE_STRB, S, NO,  NULL,                        STR_NULL,                                       NULL),
  1806 	  SDTC_STR(network.network_id,             SLE_STRB, S, NO,  NULL,                        STR_NULL,                                       NULL),
  1819 	 SDTC_BOOL(network.autoclean_companies,              S, NO, false,                        STR_NULL,                                       NULL),
  1807 	 SDTC_BOOL(network.autoclean_companies,              S, NO, false,                        STR_NULL,                                       NULL),
  1820 	  SDTC_VAR(network.autoclean_unprotected, SLE_UINT8, S, NO,    12,     0,          60, 0, STR_NULL,                                       NULL),
  1808 	  SDTC_VAR(network.autoclean_unprotected, SLE_UINT8, S, NO,    12,     0,          60, 0, STR_NULL,                                       NULL),
  1821 	  SDTC_VAR(network.autoclean_protected,   SLE_UINT8, S, NO,    36,     0,         180, 0, STR_NULL,                                       NULL),
  1809 	  SDTC_VAR(network.autoclean_protected,   SLE_UINT8, S, NO,    36,     0,         180, 0, STR_NULL,                                       NULL),
  2194 	const SettingDesc *sd = &_patch_settings[index];
  2182 	const SettingDesc *sd = &_patch_settings[index];
  2195 	assert(sd->save.conv & SLF_NETWORK_NO);
  2183 	assert(sd->save.conv & SLF_NETWORK_NO);
  2196 
  2184 
  2197 	char *var = (char*)GetVariableAddress(NULL, &sd->save);
  2185 	char *var = (char*)GetVariableAddress(NULL, &sd->save);
  2198 	ttd_strlcpy(var, value, sd->save.length);
  2186 	ttd_strlcpy(var, value, sd->save.length);
       
  2187 	if (sd->desc.proc != NULL) sd->desc.proc(0);
  2199 
  2188 
  2200 	return true;
  2189 	return true;
  2201 }
  2190 }
  2202 
  2191 
  2203 const SettingDesc *GetPatchFromName(const char *name, uint *i)
  2192 const SettingDesc *GetPatchFromName(const char *name, uint *i)