From 0293f9a441d97a4064784b7757e239b63b185417 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sun, 13 Mar 2022 16:57:51 -0700 Subject: [PATCH] Update copyright information Remove pmodel attributes from the player class. Sound shaders for weapon firing now call alerts to AI. --- src/client/camera.qc | 2 +- src/client/cmds.qc | 2 +- src/client/defs.h | 2 +- src/client/entities.qc | 2 +- src/client/flashlight.qc | 2 +- src/client/game_event.qc | 2 +- src/client/hud.qc | 2 +- src/client/hud_weaponselect.qc | 2 +- src/client/init.qc | 2 +- src/client/obituary.h | 2 +- src/client/obituary.qc | 2 +- src/client/particles.h | 2 +- src/client/player.qc | 2 +- src/client/scoreboard.qc | 2 +- src/client/view.qc | 2 +- src/client/viewmodel.qc | 2 +- src/server/ammo.qc | 2 +- src/server/client.qc | 2 +- src/server/defs.h | 2 +- src/server/flashlight.h | 2 +- src/server/flashlight.qc | 2 +- src/server/gamerules.h | 2 +- src/server/gamerules.qc | 2 +- src/server/gamerules_multiplayer.qc | 7 ++++++- src/server/gamerules_singleplayer.qc | 2 +- src/server/item_battery.qc | 4 ++-- src/server/item_healthkit.qc | 4 ++-- src/server/item_longjump.qc | 2 +- src/server/item_suit.qc | 2 +- src/server/item_weaponbox.qc | 3 ++- src/server/items.h | 2 +- src/server/items.qc | 3 ++- src/server/monster_alien_controller.qc | 2 +- src/server/monster_alien_grunt.qc | 2 +- src/server/monster_alien_slave.qc | 2 +- src/server/monster_apache.qc | 2 +- src/server/monster_babycrab.qc | 2 +- src/server/monster_barnacle.qc | 2 +- src/server/monster_barney.qc | 2 +- src/server/monster_barney_dead.qc | 2 +- src/server/monster_bigmomma.qc | 2 +- src/server/monster_bloater.qc | 2 +- src/server/monster_bullchicken.qc | 2 +- src/server/monster_cockroach.qc | 2 +- src/server/monster_flyer_flock.qc | 2 +- src/server/monster_gargantua.qc | 2 +- src/server/monster_gman.qc | 2 +- src/server/monster_headcrab.qc | 2 +- src/server/monster_hevsuit_dead.qc | 2 +- src/server/monster_hgrunt_dead.qc | 2 +- src/server/monster_houndeye.qc | 2 +- src/server/monster_human_assassin.qc | 2 +- src/server/monster_human_grunt.qc | 2 +- src/server/monster_ichthyosaur.qc | 2 +- src/server/monster_leech.qc | 2 +- src/server/monster_miniturret.qc | 2 +- src/server/monster_nihilanth.qc | 2 +- src/server/monster_osprey.qc | 2 +- src/server/monster_rat.qc | 2 +- src/server/monster_scientist.qc | 2 +- src/server/monster_scientist_dead.qc | 2 +- src/server/monster_sentry.qc | 2 +- src/server/monster_sitting_scientist.qc | 2 +- src/server/monster_tentacle.qc | 2 +- src/server/monster_turret.qc | 2 +- src/server/monster_zombie.qc | 2 +- src/server/player.h | 2 +- src/server/player.qc | 2 +- src/server/progs.src | 1 + src/server/rules.qc | 2 +- src/server/server.qc | 2 +- src/server/spawn.qc | 2 +- src/server/spectator.qc | 2 +- src/server/world_items.qc | 2 +- src/server/xen_hair.qc | 2 +- src/server/xen_plantlight.qc | 2 +- src/server/xen_spore_large.qc | 2 +- src/server/xen_spore_medium.qc | 2 +- src/server/xen_spore_small.qc | 2 +- src/shared/animations.h | 2 +- src/shared/animations.qc | 2 +- src/shared/entities.h | 2 +- src/shared/events.h | 2 +- src/shared/flags.h | 2 +- src/shared/fx_blood.qc | 2 +- src/shared/fx_breakmodel.qc | 2 +- src/shared/fx_explosion.qc | 21 ++++++++++++++++++++- src/shared/fx_gaussbeam.qc | 2 +- src/shared/fx_gibhuman.qc | 2 +- src/shared/fx_impact.qc | 2 +- src/shared/input.qc | 2 +- src/shared/items.h | 2 +- src/shared/player.qc | 8 +------- src/shared/pmove.qc | 2 +- src/shared/pmove_water.qc | 2 +- src/shared/w_crossbow.qc | 2 +- src/shared/w_crowbar.qc | 2 +- src/shared/w_egon.qc | 2 +- src/shared/w_gauss.qc | 2 +- src/shared/w_glock.qc | 2 +- src/shared/w_handgrenade.qc | 2 +- src/shared/w_hornetgun.qc | 2 +- src/shared/w_mp5.qc | 2 +- src/shared/w_python.qc | 2 +- src/shared/w_rpg.qc | 2 +- src/shared/w_satchel.qc | 2 +- src/shared/w_shotgun.qc | 2 +- src/shared/w_snark.qc | 2 +- src/shared/w_tripmine.qc | 2 +- src/shared/weapons.h | 2 +- src/shared/weapons.qc | 2 +- zpak001.pk3dir/sound/weapons_valve.sndshd | 11 +++++++++++ 112 files changed, 150 insertions(+), 118 deletions(-) diff --git a/src/client/camera.qc b/src/client/camera.qc index 3aea939..1389b8d 100644 --- a/src/client/camera.qc +++ b/src/client/camera.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/client/cmds.qc b/src/client/cmds.qc index 68d7ebc..395ab1d 100644 --- a/src/client/cmds.qc +++ b/src/client/cmds.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/client/defs.h b/src/client/defs.h index c2c230b..4341186 100644 --- a/src/client/defs.h +++ b/src/client/defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/client/entities.qc b/src/client/entities.qc index e401713..93b9ce4 100644 --- a/src/client/entities.qc +++ b/src/client/entities.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/client/flashlight.qc b/src/client/flashlight.qc index 0669e5b..7d89bd3 100644 --- a/src/client/flashlight.qc +++ b/src/client/flashlight.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/client/game_event.qc b/src/client/game_event.qc index 16a81a5..c555072 100644 --- a/src/client/game_event.qc +++ b/src/client/game_event.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/client/hud.qc b/src/client/hud.qc index 78349bd..c976427 100644 --- a/src/client/hud.qc +++ b/src/client/hud.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/client/hud_weaponselect.qc b/src/client/hud_weaponselect.qc index 1f99620..3dbf116 100644 --- a/src/client/hud_weaponselect.qc +++ b/src/client/hud_weaponselect.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/client/init.qc b/src/client/init.qc index 758bbd6..8bd0047 100644 --- a/src/client/init.qc +++ b/src/client/init.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/client/obituary.h b/src/client/obituary.h index e6b80c1..d3ce476 100644 --- a/src/client/obituary.h +++ b/src/client/obituary.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/client/obituary.qc b/src/client/obituary.qc index 78dc03b..807a5b0 100644 --- a/src/client/obituary.qc +++ b/src/client/obituary.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/client/particles.h b/src/client/particles.h index 37140d1..40f8491 100644 --- a/src/client/particles.h +++ b/src/client/particles.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/client/player.qc b/src/client/player.qc index 1da0ecd..1a5e9ba 100644 --- a/src/client/player.qc +++ b/src/client/player.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/client/scoreboard.qc b/src/client/scoreboard.qc index bf509a6..d63b945 100644 --- a/src/client/scoreboard.qc +++ b/src/client/scoreboard.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/client/view.qc b/src/client/view.qc index 42b56e1..5d1ef94 100644 --- a/src/client/view.qc +++ b/src/client/view.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/client/viewmodel.qc b/src/client/viewmodel.qc index 3c864b7..75b4ade 100644 --- a/src/client/viewmodel.qc +++ b/src/client/viewmodel.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/ammo.qc b/src/server/ammo.qc index 30f3337..3b79da5 100644 --- a/src/server/ammo.qc +++ b/src/server/ammo.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/client.qc b/src/server/client.qc index e6085bd..6311c9b 100644 --- a/src/server/client.qc +++ b/src/server/client.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/defs.h b/src/server/defs.h index 53eaf32..a3f923c 100644 --- a/src/server/defs.h +++ b/src/server/defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/flashlight.h b/src/server/flashlight.h index d9ad0ef..27fcc8e 100644 --- a/src/server/flashlight.h +++ b/src/server/flashlight.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/flashlight.qc b/src/server/flashlight.qc index fbdf827..7f7d717 100644 --- a/src/server/flashlight.qc +++ b/src/server/flashlight.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/gamerules.h b/src/server/gamerules.h index e9adce7..a03de21 100644 --- a/src/server/gamerules.h +++ b/src/server/gamerules.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/gamerules.qc b/src/server/gamerules.qc index 146d74c..2a89cd8 100644 --- a/src/server/gamerules.qc +++ b/src/server/gamerules.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/gamerules_multiplayer.qc b/src/server/gamerules_multiplayer.qc index 2eed9b2..b7aef0a 100644 --- a/src/server/gamerules_multiplayer.qc +++ b/src/server/gamerules_multiplayer.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -155,6 +155,11 @@ HLMultiplayerRules::ConsoleCommand(base_player pp, string cmd) case "bot_add": Bot_AddQuick(); break; + case "jumptest": + makevectors(pp.v_angle); + traceline(pp.origin + pp.view_ofs, pp.origin + pp.view_ofs + v_forward * 1024, FALSE, pp); + pp.velocity = Route_GetJumpVelocity(pp.origin, trace_endpos, pp.gravity); + break; default: return (0); } diff --git a/src/server/gamerules_singleplayer.qc b/src/server/gamerules_singleplayer.qc index 90176d8..5785277 100644 --- a/src/server/gamerules_singleplayer.qc +++ b/src/server/gamerules_singleplayer.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/item_battery.qc b/src/server/item_battery.qc index ae6b4eb..a4979d7 100644 --- a/src/server/item_battery.qc +++ b/src/server/item_battery.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -71,7 +71,7 @@ void item_battery::Respawn(void) SetOrigin(GetSpawnOrigin()); SetModel(GetSpawnModel()); SetSize([-16,-16,0],[16,16,16]); -// botinfo = BOTINFO_ARMOR; + botinfo = BOTINFO_ARMOR; think = __NULL__; nextthink = -1; diff --git a/src/server/item_healthkit.qc b/src/server/item_healthkit.qc index bd120f5..a53f1a8 100644 --- a/src/server/item_healthkit.qc +++ b/src/server/item_healthkit.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -59,7 +59,7 @@ void item_healthkit::Respawn(void) SetOrigin(GetSpawnOrigin()); SetModel(GetSpawnModel()); SetSize([-16,-16,0],[16,16,16]); - //botinfo = BOTINFO_HEALTH; + botinfo = BOTINFO_HEALTH; think = __NULL__; nextthink = -1; diff --git a/src/server/item_longjump.qc b/src/server/item_longjump.qc index 4eb2c3f..3a25470 100644 --- a/src/server/item_longjump.qc +++ b/src/server/item_longjump.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/item_suit.qc b/src/server/item_suit.qc index 6045ccd..4e66378 100644 --- a/src/server/item_suit.qc +++ b/src/server/item_suit.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/item_weaponbox.qc b/src/server/item_weaponbox.qc index 84db887..4cd8fbd 100644 --- a/src/server/item_weaponbox.qc +++ b/src/server/item_weaponbox.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -147,6 +147,7 @@ void item_weaponbox::item_weaponbox(void) SetSize([-16,-16,0], [16,16,16]); SetSolid(SOLID_TRIGGER); SetMovetype(MOVETYPE_TOSS); + botinfo = BOTINFO_AMMO; } void weaponbox_spawn(player spawner) diff --git a/src/server/items.h b/src/server/items.h index dee59bd..816f9a4 100644 --- a/src/server/items.h +++ b/src/server/items.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/items.qc b/src/server/items.qc index d714418..55e25dd 100644 --- a/src/server/items.qc +++ b/src/server/items.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -56,6 +56,7 @@ void item_pickup::Respawn(void) { SetSolid(SOLID_TRIGGER); SetOrigin(GetSpawnOrigin()); + botinfo = BOTINFO_WEAPON; /* At some points, the item id might not yet be set */ if (GetSpawnModel()) { diff --git a/src/server/monster_alien_controller.qc b/src/server/monster_alien_controller.qc index 5ef43e7..3649be2 100644 --- a/src/server/monster_alien_controller.qc +++ b/src/server/monster_alien_controller.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_alien_grunt.qc b/src/server/monster_alien_grunt.qc index 64f7e45..d8b8969 100644 --- a/src/server/monster_alien_grunt.qc +++ b/src/server/monster_alien_grunt.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_alien_slave.qc b/src/server/monster_alien_slave.qc index d4a9db4..11a6778 100644 --- a/src/server/monster_alien_slave.qc +++ b/src/server/monster_alien_slave.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_apache.qc b/src/server/monster_apache.qc index ff09a44..8735c3c 100644 --- a/src/server/monster_apache.qc +++ b/src/server/monster_apache.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_babycrab.qc b/src/server/monster_babycrab.qc index 299ccc3..5aa02f6 100644 --- a/src/server/monster_babycrab.qc +++ b/src/server/monster_babycrab.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_barnacle.qc b/src/server/monster_barnacle.qc index 5dbaab9..a17a92b 100644 --- a/src/server/monster_barnacle.qc +++ b/src/server/monster_barnacle.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_barney.qc b/src/server/monster_barney.qc index abd9929..5e15569 100644 --- a/src/server/monster_barney.qc +++ b/src/server/monster_barney.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_barney_dead.qc b/src/server/monster_barney_dead.qc index 4cde6a0..2d8a29a 100644 --- a/src/server/monster_barney_dead.qc +++ b/src/server/monster_barney_dead.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_bigmomma.qc b/src/server/monster_bigmomma.qc index 705f45d..8fcce14 100644 --- a/src/server/monster_bigmomma.qc +++ b/src/server/monster_bigmomma.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_bloater.qc b/src/server/monster_bloater.qc index 9ed3b7b..10792f7 100644 --- a/src/server/monster_bloater.qc +++ b/src/server/monster_bloater.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_bullchicken.qc b/src/server/monster_bullchicken.qc index 2ab5ae2..f30bcc1 100644 --- a/src/server/monster_bullchicken.qc +++ b/src/server/monster_bullchicken.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_cockroach.qc b/src/server/monster_cockroach.qc index 333f8f6..a6f291f 100644 --- a/src/server/monster_cockroach.qc +++ b/src/server/monster_cockroach.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_flyer_flock.qc b/src/server/monster_flyer_flock.qc index 9b4305e..1e96feb 100644 --- a/src/server/monster_flyer_flock.qc +++ b/src/server/monster_flyer_flock.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_gargantua.qc b/src/server/monster_gargantua.qc index 736d000..271a7e1 100644 --- a/src/server/monster_gargantua.qc +++ b/src/server/monster_gargantua.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_gman.qc b/src/server/monster_gman.qc index 8a4d637..c8743b5 100644 --- a/src/server/monster_gman.qc +++ b/src/server/monster_gman.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_headcrab.qc b/src/server/monster_headcrab.qc index 5c6c835..49ec1f8 100644 --- a/src/server/monster_headcrab.qc +++ b/src/server/monster_headcrab.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_hevsuit_dead.qc b/src/server/monster_hevsuit_dead.qc index 9cfc167..bb118be 100644 --- a/src/server/monster_hevsuit_dead.qc +++ b/src/server/monster_hevsuit_dead.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_hgrunt_dead.qc b/src/server/monster_hgrunt_dead.qc index e6ff7c3..0020988 100644 --- a/src/server/monster_hgrunt_dead.qc +++ b/src/server/monster_hgrunt_dead.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_houndeye.qc b/src/server/monster_houndeye.qc index ecd16d0..b2e4c89 100644 --- a/src/server/monster_houndeye.qc +++ b/src/server/monster_houndeye.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_human_assassin.qc b/src/server/monster_human_assassin.qc index bda6378..66b65c5 100644 --- a/src/server/monster_human_assassin.qc +++ b/src/server/monster_human_assassin.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_human_grunt.qc b/src/server/monster_human_grunt.qc index 5e169c0..df968bc 100644 --- a/src/server/monster_human_grunt.qc +++ b/src/server/monster_human_grunt.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_ichthyosaur.qc b/src/server/monster_ichthyosaur.qc index eb30588..7483b51 100644 --- a/src/server/monster_ichthyosaur.qc +++ b/src/server/monster_ichthyosaur.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_leech.qc b/src/server/monster_leech.qc index a37e270..bb0be5d 100644 --- a/src/server/monster_leech.qc +++ b/src/server/monster_leech.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_miniturret.qc b/src/server/monster_miniturret.qc index b952d73..7ec6039 100644 --- a/src/server/monster_miniturret.qc +++ b/src/server/monster_miniturret.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_nihilanth.qc b/src/server/monster_nihilanth.qc index 0e8c620..75d5a12 100644 --- a/src/server/monster_nihilanth.qc +++ b/src/server/monster_nihilanth.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_osprey.qc b/src/server/monster_osprey.qc index cbc635a..3fda622 100644 --- a/src/server/monster_osprey.qc +++ b/src/server/monster_osprey.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_rat.qc b/src/server/monster_rat.qc index 57cee12..c078463 100644 --- a/src/server/monster_rat.qc +++ b/src/server/monster_rat.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_scientist.qc b/src/server/monster_scientist.qc index b6859c9..83346a6 100644 --- a/src/server/monster_scientist.qc +++ b/src/server/monster_scientist.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_scientist_dead.qc b/src/server/monster_scientist_dead.qc index 105aed5..f8658ea 100644 --- a/src/server/monster_scientist_dead.qc +++ b/src/server/monster_scientist_dead.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_sentry.qc b/src/server/monster_sentry.qc index 8925386..6132842 100644 --- a/src/server/monster_sentry.qc +++ b/src/server/monster_sentry.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_sitting_scientist.qc b/src/server/monster_sitting_scientist.qc index 0ffd986..9584a7f 100644 --- a/src/server/monster_sitting_scientist.qc +++ b/src/server/monster_sitting_scientist.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_tentacle.qc b/src/server/monster_tentacle.qc index 0afe7db..de87122 100644 --- a/src/server/monster_tentacle.qc +++ b/src/server/monster_tentacle.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_turret.qc b/src/server/monster_turret.qc index 026706a..da946d9 100644 --- a/src/server/monster_turret.qc +++ b/src/server/monster_turret.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/monster_zombie.qc b/src/server/monster_zombie.qc index 692400b..eca5348 100644 --- a/src/server/monster_zombie.qc +++ b/src/server/monster_zombie.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/player.h b/src/server/player.h index 981c3e6..7de34bd 100644 --- a/src/server/player.h +++ b/src/server/player.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/player.qc b/src/server/player.qc index 97d9d6d..4ea5478 100644 --- a/src/server/player.qc +++ b/src/server/player.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/progs.src b/src/server/progs.src index ba86b58..7d6df55 100755 --- a/src/server/progs.src +++ b/src/server/progs.src @@ -10,6 +10,7 @@ ../../../src/shared/fteextensions.qc ../../../src/shared/defs.h ../../../src/server/defs.h +../../../src/botlib/botinfo.h ../../../src/gs-entbase/server.src ../../../src/gs-entbase/shared.src diff --git a/src/server/rules.qc b/src/server/rules.qc index e6b76f0..adbb741 100644 --- a/src/server/rules.qc +++ b/src/server/rules.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/server.qc b/src/server/server.qc index dead11c..908b075 100644 --- a/src/server/server.qc +++ b/src/server/server.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/spawn.qc b/src/server/spawn.qc index dbcfbbf..0915b86 100644 --- a/src/server/spawn.qc +++ b/src/server/spawn.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/spectator.qc b/src/server/spectator.qc index 01ce53f..de8d29f 100644 --- a/src/server/spectator.qc +++ b/src/server/spectator.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/world_items.qc b/src/server/world_items.qc index 9efa058..6a42905 100644 --- a/src/server/world_items.qc +++ b/src/server/world_items.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/xen_hair.qc b/src/server/xen_hair.qc index eb1afe6..5e9ed73 100644 --- a/src/server/xen_hair.qc +++ b/src/server/xen_hair.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/xen_plantlight.qc b/src/server/xen_plantlight.qc index 17a0118..9f90972 100644 --- a/src/server/xen_plantlight.qc +++ b/src/server/xen_plantlight.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/xen_spore_large.qc b/src/server/xen_spore_large.qc index be5bdec..753dd4b 100644 --- a/src/server/xen_spore_large.qc +++ b/src/server/xen_spore_large.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/xen_spore_medium.qc b/src/server/xen_spore_medium.qc index 41ab34a..bcbaab1 100644 --- a/src/server/xen_spore_medium.qc +++ b/src/server/xen_spore_medium.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/server/xen_spore_small.qc b/src/server/xen_spore_small.qc index 3698282..972a380 100644 --- a/src/server/xen_spore_small.qc +++ b/src/server/xen_spore_small.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/animations.h b/src/shared/animations.h index 30b6635..f19f157 100644 --- a/src/shared/animations.h +++ b/src/shared/animations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/animations.qc b/src/shared/animations.qc index 5b5880b..27a4a25 100644 --- a/src/shared/animations.qc +++ b/src/shared/animations.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/entities.h b/src/shared/entities.h index 9d2beb5..e814518 100644 --- a/src/shared/entities.h +++ b/src/shared/entities.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/events.h b/src/shared/events.h index 095279f..e4e4cdc 100644 --- a/src/shared/events.h +++ b/src/shared/events.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/flags.h b/src/shared/flags.h index 2c9e286..e627ef2 100644 --- a/src/shared/flags.h +++ b/src/shared/flags.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/fx_blood.qc b/src/shared/fx_blood.qc index 9859fba..1c58bf4 100644 --- a/src/shared/fx_blood.qc +++ b/src/shared/fx_blood.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/fx_breakmodel.qc b/src/shared/fx_breakmodel.qc index 4f80f19..4532465 100644 --- a/src/shared/fx_breakmodel.qc +++ b/src/shared/fx_breakmodel.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/fx_explosion.qc b/src/shared/fx_explosion.qc index 55c3186..6b3ab5f 100755 --- a/src/shared/fx_explosion.qc +++ b/src/shared/fx_explosion.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -54,6 +54,25 @@ FX_Explosion(vector vecPos) self.nextthink = time + 0.1f + (random() * 0.1f); } + static void FX_Explosion_DLight(void) + { + dynamiclight_add(self.origin, 256 * self.alpha, [1.0,0.45,0]); + + self.alpha -= frametime; + + if (self.alpha <= 0.0f) { + remove(self); + } else { + addentity(self); + } + } + + entity dlight = spawn(); + setorigin(dlight, vecPos); + dlight.predraw = FX_Explosion_DLight; + dlight.drawmask = MASK_ENGINE; + dlight.alpha = 2.0f; + Decals_Place(vecPos, sprintf("{scorch%d", floor(random(1,4)))); vecPos[2] += 48; env_sprite eExplosion = spawn(env_sprite); diff --git a/src/shared/fx_gaussbeam.qc b/src/shared/fx_gaussbeam.qc index 5a1d2e5..999a881 100644 --- a/src/shared/fx_gaussbeam.qc +++ b/src/shared/fx_gaussbeam.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/fx_gibhuman.qc b/src/shared/fx_gibhuman.qc index 25bd919..aa30799 100644 --- a/src/shared/fx_gibhuman.qc +++ b/src/shared/fx_gibhuman.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/fx_impact.qc b/src/shared/fx_impact.qc index 3fb8640..74f6b6c 100644 --- a/src/shared/fx_impact.qc +++ b/src/shared/fx_impact.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/input.qc b/src/shared/input.qc index 877529c..93c5ff9 100644 --- a/src/shared/input.qc +++ b/src/shared/input.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/items.h b/src/shared/items.h index e57f61a..601439d 100644 --- a/src/shared/items.h +++ b/src/shared/items.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/player.qc b/src/shared/player.qc index c0ddc3f..7f6f5d3 100644 --- a/src/shared/player.qc +++ b/src/shared/player.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -83,12 +83,6 @@ class player:base_player virtual void(void) Physics_WaterMove; #ifdef CLIENT - /* External model */ - entity p_model; - int p_hand_bone; - int p_model_bone; - float lastweapon; - virtual void(void) draw; virtual float() predraw; virtual void(void) postdraw; diff --git a/src/shared/pmove.qc b/src/shared/pmove.qc index 91425ee..9d2250c 100644 --- a/src/shared/pmove.qc +++ b/src/shared/pmove.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/pmove_water.qc b/src/shared/pmove_water.qc index a6c7766..18fc8a2 100644 --- a/src/shared/pmove_water.qc +++ b/src/shared/pmove_water.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/w_crossbow.qc b/src/shared/w_crossbow.qc index 8014379..9ad68cb 100644 --- a/src/shared/w_crossbow.qc +++ b/src/shared/w_crossbow.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/w_crowbar.qc b/src/shared/w_crowbar.qc index fb1a896..cb3e5a2 100644 --- a/src/shared/w_crowbar.qc +++ b/src/shared/w_crowbar.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/w_egon.qc b/src/shared/w_egon.qc index 1da0a61..e8a056d 100644 --- a/src/shared/w_egon.qc +++ b/src/shared/w_egon.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/w_gauss.qc b/src/shared/w_gauss.qc index 7bfd8f8..989c25a 100644 --- a/src/shared/w_gauss.qc +++ b/src/shared/w_gauss.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/w_glock.qc b/src/shared/w_glock.qc index e65425c..7ca98ce 100644 --- a/src/shared/w_glock.qc +++ b/src/shared/w_glock.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/w_handgrenade.qc b/src/shared/w_handgrenade.qc index b3911ab..6d8c291 100644 --- a/src/shared/w_handgrenade.qc +++ b/src/shared/w_handgrenade.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/w_hornetgun.qc b/src/shared/w_hornetgun.qc index 447b72c..655bc58 100644 --- a/src/shared/w_hornetgun.qc +++ b/src/shared/w_hornetgun.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/w_mp5.qc b/src/shared/w_mp5.qc index 52589f0..a82d1bd 100644 --- a/src/shared/w_mp5.qc +++ b/src/shared/w_mp5.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/w_python.qc b/src/shared/w_python.qc index 7fea7c8..e6a11cf 100644 --- a/src/shared/w_python.qc +++ b/src/shared/w_python.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/w_rpg.qc b/src/shared/w_rpg.qc index 709a257..8f6a363 100644 --- a/src/shared/w_rpg.qc +++ b/src/shared/w_rpg.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/w_satchel.qc b/src/shared/w_satchel.qc index b2b4c51..5a0432d 100644 --- a/src/shared/w_satchel.qc +++ b/src/shared/w_satchel.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/w_shotgun.qc b/src/shared/w_shotgun.qc index 05048c0..b263dea 100644 --- a/src/shared/w_shotgun.qc +++ b/src/shared/w_shotgun.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/w_snark.qc b/src/shared/w_snark.qc index 7b73267..e193463 100644 --- a/src/shared/w_snark.qc +++ b/src/shared/w_snark.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/w_tripmine.qc b/src/shared/w_tripmine.qc index a217204..86fbf1a 100644 --- a/src/shared/w_tripmine.qc +++ b/src/shared/w_tripmine.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Hladik + * Copyright (c) 2016-2021 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/weapons.h b/src/shared/weapons.h index 6163f2b..7b59152 100644 --- a/src/shared/weapons.h +++ b/src/shared/weapons.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/shared/weapons.qc b/src/shared/weapons.qc index 6d388ad..85a0504 100644 --- a/src/shared/weapons.qc +++ b/src/shared/weapons.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/zpak001.pk3dir/sound/weapons_valve.sndshd b/zpak001.pk3dir/sound/weapons_valve.sndshd index 34d6d0e..92addde 100644 --- a/zpak001.pk3dir/sound/weapons_valve.sndshd +++ b/zpak001.pk3dir/sound/weapons_valve.sndshd @@ -2,6 +2,7 @@ weapon_357.shoot { + alerts sample weapons/357_shot1.wav sample weapons/357_shot2.wav distshader weapon_357.shoot_dist @@ -19,6 +20,7 @@ weapon_357.reload weapon_crossbow.fire { + alerts sample weapons/xbow_fire1.wav } @@ -40,12 +42,14 @@ weapon_crossbow.reload weapon_crowbar.hit { + alerts sample weapons/cbar_hit1.wav sample weapons/cbar_hit2.wav } weapon_crowbar.hitbody { + alerts sample weapons/cbar_hitbod1.wav sample weapons/cbar_hitbod2.wav sample weapons/cbar_hitbod3.wav @@ -58,6 +62,7 @@ weapon_crowbar.miss weapon_glock.fire { + alerts sample weapons/pl_gun3.wav } @@ -70,6 +75,7 @@ weapon_handgrenade.bounce weapon_hornetgun.fire { + alerts sample agrunt/ag_fire1.wav sample agrunt/ag_fire2.wav sample agrunt/ag_fire3.wav @@ -91,6 +97,7 @@ weapon_hornetgun.hit weapon_mp5.shoot { + alerts sample weapons/hks1.wav sample weapons/hks2.wav distshader weapon_mp5.shoot_dist @@ -104,6 +111,7 @@ weapon_mp5.shoot_dist weapon_mp5.gl { + alerts sample weapons/glauncher.wav } @@ -133,17 +141,20 @@ weapon_tripmine.activate weapon_rpg.shoot { + alerts sample weapons/rocketfire1.wav } weapon_shotgun.single { + alerts sample weapons/sbarrel1.wav distshader weapon_shotgun.distance } weapon_shotgun.double { + alerts sample weapons/dbarrel1.wav distshader weapon_shotgun.distance }