equal
deleted
inserted
replaced
695 const NetworkClientInfo *ci; |
695 const NetworkClientInfo *ci; |
696 |
696 |
697 type = (NetworkPasswordType)p->Recv_uint8(); |
697 type = (NetworkPasswordType)p->Recv_uint8(); |
698 p->Recv_string(password, sizeof(password)); |
698 p->Recv_string(password, sizeof(password)); |
699 |
699 |
700 if (cs->status == STATUS_INACTIVE && type == NETWORK_GAME_PASSWORD) { |
700 if (cs->status == STATUS_AUTHORIZING && type == NETWORK_GAME_PASSWORD) { |
701 // Check game-password |
701 // Check game-password |
702 if (strcmp(password, _network_game_info.server_password) != 0) { |
702 if (strcmp(password, _network_game_info.server_password) != 0) { |
703 // Password is invalid |
703 // Password is invalid |
704 SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_WRONG_PASSWORD); |
704 SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_WRONG_PASSWORD); |
705 return; |
705 return; |
713 } |
713 } |
714 |
714 |
715 // Valid password, allow user |
715 // Valid password, allow user |
716 SEND_COMMAND(PACKET_SERVER_WELCOME)(cs); |
716 SEND_COMMAND(PACKET_SERVER_WELCOME)(cs); |
717 return; |
717 return; |
718 } else if (cs->status == STATUS_INACTIVE && type == NETWORK_COMPANY_PASSWORD) { |
718 } else if (cs->status == STATUS_AUTHORIZING && type == NETWORK_COMPANY_PASSWORD) { |
719 ci = DEREF_CLIENT_INFO(cs); |
719 ci = DEREF_CLIENT_INFO(cs); |
720 |
720 |
721 if (strcmp(password, _network_player_info[ci->client_playas].password) != 0) { |
721 if (strcmp(password, _network_player_info[ci->client_playas].password) != 0) { |
722 // Password is invalid |
722 // Password is invalid |
723 SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_WRONG_PASSWORD); |
723 SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_WRONG_PASSWORD); |