X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmsg.pas;h=bd32f68095a8d15b13a788babc2188afc70dee20;hb=7bafa6ee3c2abe1080251a657c9ce5e4479217c9;hp=0483bea1651608dc407895e67f6125f568f932f1;hpb=b171ccb122f9084809e739b19baf68bba80a9dab;p=d2df-sdl.git diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas index 0483bea..bd32f68 100644 --- a/src/game/g_netmsg.pas +++ b/src/game/g_netmsg.pas @@ -66,34 +66,12 @@ const NET_MSG_TIME_SYNC = 194; NET_MSG_VOTE_EVENT = 195; + { NET_MSG_MAP_REQUEST = 201; NET_MSG_MAP_RESPONSE = 202; NET_MSG_RES_REQUEST = 203; NET_MSG_RES_RESPONSE = 204; - - // chunked file transfers - // it goes this way: - // client requests file (FILE_REQUEST) - // server sends file header info (FILE_HEADER) - // client acks chunk -1 (CHUNK_ACK) to initiate transfer, or cancels (FILE_CANCEL) - // server start sending data chunks (one at a time, waiting for an ACK for each one) - // when client acks the last chunk, transfer is complete - // this scheme sux, of course; we can do better by spamming with unreliable unsequenced packets, - // and use client acks to drive server sends, but meh... let's do it this way first, and - // we can improve it later. - - // client: request a file - NET_MSG_FILE_REQUEST = 210; - // server: file info response - NET_MSG_FILE_HEADER = 211; - // client: request transfer cancellation - // server: something went wrong, transfer cancelled, bomb out - NET_MSG_FILE_CANCEL = 212; - // server: file chunk data - NET_MSG_FILE_CHUNK_DATA = 213; - // client: file chunk ack - NET_MSG_FILE_CHUNK_ACK = 214; - + } NET_CHAT_SYSTEM = 0; NET_CHAT_PLAYER = 1; @@ -163,8 +141,8 @@ procedure MH_RECV_PlayerSettings(C: pTNetClient; var M: TMsg); procedure MH_RECV_CheatRequest(C: pTNetClient; var M: TMsg); procedure MH_RECV_RCONPassword(C: pTNetClient; var M: TMsg); procedure MH_RECV_RCONCommand(C: pTNetClient; var M: TMsg); -procedure MH_RECV_MapRequest(C: pTNetClient; var M: TMsg); -procedure MH_RECV_ResRequest(C: pTNetClient; var M: TMsg); +//procedure MH_RECV_MapRequest(C: pTNetClient; var M: TMsg); +//procedure MH_RECV_ResRequest(C: pTNetClient; var M: TMsg); procedure MH_RECV_Vote(C: pTNetClient; var M: TMsg); // GAME @@ -265,8 +243,8 @@ procedure MC_SEND_RCONPassword(Password: string); procedure MC_SEND_RCONCommand(Cmd: string); procedure MC_SEND_Vote(Start: Boolean = False; Command: string = 'a'); // DOWNLOAD -procedure MC_SEND_MapRequest(); -procedure MC_SEND_ResRequest(const resName: AnsiString); +//procedure MC_SEND_MapRequest(); +//procedure MC_SEND_ResRequest(const resName: AnsiString); type @@ -288,9 +266,6 @@ type ExternalResources: array of TExternalResourceInfo; end; -function MapDataFromMsgStream(msgStream: TMemoryStream):TMapDataMsg; -function ResDataFromMsgStream(msgStream: TMemoryStream):TResDataMsg; - function IsValidFileName(const S: String): Boolean; function IsValidFilePath(const S: String): Boolean; @@ -1691,6 +1666,7 @@ var i1, i2: TStrings_Locale; pln: String; cnt: Byte; + goodCmd: Boolean = true; begin FillChar(EvHash, Sizeof(EvHash), 0); EvType := M.ReadByte(); @@ -1706,35 +1682,60 @@ begin gTime := EvTime; + if (g_Res_received_map_start <> 0) then + begin + if (g_Res_received_map_start < 0) then exit; + goodCmd := false; + case EvType of + NET_EV_MAPSTART: goodCmd := true; + NET_EV_MAPEND: goodCmd := true; + NET_EV_PLAYER_KICK: goodCmd := true; + NET_EV_PLAYER_BAN: goodCmd := true; + end; + if not goodCmd then exit; + end; + case EvType of NET_EV_MAPSTART: begin - g_Res_received_map_start := true; - gGameOn := False; - g_Game_ClearLoading(); - g_Game_StopAllSounds(True); + if (g_Res_received_map_start <> 0) then + begin + g_Res_received_map_start := -1; + end + else + begin + gGameOn := False; + g_Game_ClearLoading(); + g_Game_StopAllSounds(True); - gSwitchGameMode := Byte(EvNum); - gGameSettings.GameMode := gSwitchGameMode; + gSwitchGameMode := Byte(EvNum); + gGameSettings.GameMode := gSwitchGameMode; - gWADHash := EvHash; - if not g_Game_StartMap(EvStr, True) then - begin - if not isWadPath(EvStr) then - g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [gGameSettings.WAD + ':\' + EvStr])) - else - g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [EvStr])); - Exit; - end; + gWADHash := EvHash; + if not g_Game_StartMap(EvStr, True) then + begin + if not isWadPath(EvStr) then + g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [gGameSettings.WAD + ':\' + EvStr])) + else + g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [EvStr])); + Exit; + end; - MC_SEND_FullStateRequest; + MC_SEND_FullStateRequest; + end; end; NET_EV_MAPEND: begin - g_Res_received_map_start := true; - gMissionFailed := EvNum <> 0; - gExit := EXIT_ENDLEVELCUSTOM; + if (g_Res_received_map_start <> 0) then + begin + g_Res_received_map_start := -1; + end + else + begin + gMissionFailed := EvNum <> 0; + gExit := EXIT_ENDLEVELCUSTOM; + end; end; NET_EV_RCON: @@ -1758,10 +1759,16 @@ begin end; NET_EV_PLAYER_KICK: - g_Console_Add(Format(_lc[I_PLAYER_KICK], [EvStr]), True); + begin + g_Console_Add(Format(_lc[I_PLAYER_KICK], [EvStr]), True); + if (g_Res_received_map_start <> 0) then g_Res_received_map_start := -1; + end; NET_EV_PLAYER_BAN: - g_Console_Add(Format(_lc[I_PLAYER_BAN], [EvStr]), True); + begin + g_Console_Add(Format(_lc[I_PLAYER_BAN], [EvStr]), True); + if (g_Res_received_map_start <> 0) then g_Res_received_map_start := -1; + end; NET_EV_LMS_WARMUP: g_Console_Add(Format(_lc[I_MSG_WARMUP_START], [EvNum]), True); @@ -3025,6 +3032,7 @@ begin end; end; +{ function CreateMapDataMsg(const FileName: TFileName; ResList: TStringList): TMapDataMsg; var i: Integer; @@ -3104,6 +3112,7 @@ begin msgStream.ReadBuffer(Result.ExternalResources[0], resCount * SizeOf(TExternalResourceInfo)); //res data end; +} function IsValidFileName(const S: String): Boolean; const @@ -3130,6 +3139,7 @@ begin Result := True; end; +{ procedure MC_SEND_MapRequest(); begin NetOut.Write(Byte(NET_MSG_MAP_REQUEST)); @@ -3152,41 +3162,6 @@ begin e_WriteLog('NET: Received map request from ' + DecodeIPV4(C^.Peer.address.host), TMsgType.Notify); - (* - omsg.Alloc(NET_BUFSIZE); - try - omsg.Clear(); - dfn := findDiskWad(MapsDir+gGameSettings.WAD); - if (dfn = '') then dfn := '!wad_not_found!.wad'; //FIXME - md5 := MD5File(dfn); - st := openDiskFileRO(dfn); - if not assigned(st) then exit; //wtf?! - size := st.size; - st.Free; - // packet type - omsg.Write(Byte({NTF_SERVER_MAP_INFO}NET_MSG_MAP_RESPONSE)); - // map wad name - omsg.Write(gGameSettings.WAD); - // map wad md5 - omsg.Write(md5); - // map wad size - omsg.Write(size); - // number of external resources for map - omsg.Write(LongInt(gExternalResources.Count)); - // external resource names - for f := 0 to gExternalResources.Count-1 do - begin - omsg.Write(ExtractFileName(gExternalResources[f])); // GameDir+'/wads/'+ResList.Strings[i] - end; - // send packet - pkt := enet_packet_create(omsg.Data, omsg.CurSize, ENET_PACKET_FLAG_RELIABLE); - if not Assigned(pkt) then exit; - peer := NetClients[C^.ID].Peer; - if (enet_peer_send(Peer, NET_CHAN_DOWNLOAD_EX, pkt) <> 0) then exit; - finally - omsg.Free(); - end; - *) mapDataMsg := CreateMapDataMsg(MapsDir + gGameSettings.WAD, gExternalResources); peer := NetClients[C^.ID].Peer; @@ -3227,6 +3202,7 @@ begin g_Net_SendData(payload, peer, True, NET_CHAN_DOWNLOAD); end; end; +} end.