Skip to content
This repository has been archived by the owner on Mar 19, 2023. It is now read-only.
/ DF Public archive

Commit

Permalink
Player: Small fix of previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
binarymaster committed Jan 9, 2016
1 parent 696b2c4 commit 63dd76b
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions DF Sources/g_player.pas
Original file line number Diff line number Diff line change
Expand Up @@ -5023,7 +5023,6 @@ procedure TPlayer.LoadState(var Mem: TBinMemoryReader);
sig: DWORD;
str: String;
b: Byte;
col: TRGB;
begin
if Mem = nil then
Exit;
Expand Down Expand Up @@ -5131,25 +5130,25 @@ procedure TPlayer.LoadState(var Mem: TBinMemoryReader);
// Íàçâàíèå ìîäåëè:
Mem.ReadString(str);
// Öâåò ìîäåëè:
Mem.ReadByte(col.R);
Mem.ReadByte(col.G);
Mem.ReadByte(col.B);
Mem.ReadByte(FColor.R);
Mem.ReadByte(FColor.G);
Mem.ReadByte(FColor.B);
if FPlayerNum = 1 then
begin
str := gPlayer1Settings.Model;
col := gPlayer1Settings.Color;
FColor := gPlayer1Settings.Color;
end;
if FPlayerNum = 2 then
begin
str := gPlayer2Settings.Model;
col := gPlayer2Settings.Color;
FColor := gPlayer2Settings.Color;
end;
// Îáíîâëÿåì ìîäåëü èãðîêà:
SetModel(str);
if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
FModel.Color := TEAMCOLOR[FTeam]
else
FModel.Color := col;
FModel.Color := FColor;
end;

procedure TPlayer.AllRulez(Health: Boolean);
Expand Down

0 comments on commit 63dd76b

Please sign in to comment.