From ccb6a9163040fc75ed5496de4c2d234d5a0195ff Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sun, 13 Mar 2022 16:59:54 -0700 Subject: [PATCH] Update copyright information Remove pmodel attributes from the player class. --- src/client/camera.qc | 2 +- src/client/cmds.qc | 2 +- src/client/defs.h | 2 +- src/client/draw.qc | 2 +- src/client/entities.qc | 2 +- src/client/game_event.qc | 2 +- src/client/hud.qc | 2 +- src/client/hud_crosshair.qc | 2 +- src/client/hud_scope.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/client.qc | 2 +- src/server/damage.qc | 2 +- src/server/defs.h | 2 +- src/server/gamerules.h | 2 +- src/server/gamerules.qc | 2 +- src/server/gamerules_multiplayer.qc | 2 +- src/server/gamerules_singleplayer.qc | 2 +- src/server/init.qc | 2 +- src/server/items.h | 2 +- src/server/items.qc | 2 +- src/server/player.h | 2 +- src/server/player.qc | 2 +- src/server/progs.src | 1 + src/server/rules.qc | 2 +- src/server/spawn.qc | 2 +- src/server/spectator.qc | 2 +- src/server/world_items.qc | 2 +- src/shared/animations.h | 2 +- src/shared/animations.qc | 2 +- src/shared/entities.h | 2 +- src/shared/flags.h | 2 +- src/shared/fx_impact.qc | 2 +- src/shared/input.qc | 2 +- src/shared/items.h | 2 +- src/shared/player.h | 7 ------- src/shared/player.qc | 2 +- src/shared/pmove.qc | 2 +- src/shared/pmove_water.qc | 2 +- src/shared/sound_pitched.qc | 2 +- 47 files changed, 46 insertions(+), 52 deletions(-) diff --git a/src/client/camera.qc b/src/client/camera.qc index 5cc8bce..853499c 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 0f2af63..907ca82 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 0c8def7..130f196 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/draw.qc b/src/client/draw.qc index cd4b0d2..6818fe9 100644 --- a/src/client/draw.qc +++ b/src/client/draw.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/entities.qc b/src/client/entities.qc index dc94a12..340872c 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 cbe8b5f..81017c8 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 672cf0a..5038b55 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_crosshair.qc b/src/client/hud_crosshair.qc index 7e649ee..9686550 100644 --- a/src/client/hud_crosshair.qc +++ b/src/client/hud_crosshair.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2019 Marco Hladik + * Copyright (c) 2016-2019 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_scope.qc b/src/client/hud_scope.qc index 582aef2..fc0723a 100644 --- a/src/client/hud_scope.qc +++ b/src/client/hud_scope.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2019 Marco Hladik + * Copyright (c) 2016-2019 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 c4c6cae..b45bccc 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 052346d..592c2f6 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.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 607b301..804904a 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 a1e659f..f5f0aab 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 457b5e9..001848e 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 e6c082e..dce1d67 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 6ed19d0..5379d8a 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 eefc8cd..5687b97 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/client.qc b/src/server/client.qc index 7d39c9f..218b733 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/damage.qc b/src/server/damage.qc index 1299421..e640540 100644 --- a/src/server/damage.qc +++ b/src/server/damage.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 f52da6f..24200ba 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 f06ab0a..a454cf3 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 95feabe..4508f56 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 23b65df..52abecd 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 diff --git a/src/server/gamerules_singleplayer.qc b/src/server/gamerules_singleplayer.qc index 2eac419..9ff52c3 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/init.qc b/src/server/init.qc index 60eed35..206eae5 100644 --- a/src/server/init.qc +++ b/src/server/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/server/items.h b/src/server/items.h index e04758b..c7d623a 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 fd42069..78f78a4 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/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 ca92677..2a3ae73 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 fadaece..8592a8e 100644 --- a/src/server/progs.src +++ b/src/server/progs.src @@ -69,6 +69,7 @@ ../../../src/shared/fteextensions.qc ../../../src/shared/defs.h ../../../src/server/defs.h +../../../src/botlib/botinfo.h ../../../src/gs-entbase/server.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/spawn.qc b/src/server/spawn.qc index b60cc9e..12f12e6 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 bea7e1d..e0ad086 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/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 9cdff79..8a1b954 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 3a8359e..84685a4 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/flags.h b/src/shared/flags.h index cf765c2..f6e893f 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_impact.qc b/src/shared/fx_impact.qc index dfe81b0..1295239 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 d5332a3..c17e82a 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 0ce68f1..3048761 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.h b/src/shared/player.h index d60f5b7..4e208db 100644 --- a/src/shared/player.h +++ b/src/shared/player.h @@ -482,13 +482,6 @@ class player:base_player //TAGGG - TODO. See if these need other lines to be supported & actually used, remove // if not needed at all for what TS does. #ifdef CLIENT - /* External model */ - entity p_model; - int p_hand_bone; - int p_model_bone; - - // nothing uses this? Whoops - //float lastweapon; #endif void(void) player; diff --git a/src/shared/player.qc b/src/shared/player.qc index feca5f1..2168331 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 diff --git a/src/shared/pmove.qc b/src/shared/pmove.qc index 64e96d2..f23435a 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 316aada..d2cc83f 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/sound_pitched.qc b/src/shared/sound_pitched.qc index 32183f6..d8356f7 100644 --- a/src/shared/sound_pitched.qc +++ b/src/shared/sound_pitched.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