diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 6b0c4f5bd75028389a8c06772ccdd32f5acb1d5c..a97b4ff5a50f911853570883bf99b190b9851573 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
Exit;
// Åñëè åñòü óðîí ñâîèì, èëè ðàíèë ñàì ñåáÿ, èëè òåáÿ ðàíèë ïðîòèâíèê:
Exit;
// Åñëè åñòü óðîí ñâîèì, èëè ðàíèë ñàì ñåáÿ, èëè òåáÿ ðàíèë ïðîòèâíèê:
- if LongBool(gGameSettings.Options and GAME_OPTION_TEAMDAMAGE) or
+ if (TGameOption.TEAM_DAMAGE in gGameSettings.Options) or
(SpawnerUID = FUID) or
(not SameTeam(FUID, SpawnerUID)) then
begin
(SpawnerUID = FUID) or
(not SameTeam(FUID, SpawnerUID)) then
begin
// Âûáðîñ êëþ÷åé:
if (not (gGameSettings.GameMode in [GM_DM, GM_TDM, GM_CTF])) or
// Âûáðîñ êëþ÷åé:
if (not (gGameSettings.GameMode in [GM_DM, GM_TDM, GM_CTF])) or
- (not LongBool(gGameSettings.Options and GAME_OPTION_DMKEYS)) then
+ (not (TGameOption.DM_KEYS in gGameSettings.Options)) then
begin
if R_KEY_RED in FInventory then
PushItem(ITEM_KEY_RED);
begin
if R_KEY_RED in FInventory then
PushItem(ITEM_KEY_RED);
if g_Game_IsClient then Exit;
// a = true - ìåñòî ñïàâíà ïðåäìåòà:
if g_Game_IsClient then Exit;
// a = true - ìåñòî ñïàâíà ïðåäìåòà:
- a := LongBool(gGameSettings.Options and GAME_OPTION_WEAPONSTAY) and arespawn;
+ a := (TGameOption.WEAPONS_STAY in gGameSettings.Options) and arespawn;
remove := not a;
case ItemType of
ITEM_MEDKIT_SMALL:
remove := not a;
case ItemType of
ITEM_MEDKIT_SMALL:
FMaxAmmo[A_FUEL] := AmmoLimits[0, A_FUEL];
if (gGameSettings.GameMode in [GM_DM, GM_TDM, GM_CTF]) and
FMaxAmmo[A_FUEL] := AmmoLimits[0, A_FUEL];
if (gGameSettings.GameMode in [GM_DM, GM_TDM, GM_CTF]) and
- LongBool(gGameSettings.Options and GAME_OPTION_DMKEYS) then
+ (TGameOption.DM_KEYS in gGameSettings.Options) then
FInventory := [R_KEY_RED, R_KEY_GREEN, R_KEY_BLUE]
else
FInventory := [];
FInventory := [R_KEY_RED, R_KEY_GREEN, R_KEY_BLUE]
else
FInventory := [];
function TPlayer.TryDropFlag(): Boolean;
begin
function TPlayer.TryDropFlag(): Boolean;
begin
- if LongBool(gGameSettings.Options and GAME_OPTION_ALLOWDROPFLAG) then
- Result := DropFlag(False, LongBool(gGameSettings.Options and GAME_OPTION_THROWFLAG))
- else
- Result := False;
+ if (TGameOption.ALLOW_DROP_FLAG in gGameSettings.Options)
+ then Result := DropFlag(False, TGameOption.THROW_FLAG in gGameSettings.Options)
+ else Result := False;
end;
function TPlayer.DropFlag(Silent: Boolean = True; DoThrow: Boolean = False): Boolean;
end;
function TPlayer.DropFlag(Silent: Boolean = True; DoThrow: Boolean = False): Boolean;
end;
begin
end;
begin
- vsPlayer := LongBool(gGameSettings.Options and GAME_OPTION_BOTVSPLAYER);
- vsMonster := LongBool(gGameSettings.Options and GAME_OPTION_BOTVSMONSTER);
+ vsPlayer := TGameOption.BOTS_VS_PLAYERS in gGameSettings.Options;
+ vsMonster := TGameOption.BOTS_VS_MONSTERS in gGameSettings.Options;
// Åñëè òåêóùåå îðóæèå íå òî, ÷òî íóæíî, òî ìåíÿåì:
if FCurrWeap <> FSelectedWeapon then
// Åñëè òåêóùåå îðóæèå íå òî, ÷òî íóæíî, òî ìåíÿåì:
if FCurrWeap <> FSelectedWeapon then
begin
ok := False;
if (g_GetUIDType(FLastSpawnerUID) = UID_PLAYER) and
begin
ok := False;
if (g_GetUIDType(FLastSpawnerUID) = UID_PLAYER) and
- LongBool(gGameSettings.Options and GAME_OPTION_BOTVSPLAYER) then
+ (TGameOption.BOTS_VS_PLAYERS in gGameSettings.Options) then
begin // Èãðîê
pla := g_Player_Get(FLastSpawnerUID);
ok := not TargetOnScreen(pla.FObj.X + PLAYER_RECT.X,
begin // Èãðîê
pla := g_Player_Get(FLastSpawnerUID);
ok := not TargetOnScreen(pla.FObj.X + PLAYER_RECT.X,
end
else
if (g_GetUIDType(FLastSpawnerUID) = UID_MONSTER) and
end
else
if (g_GetUIDType(FLastSpawnerUID) = UID_MONSTER) and
- LongBool(gGameSettings.Options and GAME_OPTION_BOTVSMONSTER) then
+ (TGameOption.BOTS_VS_MONSTERS in gGameSettings.Options) then
begin // Ìîíñòð
mon := g_Monsters_ByUID(FLastSpawnerUID);
ok := not TargetOnScreen(mon.Obj.X + mon.Obj.Rect.X,
begin // Ìîíñòð
mon := g_Monsters_ByUID(FLastSpawnerUID);
ok := not TargetOnScreen(mon.Obj.X + mon.Obj.Rect.X,