equal
deleted
inserted
replaced
82 void HashCurrentCompanyPassword() |
82 void HashCurrentCompanyPassword() |
83 { |
83 { |
84 if (StrEmpty(_network_player_info[_local_player].password)) return; |
84 if (StrEmpty(_network_player_info[_local_player].password)) return; |
85 |
85 |
86 _password_game_seed = _settings_game.game_creation.generation_seed; |
86 _password_game_seed = _settings_game.game_creation.generation_seed; |
87 ttd_strlcpy(_password_server_unique_id, _network_unique_id, sizeof(_password_server_unique_id)); |
87 ttd_strlcpy(_password_server_unique_id, _settings_client.network.network_id, sizeof(_password_server_unique_id)); |
88 |
88 |
89 const char *new_pw = GenerateCompanyPasswordHash(_network_player_info[_local_player].password); |
89 const char *new_pw = GenerateCompanyPasswordHash(_network_player_info[_local_player].password); |
90 ttd_strlcpy(_network_player_info[_local_player].password, new_pw, sizeof(_network_player_info[_local_player].password)); |
90 ttd_strlcpy(_network_player_info[_local_player].password, new_pw, sizeof(_network_player_info[_local_player].password)); |
91 } |
91 } |
92 |
92 |
129 _network_join_status = NETWORK_JOIN_STATUS_AUTHORIZING; |
129 _network_join_status = NETWORK_JOIN_STATUS_AUTHORIZING; |
130 InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0); |
130 InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0); |
131 |
131 |
132 p = NetworkSend_Init(PACKET_CLIENT_JOIN); |
132 p = NetworkSend_Init(PACKET_CLIENT_JOIN); |
133 p->Send_string(_openttd_revision); |
133 p->Send_string(_openttd_revision); |
134 p->Send_string(_network_player_name); // Player name |
134 p->Send_string(_settings_client.network.player_name); // Player name |
135 p->Send_uint8 (_network_playas); // PlayAs |
135 p->Send_uint8 (_network_playas); // PlayAs |
136 p->Send_uint8 (NETLANG_ANY); // Language |
136 p->Send_uint8 (NETLANG_ANY); // Language |
137 p->Send_string(_network_unique_id); |
137 p->Send_string(_settings_client.network.network_id); |
138 MY_CLIENT->Send_Packet(p); |
138 MY_CLIENT->Send_Packet(p); |
139 } |
139 } |
140 |
140 |
141 DEF_CLIENT_SEND_COMMAND(PACKET_CLIENT_NEWGRFS_CHECKED) |
141 DEF_CLIENT_SEND_COMMAND(PACKET_CLIENT_NEWGRFS_CHECKED) |
142 { |
142 { |