diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas
index f0fe29114071a4c6b9f5ce2f9b64ec678d387e77..9b0952edbb1652aa1a28ca09fb948d5a23527471 100644 (file)
--- a/src/game/g_weapons.pas
+++ b/src/game/g_weapons.pas
procedure g_Weapon_AddDynLights();
const
procedure g_Weapon_AddDynLights();
const
- WEAPON_KASTET = 0;
+ WEAPON_IRONFIST = 0;
WEAPON_SAW = 1;
WEAPON_PISTOL = 2;
WEAPON_SHOTGUN1 = 3;
WEAPON_SAW = 1;
WEAPON_PISTOL = 2;
WEAPON_SHOTGUN1 = 3;
WEAPON_ROCKETLAUNCHER = 6;
WEAPON_PLASMA = 7;
WEAPON_BFG = 8;
WEAPON_ROCKETLAUNCHER = 6;
WEAPON_PLASMA = 7;
WEAPON_BFG = 8;
- WEAPON_SUPERPULEMET = 9;
+ WEAPON_SUPERCHAINGUN = 9;
WEAPON_FLAMETHROWER = 10;
WEAPON_ZOMBY_PISTOL = 20;
WEAPON_IMP_FIRE = 21;
WEAPON_FLAMETHROWER = 10;
WEAPON_ZOMBY_PISTOL = 20;
WEAPON_IMP_FIRE = 21;
WEAPON_MANCUB_FIRE = 25;
WEAPON_SKEL_FIRE = 26;
WEAPON_MANCUB_FIRE = 25;
WEAPON_SKEL_FIRE = 26;
- WP_FIRST = WEAPON_KASTET;
+ WP_FIRST = WEAPON_IRONFIST;
WP_LAST = WEAPON_FLAMETHROWER;
WP_LAST = WEAPON_FLAMETHROWER;
// È â êîíöå èãðîêîâ, íî òîëüêî åñëè ïîëîæåíî
// (èëè ñíàðÿä îò ìîíñòðà, èëè friendlyfire, èëè friendly_hit_projectile)
if (g_GetUIDType(SpawnerUID) <> UID_PLAYER) or
// È â êîíöå èãðîêîâ, íî òîëüêî åñëè ïîëîæåíî
// (èëè ñíàðÿä îò ìîíñòðà, èëè friendlyfire, èëè friendly_hit_projectile)
if (g_GetUIDType(SpawnerUID) <> UID_PLAYER) or
- LongBool(gGameSettings.Options and (GAME_OPTION_TEAMDAMAGE or GAME_OPTION_TEAMHITPROJECTILE)) then
+ ([TGameOption.TEAM_DAMAGE, TGameOption.TEAM_HIT_PROJECTILE] <= gGameSettings.Options) then
begin
if PlayerHit() then
begin
begin
if PlayerHit() then
begin
// È â êîíöå ñâîèõ èãðîêîâ, íî òîëüêî åñëè ïîëîæåíî
// (èëè friendlyfire, èëè friendly_hit_projectile)
// È â êîíöå ñâîèõ èãðîêîâ, íî òîëüêî åñëè ïîëîæåíî
// (èëè friendlyfire, èëè friendly_hit_projectile)
- if LongBool(gGameSettings.Options and (GAME_OPTION_TEAMDAMAGE or GAME_OPTION_TEAMHITPROJECTILE)) then
+ if [TGameOption.TEAM_DAMAGE, TGameOption.TEAM_HIT_PROJECTILE] <= gGameSettings.Options then
begin
if PlayerHit(1) then
begin
begin
if PlayerHit(1) then
begin
if (gPlayers[idx] = nil) or not gPlayers[idx].alive then exit;
if (spawnerPlr <> nil) then
begin
if (gPlayers[idx] = nil) or not gPlayers[idx].alive then exit;
if (spawnerPlr <> nil) then
begin
- if ((gGameSettings.Options and (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMDAMAGE)) = 0) and
+ if (not ([TGameOption.TEAM_HIT_TRACE, TGameOption.TEAM_DAMAGE] <= gGameSettings.Options)) and
(spawnerPlr.Team <> TEAM_NONE) and (spawnerPlr.Team = gPlayers[idx].Team) then
begin
(spawnerPlr.Team <> TEAM_NONE) and (spawnerPlr.Team = gPlayers[idx].Team) then
begin
- if (spawnerPlr <> gPlayers[idx]) and ((gGameSettings.Options and GAME_OPTION_TEAMABSORBDAMAGE) = 0) then
+ if (spawnerPlr <> gPlayers[idx]) and not (TGameOption.TEAM_ABSORB_DAMAGE in gGameSettings.Options) then
dmg := Max(1, dmg div 2);
exit;
end;
dmg := Max(1, dmg div 2);
exit;
end;
// Â âîäå øëåéô - ïóçûðè, â âîçäóõå øëåéô - äûì:
if WordBool(st and MOVE_INWATER) then
begin
// Â âîäå øëåéô - ïóçûðè, â âîçäóõå øëåéô - äûì:
if WordBool(st and MOVE_INWATER) then
begin
- g_GFX_Bubbles(cx, cy, 1+Random(3), 16, 16);
- if Random(2) = 0
- then g_Sound_PlayExAt('SOUND_GAME_BUBBLE1', cx, cy)
- else g_Sound_PlayExAt('SOUND_GAME_BUBBLE2', cx, cy);
+ g_Game_Effect_Bubbles(cx, cy, 1+Random(3), 16, 16);
end
else if g_Frames_Get(_id, 'FRAMES_SMOKE') then
begin
end
else if g_Frames_Get(_id, 'FRAMES_SMOKE') then
begin
end;
end
else
end;
end
else
- begin
- g_GFX_Bubbles(cx, cy, 1+Random(3), 16, 16);
- if Random(2) = 0
- then g_Sound_PlayExAt('SOUND_GAME_BUBBLE1', cx, cy)
- else g_Sound_PlayExAt('SOUND_GAME_BUBBLE2', cx, cy);
- end;
+ g_Game_Effect_Bubbles(cx, cy, 1+Random(3), 16, 16);
+
ShotType := 0;
Continue;
end;
ShotType := 0;
Continue;
end;