diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 8b42846dd97d6dbc254b2639aefdc7847d615848..9b8214ca0f8803ac1f06236ed410bffea5a14b2a 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
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);
+ _lc[I_NET_DISC_BADMSG]);
+ g_Net_Host_Ban(C, True);
end;
procedure MH_RECV_Chat(C: pTNetClient; var M: TMsg);
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;
- if g_Net_IsHostBanned(C^.Peer^.address.host) then
+ if g_Net_IsAddressBanned(C^.Peer^.address.host) then
begin
- if g_Net_IsHostBanned(C^.Peer^.address.host, True) then
+ if g_Net_IsAddressBanned(C^.Peer^.address.host, True) then
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;
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;
SetWeaponPrefs(TmpPrefArray);
SwitchToEmpty := SwitchEmpty;
SkipFist := SkipF;
+ if (g_Force_Model_Get() <> 0) then
+ SetModel(g_Forced_Model_GetName());
Reset(True);
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)
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);
@@ -894,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
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);
NetOut.Write(gTime);
- g_Net_Host_Send(ID, True, NET_CHAN_SERVICE);
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_Chat(Txt: string; Mode: Byte; ID: Integer = NET_EVERYONE);
NetOut.Write(Byte(NET_MSG_CHAT));
NetOut.Write(Txt);
NetOut.Write(Mode);
- g_Net_Host_Send(gPlayers[i].FClientID, True, NET_CHAN_CHAT);
+ g_Net_Host_Send(gPlayers[i].FClientID, True);
end;
Team := ID;
ID := NET_EVERYONE;
NetOut.Write(Byte(NET_MSG_CHAT));
NetOut.Write(Txt);
NetOut.Write(Mode);
- g_Net_Host_Send(ID, True, NET_CHAN_CHAT);
+ g_Net_Host_Send(ID, True);
end;
if Mode = NET_CHAT_SYSTEM then
NetOut.Write(Y);
NetOut.Write(Ang);
- g_Net_Host_Send(ID, False, NET_CHAN_GAME);
+ g_Net_Host_Send(ID, False);
end;
procedure MH_SEND_Sound(X, Y: Integer; Name: string; Pos: Boolean = True; ID: Integer = NET_EVERYONE);
else
NetOut.Write(Byte(0));
- g_Net_Host_Send(ID, False, NET_CHAN_GAME);
+ g_Net_Host_Send(ID, False);
end;
procedure MH_SEND_CreateShot(Proj: LongInt; ID: Integer = NET_EVERYONE);
NetOut.Write(Shots[Proj].Obj.Vel.X);
NetOut.Write(Shots[Proj].Obj.Vel.Y);
- g_Net_Host_Send(ID, True, NET_CHAN_SHOTS);
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_UpdateShot(Proj: LongInt; ID: Integer = NET_EVERYONE);
NetOut.Write(Shots[Proj].Obj.Vel.X);
NetOut.Write(Shots[Proj].Obj.Vel.Y);
- g_Net_Host_Send(ID, False, NET_CHAN_SHOTS);
+ g_Net_Host_Send(ID, False);
end;
procedure MH_Send_DeleteShot(Proj: LongInt; X, Y: LongInt; Loud: Boolean = True; ID: Integer = NET_EVERYONE);
NetOut.Write(X);
NetOut.Write(Y);
- g_Net_Host_Send(ID, True, NET_CHAN_SHOTS);
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_GameStats(ID: Integer = NET_EVERYONE);
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
NetOut.Write(gCoopSecretsFound);
end;
- g_Net_Host_Send(ID, True, NET_CHAN_IMPORTANT);
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_CoopStats(ID: Integer = NET_EVERYONE);
end else
NetOut.Write(Byte(0));
- g_Net_Host_Send(ID, True, NET_CHAN_SERVICE);
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_FlagEvent(EvType: Byte; Flag: Byte; PID: Word; Quiet: Boolean = False; ID: Integer = NET_EVERYONE);
NetOut.Write(gFlags[Flag].Obj.Vel.Y);
NetOut.Write(Byte(gFlags[Flag].Direction));
- g_Net_Host_Send(ID, True, NET_CHAN_IMPORTANT);
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_FlagPos(Flag: Byte; ID: Integer = NET_EVERYONE);
NetOut.Write(gFlags[Flag].Obj.Vel.X);
NetOut.Write(gFlags[Flag].Obj.Vel.Y);
- g_Net_Host_Send(ID, False, NET_CHAN_IMPORTANT);
+ g_Net_Host_Send(ID, False);
end;
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);
- g_Net_Host_Send(ID, True, NET_CHAN_IMPORTANT);
+ g_Net_Host_Send(ID, True);
end;
// PLAYER (SEND)
NetOut.Write(P.FColor.B);
NetOut.Write(P.Team);
- g_Net_Host_Send(ID, True, NET_CHAN_IMPORTANT)
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_PlayerPos(Reliable: Boolean; PID: Word; ID: Integer = NET_EVERYONE);
NetOut.Write(GameAccelY);
end;
- g_Net_Host_Send(ID, Reliable, NET_CHAN_PLAYERPOS);
+ g_Net_Host_Send(ID, Reliable);
end;
procedure MH_SEND_PlayerStats(PID: Word; ID: Integer = NET_EVERYONE);
NetOut.Write(Byte(R_BERSERK in FRulez));
NetOut.Write(Frags);
+ NetOut.Write(Assists);
NetOut.Write(Death);
NetOut.Write(CurrWeap);
NetOut.Write(FSpawnInvul);
end;
- g_Net_Host_Send(ID, True, NET_CHAN_PLAYER);
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_PlayerDamage(PID: Word; Kind: Byte; Attacker, Value: Word; VX, VY: Integer; ID: Integer = NET_EVERYONE);
NetOut.Write(VX);
NetOut.Write(VY);
- g_Net_Host_Send(ID, False, NET_CHAN_PLAYER);
+ g_Net_Host_Send(ID, False);
end;
procedure MH_SEND_PlayerDeath(PID: Word; KillType, DeathType: Byte; Attacker: Word; ID: Integer = NET_EVERYONE);
NetOut.Write(DeathType);
NetOut.Write(Attacker);
- g_Net_Host_Send(ID, True, NET_CHAN_PLAYER);
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_PlayerFire(PID: Word; Weapon: Byte; X, Y, AX, AY: Integer; ShotID: Integer = -1; ID: Integer = NET_EVERYONE);
NetOut.Write(AY);
NetOut.Write(ShotID);
- g_Net_Host_Send(ID, True, NET_CHAN_SHOTS);
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_PlayerDelete(PID: Word; ID: Integer = NET_EVERYONE);
NetOut.Write(Byte(NET_MSG_PLRDEL));
NetOut.Write(PID);
- g_Net_Host_Send(ID, True, NET_CHAN_IMPORTANT);
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_PlayerSettings(PID: Word; Mdl: string = ''; ID: Integer = NET_EVERYONE);
NetOut.Write(Pl.FColor.B);
NetOut.Write(Pl.Team);
- g_Net_Host_Send(ID, True, NET_CHAN_IMPORTANT);
+ g_Net_Host_Send(ID, True);
end;
// ITEM (SEND)
NetOut.Write(it.Obj.Vel.X);
NetOut.Write(it.Obj.Vel.Y);
- g_Net_Host_Send(ID, True, NET_CHAN_LARGEDATA);
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_ItemDestroy(Quiet: Boolean; IID: Word; ID: Integer = NET_EVERYONE);
NetOut.Write(IID);
NetOut.Write(Byte(Quiet));
- g_Net_Host_Send(ID, True, NET_CHAN_LARGEDATA);
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_ItemPos(IID: Word; ID: Integer = NET_EVERYONE);
NetOut.Write(it.Obj.Vel.X);
NetOut.Write(it.Obj.Vel.Y);
- g_Net_Host_Send(ID, False, NET_CHAN_LARGEDATA);
+ g_Net_Host_Send(ID, False);
end;
// PANEL
NetOut.Write(AnimLoop);
end;
- g_Net_Host_Send(ID, True, NET_CHAN_LARGEDATA);
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_PanelState(PGUID: Integer; ID: Integer = NET_EVERYONE);
if TP.moveOnce then mpflags := mpflags or 2;
NetOut.Write(Byte(mpflags));
- g_Net_Host_Send(ID, True, NET_CHAN_LARGEDATA);
+ g_Net_Host_Send(ID, True);
end;
// TRIGGER
NetOut.Write(Byte(GameDirection));
end;
- g_Net_Host_Send(ID, True, NET_CHAN_LARGEDATA);
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_MonsterPos(UID: Word; ID: Integer = NET_EVERYONE);
NetOut.Write(Byte(GameDirection));
end;
- g_Net_Host_Send(ID, False, NET_CHAN_MONSTERPOS);
+ g_Net_Host_Send(ID, False);
end;
procedure MH_SEND_MonsterState(UID: Word; ForcedAnim: Byte = 255; ID: Integer = NET_EVERYONE);
NetOut.Write(FFireTime);
end;
- g_Net_Host_Send(ID, True, NET_CHAN_MONSTER);
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_MonsterShot(UID: Word; X, Y, VX, VY: Integer; ID: Integer = NET_EVERYONE);
NetOut.Write(VX);
NetOut.Write(VY);
- g_Net_Host_Send(ID, True, NET_CHAN_MONSTER);
+ g_Net_Host_Send(ID, True);
end;
procedure MH_SEND_MonsterDelete(UID: Word; ID: Integer = NET_EVERYONE);
NetOut.Write(Byte(NET_MSG_MDEL));
NetOut.Write(UID);
- g_Net_Host_Send(ID, True, NET_CHAN_LARGEDATA);
+ g_Net_Host_Send(ID, True);
end;
// MISC
NetOut.Write(Byte(NET_MSG_TIME_SYNC));
NetOut.Write(Time);
- g_Net_Host_Send(ID, False, NET_CHAN_SERVICE);
+ g_Net_Host_Send(ID, False);
end;
procedure MH_SEND_VoteEvent(EvType: Byte;
NetOut.Write(StrArg1);
NetOut.Write(StrArg2);
- g_Net_Host_Send(ID, True, NET_CHAN_IMPORTANT);
+ g_Net_Host_Send(ID, True);
end;
// CLIENT MESSAGES //
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
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();
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
FRulez := FRulez + [R_BERSERK];
Frags := M.ReadLongInt();
+ Assists := M.ReadLongInt();
Death := M.ReadLongInt();
SetWeapon(M.ReadByte());
var
TmpName: string;
TmpModel: string;
+ CheckModel: string;
TmpColor: TRGB;
TmpTeam: Byte;
- i: Integer;
Pl: TPlayer;
PID: Word;
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;
NetOut.Write(gPlayer1Settings.SwitchToEmpty);
NetOut.Write(gPlayer1Settings.SkipFist);
- g_Net_Client_Send(True, NET_CHAN_SERVICE);
+ g_Net_Client_Send(True);
end;
procedure MC_SEND_Chat(Txt: string; Mode: Byte);
NetOut.Write(Txt);
NetOut.Write(Mode);
- g_Net_Client_Send(True, NET_CHAN_CHAT);
+ g_Net_Client_Send(True);
end;
procedure MC_SEND_PlayerPos();
NetOut.Write(WeaponAct);
NetOut.Write(WeaponSelect);
//e_WriteLog(Format('S:ws=%d', [WeaponSelect]), MSG_WARNING);
- g_Net_Client_Send(True, NET_CHAN_PLAYERPOS);
+ g_Net_Client_Send(True);
//kBytePrev := kByte;
//kDirPrev := gPlayer1.Direction;
NetOut.Write(Byte(NET_MSG_VOTE_EVENT));
NetOut.Write(Byte(Start));
NetOut.Write(Command);
- g_Net_Client_Send(True, NET_CHAN_IMPORTANT);
+ g_Net_Client_Send(True);
end;
procedure MC_SEND_PlayerSettings();
NetOut.Write(gPlayer1Settings.SwitchToEmpty);
NetOut.Write(gPlayer1Settings.SkipFist);
- g_Net_Client_Send(True, NET_CHAN_IMPORTANT);
+ g_Net_Client_Send(True);
end;
procedure MC_SEND_FullStateRequest();
begin
NetOut.Write(Byte(NET_MSG_REQFST));
- g_Net_Client_Send(True, NET_CHAN_SERVICE);
+ g_Net_Client_Send(True);
end;
procedure MC_SEND_CheatRequest(Kind: Byte);
NetOut.Write(Byte(NET_MSG_CHEAT));
NetOut.Write(Kind);
- g_Net_Client_Send(True, NET_CHAN_IMPORTANT);
+ g_Net_Client_Send(True);
end;
procedure MC_SEND_RCONPassword(Password: string);
begin
NetOut.Write(Byte(NET_MSG_RCON_AUTH));
NetOut.Write(Password);
- g_Net_Client_Send(True, NET_CHAN_SERVICE);
+ g_Net_Client_Send(True);
end;
procedure MC_SEND_RCONCommand(Cmd: string);
begin
NetOut.Write(Byte(NET_MSG_RCON_CMD));
NetOut.Write(Cmd);
- g_Net_Client_Send(True, NET_CHAN_SERVICE);
+ g_Net_Client_Send(True);
end;