diff --git a/src/client/entities.qc b/src/client/entities.qc index 650dfc4..4adf988 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/game_event.qc b/src/client/game_event.qc index 8df481b..d7476b1 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 f96e5bf..62d5f68 100644 --- a/src/client/hud.qc +++ b/src/client/hud.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 1e3895f..d5594dc 100644 --- a/src/client/init.qc +++ b/src/client/init.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/obituary.qc b/src/client/obituary.qc index 877509f..d5dca0f 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/server/ammo_hd.qc b/src/server/ammo_hd.qc index 105d992..b13187a 100644 --- a/src/server/ammo_hd.qc +++ b/src/server/ammo_hd.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * Copyright (c) 2020 Gethyn ThomasQuail * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/server/defs.h b/src/server/defs.h index 38d4edb..3db2dd1 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/gamerules.h b/src/server/gamerules.h index 84df940..b404c90 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 1b168b8..bdfea3a 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/info_runespawn.qc b/src/server/info_runespawn.qc index 8939dc9..678b67d 100644 --- a/src/server/info_runespawn.qc +++ b/src/server/info_runespawn.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 f53d1e0..34b6c85 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 diff --git a/src/server/item_healthkit.qc b/src/server/item_healthkit.qc index 2242086..4cb13f5 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 diff --git a/src/server/item_rune_haste.qc b/src/server/item_rune_haste.qc index a1c5b42..e100641 100644 --- a/src/server/item_rune_haste.qc +++ b/src/server/item_rune_haste.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * Copyright (c) 2020 Gethyn ThomasQuail * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/server/item_rune_stalker.qc b/src/server/item_rune_stalker.qc index e70137e..cf5db05 100644 --- a/src/server/item_rune_stalker.qc +++ b/src/server/item_rune_stalker.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * Copyright (c) 2020 Gethyn ThomasQuail * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/server/item_weaponbox.qc b/src/server/item_weaponbox.qc index 9e6eee2..c82ff13 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 diff --git a/src/server/items.qc b/src/server/items.qc index 0e44bd5..5c0cb7e 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 diff --git a/src/server/progs.src b/src/server/progs.src index 28bbd47..7ea3e4f 100755 --- a/src/server/progs.src +++ b/src/server/progs.src @@ -11,6 +11,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/server.qc b/src/server/server.qc index 8270aa3..e21d66e 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/shared/events.h b/src/shared/events.h index 8d0a008..970bf6f 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 879714d..29348ba 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_lego.qc b/src/shared/fx_lego.qc index 13687b3..3f2dbc0 100644 --- a/src/shared/fx_lego.qc +++ b/src/shared/fx_lego.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_legopiece.qc b/src/shared/fx_legopiece.qc index 9a39b03..98910ab 100644 --- a/src/shared/fx_legopiece.qc +++ b/src/shared/fx_legopiece.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_soda.qc b/src/shared/fx_soda.qc index 5e535df..4593256 100644 --- a/src/shared/fx_soda.qc +++ b/src/shared/fx_soda.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 f763a74..091c05a 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 f567a7c..4f716ed 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 b177836..2481fc9 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 @@ -58,12 +58,6 @@ class player:base_player PREDICTED_INT(ammo_spray); #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 2983458..612edb5 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/w_broom.qc b/src/shared/w_broom.qc index 6fadc55..977ff40 100644 --- a/src/shared/w_broom.qc +++ b/src/shared/w_broom.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * Copyright (c) 2019-2020 Gethyn ThomasQuail * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/shared/w_forks.qc b/src/shared/w_forks.qc index 51db9f5..a435465 100644 --- a/src/shared/w_forks.qc +++ b/src/shared/w_forks.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * Copyright (c) 2019-2020 Gethyn ThomasQuail * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/shared/w_fryingpan.qc b/src/shared/w_fryingpan.qc index c0c4d59..5e7d693 100644 --- a/src/shared/w_fryingpan.qc +++ b/src/shared/w_fryingpan.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * Copyright (c) 2019-2020 Gethyn ThomasQuail * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/shared/w_glove.qc b/src/shared/w_glove.qc index 1ab8ad1..5f46459 100644 --- a/src/shared/w_glove.qc +++ b/src/shared/w_glove.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * Copyright (c) 2019-2020 Gethyn ThomasQuail * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/shared/w_hairspray.qc b/src/shared/w_hairspray.qc index 65f7208..637ef28 100644 --- a/src/shared/w_hairspray.qc +++ b/src/shared/w_hairspray.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * Copyright (c) 2019-2020 Gethyn ThomasQuail * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/shared/w_knife.qc b/src/shared/w_knife.qc index ed45d6d..5efba16 100644 --- a/src/shared/w_knife.qc +++ b/src/shared/w_knife.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_lego.qc b/src/shared/w_lego.qc index 3b5f221..4399f27 100644 --- a/src/shared/w_lego.qc +++ b/src/shared/w_lego.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_legolauncher.qc b/src/shared/w_legolauncher.qc index 6ce0a4b..50e21f8 100644 --- a/src/shared/w_legolauncher.qc +++ b/src/shared/w_legolauncher.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_machette.qc b/src/shared/w_machette.qc index d72d6ac..f9e5d47 100644 --- a/src/shared/w_machette.qc +++ b/src/shared/w_machette.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Hladik + * Copyright (c) 2016-2020 Marco Cawthorne * Copyright (c) 2019-2020 Gethyn ThomasQuail * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/shared/w_sodalauncher.qc b/src/shared/w_sodalauncher.qc index 979ee98..296b4cc 100644 --- a/src/shared/w_sodalauncher.qc +++ b/src/shared/w_sodalauncher.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/weapons.h b/src/shared/weapons.h index 272ed76..673f1ed 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 92736d7..0438f48 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