X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmsg.pas;h=73c65e358b9427b7486f9425cb1c0569d39f67c3;hb=8769066a9aa4f618a3a508b5aaca284ae85545af;hp=910a480a78d25b4073593853012ef1a7d8e6a5b4;hpb=3bc93c7ecd534237343aaa3b83dca053c53b9bc5;p=d2df-sdl.git diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas index 910a480..73c65e3 100644 --- a/src/game/g_netmsg.pas +++ b/src/game/g_netmsg.pas @@ -341,7 +341,7 @@ procedure MH_MalformedPacket(C: pTNetClient); begin g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] + _lc[I_NET_DISC_PROTOCOL]); - enet_peer_disconnect(C^.Peer, NET_DISC_PROTOCOL); + g_Net_Host_Kick(C^.ID, NET_DISC_PROTOCOL); end; procedure MH_RECV_Chat(C: pTNetClient; var M: TMsg); @@ -400,9 +400,8 @@ begin B := M.ReadByte(); T := M.ReadByte(); WeapSwitch := M.ReadByte(); - if (WeapSwitch = 2) then - for I := WP_FIRST to WP_LAST + 1 do - TmpPrefArray[I] := M.ReadByte(); + for I := WP_FIRST to WP_LAST + 1 do + TmpPrefArray[I] := M.ReadByte(); SwitchEmpty := M.ReadByte(); SkipF := M.ReadByte(); except @@ -415,7 +414,7 @@ begin begin g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] + _lc[I_NET_DISC_VERSION]); - enet_peer_disconnect(C^.Peer, NET_DISC_VERSION); + g_Net_Host_Kick(C^.ID, NET_DISC_VERSION); Exit; end; @@ -425,13 +424,13 @@ begin begin g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] + _lc[I_NET_DISC_BAN]); - enet_peer_disconnect(C^.Peer, NET_DISC_BAN); + g_Net_Host_Kick(C^.ID, NET_DISC_BAN); end else begin g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] + _lc[I_NET_DISC_BAN]); - enet_peer_disconnect(C^.Peer, NET_DISC_TEMPBAN); + g_Net_Host_Kick(C^.ID, NET_DISC_TEMPBAN); end; Exit; end; @@ -441,7 +440,7 @@ begin begin g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] + _lc[I_NET_DISC_PASSWORD]); - enet_peer_disconnect(C^.Peer, NET_DISC_PASSWORD); + g_Net_Host_Kick(C^.ID, NET_DISC_PASSWORD); Exit; end; @@ -461,10 +460,11 @@ begin begin Name := PName; WeapSwitchMode := WeapSwitch; - if (WeapSwitch = 2) then - SetWeaponPrefs(TmpPrefArray); + SetWeaponPrefs(TmpPrefArray); SwitchToEmpty := SwitchEmpty; SkipFist := SkipF; + if (g_Force_Model_Get() <> 0) then + SetModel(g_Forced_Model_GetName()); Reset(True); end; @@ -557,6 +557,14 @@ end; procedure MH_RECV_FullStateRequest(C: pTNetClient; var M: TMsg); begin //e_LogWritefln('*** client #%u (cid #%u) full state request', [C.ID, C.Player]); + + if C^.FullUpdateSent then + begin + // FullStateRequest spam? + g_Net_Penalize(C, 'duplicate full state request'); + exit; + end; + if gGameOn then begin MH_SEND_Everything((C^.State = NET_STATE_AUTH), C^.ID) @@ -732,9 +740,8 @@ begin TmpColor.B := M.ReadByte(); TmpTeam := M.ReadByte(); TmpWeapSwitch := M.ReadByte(); - if (TmpWeapSwitch = 2) then - for I := WP_FIRST to WP_LAST + 1 do - TmpPrefArray[I] := M.ReadByte(); + for I := WP_FIRST to WP_LAST + 1 do + TmpPrefArray[I] := M.ReadByte(); TmpSwEmpty := M.ReadByte(); TmpSkipF := M.ReadByte(); except @@ -757,15 +764,15 @@ begin Pl.Name := TmpName; end; + if (g_Force_Model_Get() <> 0) then + TmpModel := g_Forced_Model_GetName(); if TmpModel <> Pl.Model.Name then Pl.SetModel(TmpModel); if (TmpWeapSwitch <> Pl.WeapSwitchMode) then Pl.WeapSwitchMode := TmpWeapSwitch; - if (TmpWeapSwitch = 2) then - Pl.SetWeaponPrefs(TmpPrefArray); - + Pl.SetWeaponPrefs(TmpPrefArray); if (TmpSwEmpty <> Pl.SwitchToEmpty) then Pl.SwitchToEmpty := TmpSwEmpty; @@ -899,11 +906,14 @@ procedure MH_SEND_Everything(CreatePlayers: Boolean {= False}; ID: Integer {= NE var I: Integer; begin - if (ID >= 0) and (ID < length(NetClients)) then - begin - e_LogWritefln('*** client #%u (cid #%u) will get everything', [ID, NetClients[ID].Player]); - MH_ProcessFirstSpawn(@NetClients[ID]); - end; + if (ID < 0) or (ID >= Length(NetClients)) then + exit; // bogus client, this shouldn't happen + + NetClients[ID].FullUpdateSent := True; + + e_LogWritefln('*** client #%u (cid #%u) will get everything', [ID, NetClients[ID].Player]); + + MH_ProcessFirstSpawn(@NetClients[ID]); if gPlayers <> nil then begin @@ -976,7 +986,7 @@ begin NetOut.Write(g_ExtractFileName(gMapInfo.Map)); NetOut.Write(gWADHash); NetOut.Write(gGameSettings.GameMode); - NetOut.Write(gGameSettings.GoalLimit); + NetOut.Write(gGameSettings.ScoreLimit); NetOut.Write(gGameSettings.TimeLimit); NetOut.Write(gGameSettings.MaxLives); NetOut.Write(gGameSettings.Options); @@ -1130,8 +1140,8 @@ begin NetOut.Write(Byte(NET_MSG_SCORE)); if gGameSettings.GameMode in [GM_TDM, GM_CTF] then begin - NetOut.Write(gTeamStat[TEAM_RED].Goals); - NetOut.Write(gTeamStat[TEAM_BLUE].Goals); + NetOut.Write(gTeamStat[TEAM_RED].Score); + NetOut.Write(gTeamStat[TEAM_BLUE].Score); end else if gGameSettings.GameMode = GM_COOP then @@ -1206,7 +1216,7 @@ procedure MH_SEND_GameSettings(ID: Integer = NET_EVERYONE); begin NetOut.Write(Byte(NET_MSG_GSET)); NetOut.Write(gGameSettings.GameMode); - NetOut.Write(gGameSettings.GoalLimit); + NetOut.Write(gGameSettings.ScoreLimit); NetOut.Write(gGameSettings.TimeLimit); NetOut.Write(gGameSettings.MaxLives); NetOut.Write(gGameSettings.Options); @@ -1893,8 +1903,8 @@ procedure MC_RECV_GameStats(var M: TMsg); begin if gGameSettings.GameMode in [GM_TDM, GM_CTF] then begin - gTeamStat[TEAM_RED].Goals := M.ReadSmallInt(); - gTeamStat[TEAM_BLUE].Goals := M.ReadSmallInt(); + gTeamStat[TEAM_RED].Score := M.ReadSmallInt(); + gTeamStat[TEAM_BLUE].Score := M.ReadSmallInt(); end else if gGameSettings.GameMode = GM_COOP then @@ -2359,7 +2369,7 @@ end; procedure MC_RECV_GameSettings(var M: TMsg); begin gGameSettings.GameMode := M.ReadByte(); - gGameSettings.GoalLimit := M.ReadWord(); + gGameSettings.ScoreLimit := M.ReadWord(); gGameSettings.TimeLimit := M.ReadWord(); gGameSettings.MaxLives := M.ReadByte(); gGameSettings.Options := M.ReadLongWord(); @@ -2389,6 +2399,8 @@ begin if (PID <> NetPlrUID1) and (PID <> NetPlrUID2) then begin if (Pl <> nil) then Exit; + if (g_Force_Model_Get() <> 0) then + Model := g_Forced_Model_GetName(); DID := g_Player_Create(Model, Color, T, False); with g_Player_Get(DID) do begin @@ -2683,9 +2695,9 @@ procedure MC_RECV_PlayerSettings(var M: TMsg); var TmpName: string; TmpModel: string; + CheckModel: string; TmpColor: TRGB; TmpTeam: Byte; - i: Integer; Pl: TPlayer; PID: Word; begin @@ -2717,6 +2729,8 @@ begin Pl.Name := TmpName; end; + if (g_Force_Model_Get() <> 0) then + TmpModel := g_Forced_Model_GetName(); if TmpModel <> Pl.Model.Name then Pl.SetModel(TmpModel); end; @@ -3164,9 +3178,8 @@ begin NetOut.Write(gPlayer1Settings.Color.B); NetOut.Write(gPlayer1Settings.Team); NetOut.Write(gPlayer1Settings.WeaponSwitch); - if (gPlayer1Settings.WeaponSwitch = 2) then - for i := WP_FIRST to WP_LAST + 1 do - NetOut.Write(gPlayer1Settings.WeaponPreferences[i]); + for i := WP_FIRST to WP_LAST + 1 do + NetOut.Write(gPlayer1Settings.WeaponPreferences[i]); NetOut.Write(gPlayer1Settings.SwitchToEmpty); NetOut.Write(gPlayer1Settings.SkipFist); @@ -3318,9 +3331,8 @@ begin NetOut.Write(gPlayer1Settings.Color.B); NetOut.Write(gPlayer1Settings.Team); NetOut.Write(gPlayer1Settings.WeaponSwitch); - if (gPlayer1Settings.WeaponSwitch = 2) then - for i := WP_FIRST to WP_LAST + 1 do - NetOut.Write(gPlayer1Settings.WeaponPreferences[i]); + for i := WP_FIRST to WP_LAST + 1 do + NetOut.Write(gPlayer1Settings.WeaponPreferences[i]); NetOut.Write(gPlayer1Settings.SwitchToEmpty); NetOut.Write(gPlayer1Settings.SkipFist);