diff --git a/base/src/client/camera.qc b/base/src/client/camera.qc index e9aa70de..ce58b396 100644 --- a/base/src/client/camera.qc +++ b/base/src/client/camera.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ struct { diff --git a/base/src/client/cmds.qc b/base/src/client/cmds.qc index b0cc2f83..aa0c031f 100644 --- a/base/src/client/cmds.qc +++ b/base/src/client/cmds.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* This is where custom game-specific commands go! * You'll also inherit all the commands defined in entry.c */ diff --git a/base/src/client/defs.h b/base/src/client/defs.h index 3a4588f7..0120afb5 100644 --- a/base/src/client/defs.h +++ b/base/src/client/defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ vector g_hudmins; vector g_hudres; diff --git a/base/src/client/draw.qc b/base/src/client/draw.qc index 51a22652..d30148a3 100644 --- a/base/src/client/draw.qc +++ b/base/src/client/draw.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void ClientGame_PreDraw(void) diff --git a/base/src/client/entities.qc b/base/src/client/entities.qc index 8d3cda0b..4b7873dd 100644 --- a/base/src/client/entities.qc +++ b/base/src/client/entities.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int ClientGame_EntityUpdate(float id, float new) diff --git a/base/src/client/game_event.qc b/base/src/client/game_event.qc index b71d1f00..f25757de 100644 --- a/base/src/client/game_event.qc +++ b/base/src/client/game_event.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int ClientGame_EventParse(float fHeader) diff --git a/base/src/client/hud.qc b/base/src/client/hud.qc index ea16fa8d..ed516bde 100644 --- a/base/src/client/hud.qc +++ b/base/src/client/hud.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* main entry */ void diff --git a/base/src/client/hud_weaponselect.qc b/base/src/client/hud_weaponselect.qc index 726e1c30..ad8b8924 100644 --- a/base/src/client/hud_weaponselect.qc +++ b/base/src/client/hud_weaponselect.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void HUD_DrawWeaponSelect_Forward(void) diff --git a/base/src/client/init.qc b/base/src/client/init.qc index 917b2bd2..5d8a0451 100644 --- a/base/src/client/init.qc +++ b/base/src/client/init.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* ================= diff --git a/base/src/client/modelevent.qc b/base/src/client/modelevent.qc index 526113bb..cd659ea9 100644 --- a/base/src/client/modelevent.qc +++ b/base/src/client/modelevent.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void ClientGame_ModelEvent(float flTimeStamp, int iCode, string strData) diff --git a/base/src/client/player.qc b/base/src/client/player.qc index db812b18..4e6a5550 100644 --- a/base/src/client/player.qc +++ b/base/src/client/player.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Player_PreDraw(NSClientPlayer pl, int thirdperson) diff --git a/base/src/client/progs.src b/base/src/client/progs.src index c0bbae69..70274ec5 100644 --- a/base/src/client/progs.src +++ b/base/src/client/progs.src @@ -3,7 +3,6 @@ #define CSQC #define CLIENT -#define GS_RENDERFX #includelist /* first the engine, then nuclide headers for client/shared */ diff --git a/base/src/client/scoreboard.qc b/base/src/client/scoreboard.qc index d32e42ed..f2c69211 100644 --- a/base/src/client/scoreboard.qc +++ b/base/src/client/scoreboard.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #define SCORE_HEADER_C [255/255,156/255,0] #define SCORE_LINE_C [255/255,200/255,0] diff --git a/base/src/client/view.qc b/base/src/client/view.qc index efa4c715..2a7976b1 100644 --- a/base/src/client/view.qc +++ b/base/src/client/view.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void View_UpdateWeapon(player pl, entity vm, entity mflash) diff --git a/base/src/client/viewmodel.qc b/base/src/client/viewmodel.qc index 7d0e7dfa..ff853f3d 100644 --- a/base/src/client/viewmodel.qc +++ b/base/src/client/viewmodel.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var float autocvar_v_bob = 0.01f; var float autocvar_v_bobcycle = 1.0f; diff --git a/base/src/server/client.qc b/base/src/server/client.qc index d82cc1e9..82ac8317 100644 --- a/base/src/server/client.qc +++ b/base/src/server/client.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* called every input frame */ void diff --git a/base/src/server/damage.qc b/base/src/server/damage.qc index 4a5cd8cf..fbdcedc5 100644 --- a/base/src/server/damage.qc +++ b/base/src/server/damage.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* generic function that applies damage, pain and suffering */ void diff --git a/base/src/server/defs.h b/base/src/server/defs.h index a3f923ca..ea912231 100644 --- a/base/src/server/defs.h +++ b/base/src/server/defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #include "gamerules.h" #include "items.h" diff --git a/base/src/server/flashlight.h b/base/src/server/flashlight.h index 27fcc8e2..76dfb100 100644 --- a/base/src/server/flashlight.h +++ b/base/src/server/flashlight.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,6 +12,6 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Flashlight_Toggle(void); diff --git a/base/src/server/flashlight.qc b/base/src/server/flashlight.qc index 94d9f66c..5a767668 100644 --- a/base/src/server/flashlight.qc +++ b/base/src/server/flashlight.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Flashlight_Toggle(void) diff --git a/base/src/server/gamerules.h b/base/src/server/gamerules.h index 426744db..f00a10e5 100644 --- a/base/src/server/gamerules.h +++ b/base/src/server/gamerules.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class GameRules:CGameRules { diff --git a/base/src/server/gamerules.qc b/base/src/server/gamerules.qc index 75a927e9..0e158818 100644 --- a/base/src/server/gamerules.qc +++ b/base/src/server/gamerules.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var int autocvar_sv_playerkeepalive = TRUE; diff --git a/base/src/server/gamerules_multiplayer.qc b/base/src/server/gamerules_multiplayer.qc index ff8a3eac..8fdfbc75 100644 --- a/base/src/server/gamerules_multiplayer.qc +++ b/base/src/server/gamerules_multiplayer.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void MultiplayerRules::FrameStart(void) diff --git a/base/src/server/gamerules_singleplayer.qc b/base/src/server/gamerules_singleplayer.qc index 0a6ffcfe..053718d5 100644 --- a/base/src/server/gamerules_singleplayer.qc +++ b/base/src/server/gamerules_singleplayer.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void SingleplayerRules::PlayerDeath(NSClientPlayer pl) diff --git a/base/src/server/items.h b/base/src/server/items.h index 82c5259a..cc7e4cf6 100644 --- a/base/src/server/items.h +++ b/base/src/server/items.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* PICKUP ITEMS */ class item_pickup:NSRenderableEntity diff --git a/base/src/server/items.qc b/base/src/server/items.qc index 064399f8..6c39d4f3 100644 --- a/base/src/server/items.qc +++ b/base/src/server/items.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void item_pickup::Touch(entity eToucher) diff --git a/base/src/server/modelevent.qc b/base/src/server/modelevent.qc index 34b45516..1052cffd 100644 --- a/base/src/server/modelevent.qc +++ b/base/src/server/modelevent.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Game_ServerModelEvent(float flTimeStamp, int iCode, string strData) diff --git a/base/src/server/player.h b/base/src/server/player.h index 7de34bd9..3d4f84f0 100644 --- a/base/src/server/player.h +++ b/base/src/server/player.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Player_UseDown(void); void Player_UseUp(void); diff --git a/base/src/server/player.qc b/base/src/server/player.qc index c97cdcaa..07d8c64d 100644 --- a/base/src/server/player.qc +++ b/base/src/server/player.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* ==================== diff --git a/base/src/server/progs.src b/base/src/server/progs.src index dafe5c67..c73b9b62 100755 --- a/base/src/server/progs.src +++ b/base/src/server/progs.src @@ -3,7 +3,6 @@ #define QWSSQC #define SERVER -#define GS_RENDERFX #includelist /* engine, then nuclide headers & functions */ diff --git a/base/src/server/rules.qc b/base/src/server/rules.qc index bfb26348..ae5c43fa 100644 --- a/base/src/server/rules.qc +++ b/base/src/server/rules.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int Rules_IsTeamPlay(void) { diff --git a/base/src/server/server.qc b/base/src/server/server.qc index 545310ab..79a55284 100644 --- a/base/src/server/server.qc +++ b/base/src/server/server.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Game_InitRules(void) diff --git a/base/src/server/spawn.qc b/base/src/server/spawn.qc index 5d4bc1e3..fec334a0 100644 --- a/base/src/server/spawn.qc +++ b/base/src/server/spawn.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void info_player_start(void) diff --git a/base/src/server/spectator.qc b/base/src/server/spectator.qc index 01e583b1..8d3c6211 100644 --- a/base/src/server/spectator.qc +++ b/base/src/server/spectator.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Game_SpectatorThink(void) diff --git a/base/src/shared/animations.h b/base/src/shared/animations.h index c0bccf60..cca3ce67 100644 --- a/base/src/shared/animations.h +++ b/base/src/shared/animations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,4 +12,4 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ diff --git a/base/src/shared/animations.qc b/base/src/shared/animations.qc index 5af14deb..4f12892c 100755 --- a/base/src/shared/animations.qc +++ b/base/src/shared/animations.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Animation_TimerUpdate(player pl, float ftime) diff --git a/base/src/shared/flags.h b/base/src/shared/flags.h index 91ed920d..de6be402 100644 --- a/base/src/shared/flags.h +++ b/base/src/shared/flags.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* game flags */ #define GF_SEMI_TOGGLED (1<<0) diff --git a/base/src/shared/fx_blood.qc b/base/src/shared/fx_blood.qc index e3fe0626..fbcd2903 100644 --- a/base/src/shared/fx_blood.qc +++ b/base/src/shared/fx_blood.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifdef CLIENT var float PARTICLE_BLOOD; diff --git a/base/src/shared/fx_breakmodel.qc b/base/src/shared/fx_breakmodel.qc index b54fd9cc..a91311d5 100644 --- a/base/src/shared/fx_breakmodel.qc +++ b/base/src/shared/fx_breakmodel.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifdef CLIENT void diff --git a/base/src/shared/fx_corpse.qc b/base/src/shared/fx_corpse.qc index 188cfe0a..3a46211b 100644 --- a/base/src/shared/fx_corpse.qc +++ b/base/src/shared/fx_corpse.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifdef SERVER #define CORPSES_MAX 16 diff --git a/base/src/shared/fx_explosion.qc b/base/src/shared/fx_explosion.qc index 0e4fffec..e831df24 100755 --- a/base/src/shared/fx_explosion.qc +++ b/base/src/shared/fx_explosion.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifdef CLIENT diff --git a/base/src/shared/fx_gibhuman.qc b/base/src/shared/fx_gibhuman.qc index b9b6c97e..bfc16b98 100644 --- a/base/src/shared/fx_gibhuman.qc +++ b/base/src/shared/fx_gibhuman.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifdef CLIENT diff --git a/base/src/shared/fx_impact.qc b/base/src/shared/fx_impact.qc index d0b73be6..9373d920 100644 --- a/base/src/shared/fx_impact.qc +++ b/base/src/shared/fx_impact.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifdef CLIENT void diff --git a/base/src/shared/fx_spark.qc b/base/src/shared/fx_spark.qc index 8bb310ba..62a2a52b 100644 --- a/base/src/shared/fx_spark.qc +++ b/base/src/shared/fx_spark.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifdef CLIENT var float PARTICLE_SPARK; diff --git a/base/src/shared/input.qc b/base/src/shared/input.qc index 193f08f5..49dfa80a 100644 --- a/base/src/shared/input.qc +++ b/base/src/shared/input.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Game_Input(player pl) diff --git a/base/src/shared/items.h b/base/src/shared/items.h index 0cab74b2..2c791114 100644 --- a/base/src/shared/items.h +++ b/base/src/shared/items.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,5 +12,5 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ diff --git a/base/src/shared/player.qc b/base/src/shared/player.qc index ebd2141b..22998eb0 100644 --- a/base/src/shared/player.qc +++ b/base/src/shared/player.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* all potential SendFlags bits we can possibly send */ enumflags diff --git a/base/src/shared/pmove.qc b/base/src/shared/pmove.qc index 0f69efe5..e9f7501c 100644 --- a/base/src/shared/pmove.qc +++ b/base/src/shared/pmove.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #define PHY_JUMP_CHAINWINDOW 0.5 #define PHY_JUMP_CHAIN 100 diff --git a/base/src/shared/pmove_water.qc b/base/src/shared/pmove_water.qc index e372af11..289385a1 100644 --- a/base/src/shared/pmove_water.qc +++ b/base/src/shared/pmove_water.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void GamePMove_WaterMove(player target) diff --git a/base/src/shared/weapon_baseautomatic.qc b/base/src/shared/weapon_baseautomatic.qc index 5b941ada..7c954416 100644 --- a/base/src/shared/weapon_baseautomatic.qc +++ b/base/src/shared/weapon_baseautomatic.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enum { diff --git a/base/src/shared/weapon_basemelee.qc b/base/src/shared/weapon_basemelee.qc index f8d37326..b8581799 100644 --- a/base/src/shared/weapon_basemelee.qc +++ b/base/src/shared/weapon_basemelee.qc @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + enum { MELEE_FAILED, diff --git a/base/src/shared/weapon_baseprojectile.qc b/base/src/shared/weapon_baseprojectile.qc index d96730f0..7d421a94 100644 --- a/base/src/shared/weapon_baseprojectile.qc +++ b/base/src/shared/weapon_baseprojectile.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enum { diff --git a/base/src/shared/weapon_basesemi.qc b/base/src/shared/weapon_basesemi.qc index 96021b69..4ab18448 100644 --- a/base/src/shared/weapon_basesemi.qc +++ b/base/src/shared/weapon_basesemi.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enum { diff --git a/base/src/shared/weapon_baseshotgun.qc b/base/src/shared/weapon_baseshotgun.qc index 0a742587..98bda6d7 100644 --- a/base/src/shared/weapon_baseshotgun.qc +++ b/base/src/shared/weapon_baseshotgun.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enum { diff --git a/base/src/shared/weapon_common.h b/base/src/shared/weapon_common.h index ae7c6ff7..d6af29cc 100644 --- a/base/src/shared/weapon_common.h +++ b/base/src/shared/weapon_common.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* for AI identification purposes */ typedef enum diff --git a/base/src/shared/weapon_common.qc b/base/src/shared/weapon_common.qc index a1eea277..8d4b1c1b 100644 --- a/base/src/shared/weapon_common.qc +++ b/base/src/shared/weapon_common.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var int g_weapon_weights[g_weapons.length]; diff --git a/base/src/shared/weapons.h b/base/src/shared/weapons.h index c0a27b1e..20849b86 100644 --- a/base/src/shared/weapons.h +++ b/base/src/shared/weapons.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* weapon Indices for the weapon table */ enum diff --git a/base/src/shared/weapons.qc b/base/src/shared/weapons.qc index 3698d7f2..58e0255e 100644 --- a/base/src/shared/weapons.qc +++ b/base/src/shared/weapons.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ weapon_t w_null = {}; weapon_t g_weapons[] = { diff --git a/base/test_maps.pk3dir/maps/test_bounce.bsp b/base/test_maps.pk3dir/maps/test_bounce.bsp new file mode 100644 index 00000000..39f1fcf2 Binary files /dev/null and b/base/test_maps.pk3dir/maps/test_bounce.bsp differ diff --git a/base/test_maps.pk3dir/maps/test_bounce.map b/base/test_maps.pk3dir/maps/test_bounce.map new file mode 100644 index 00000000..c4cc28c7 --- /dev/null +++ b/base/test_maps.pk3dir/maps/test_bounce.map @@ -0,0 +1,122 @@ + +// entity 0 +{ +"classname" "worldspawn" +"skyname" "textures/skies/smudge/bg" +// brush 0 +{ +( 128 128 64 ) ( 128 -128 64 ) ( -128 128 64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( 128 136 64 ) ( -128 136 64 ) ( 128 136 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( 128 128 64 ) ( 128 128 -64 ) ( 128 -128 64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -128 -128 -64 ) ( 128 -128 -64 ) ( -128 128 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( -128 -128 -64 ) ( -128 128 -64 ) ( -128 -128 64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( 128 128 -64 ) ( -128 128 64 ) ( 128 128 64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +} +// brush 1 +{ +( 128 128 64 ) ( 128 -128 64 ) ( -128 128 64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( 128 128 64 ) ( -128 128 64 ) ( 128 128 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( 136 128 64 ) ( 136 128 -64 ) ( 136 -128 64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -128 -128 -64 ) ( 128 -128 -64 ) ( -128 128 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( -128 -128 -64 ) ( -128 -128 64 ) ( 128 -128 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( 128 -128 64 ) ( 128 128 -64 ) ( 128 128 64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +} +// brush 2 +{ +( 128 128 64 ) ( -128 128 64 ) ( 128 128 -64 ) next/cracked1 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( 128 128 64 ) ( 128 128 -64 ) ( 128 -128 64 ) next/cracked1 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -128 -128 -72 ) ( 128 -128 -72 ) ( -128 128 -72 ) next/cracked1 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( -128 -128 -64 ) ( -128 -128 64 ) ( 128 -128 -64 ) next/cracked1 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -128 -128 -64 ) ( -128 128 -64 ) ( -128 -128 64 ) next/cracked1 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -128 128 -64 ) ( 128 -128 -64 ) ( -128 -128 -64 ) next/cracked1 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +} +// brush 3 +{ +( 128 128 64 ) ( 128 -128 64 ) ( -128 128 64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( 128 128 64 ) ( 128 128 -64 ) ( 128 -128 64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -128 -128 -64 ) ( 128 -128 -64 ) ( -128 128 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( -128 -136 -64 ) ( -128 -136 64 ) ( 128 -136 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -128 -128 -64 ) ( -128 128 -64 ) ( -128 -128 64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( 128 -128 -64 ) ( -128 -128 64 ) ( -128 -128 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +} +// brush 4 +{ +( 128 128 64 ) ( 128 -128 64 ) ( -128 128 64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( 128 128 64 ) ( -128 128 64 ) ( 128 128 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -128 -128 -64 ) ( 128 -128 -64 ) ( -128 128 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( -128 -128 -64 ) ( -128 -128 64 ) ( 128 -128 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -136 -128 -64 ) ( -136 128 -64 ) ( -136 -128 64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -128 -128 64 ) ( -128 128 -64 ) ( -128 -128 -64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +} +// brush 5 +{ +( 128 128 128 ) ( 128 -128 128 ) ( -128 128 128 ) next/bunker5 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( 128 128 64 ) ( -128 128 64 ) ( 128 128 -64 ) next/bunker5 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( 128 128 64 ) ( 128 128 -64 ) ( 128 -128 64 ) next/bunker5 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -128 -128 -64 ) ( -128 128 -64 ) ( -128 -128 64 ) next/bunker5 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -128 128 64 ) ( 128 -128 64 ) ( 128 128 64 ) next/bunker5 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( 64 64 64 ) ( -64 64 72 ) ( 64 64 72 ) next/bunker5 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +} +// brush 6 +{ +( 128 128 128 ) ( 128 -128 128 ) ( -128 128 128 ) next/bunker5 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( 128 128 64 ) ( 128 128 -64 ) ( 128 -128 64 ) next/bunker5 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -128 -128 -64 ) ( -128 -128 64 ) ( 128 -128 -64 ) next/bunker5 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -128 128 64 ) ( 128 -128 64 ) ( 128 128 64 ) next/bunker5 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( 64 64 72 ) ( -64 64 72 ) ( 64 64 64 ) next/bunker5 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( 64 -64 72 ) ( 64 64 64 ) ( 64 64 72 ) next/bunker5 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +} +// brush 7 +{ +( 128 128 128 ) ( 128 -128 128 ) ( -128 128 128 ) next/bunker5 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( -128 -128 -64 ) ( -128 -128 64 ) ( 128 -128 -64 ) next/bunker5 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -128 -128 -64 ) ( -128 128 -64 ) ( -128 -128 64 ) next/bunker5 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -128 128 64 ) ( 128 -128 64 ) ( 128 128 64 ) next/bunker5 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( 64 64 72 ) ( 64 64 64 ) ( 64 -64 72 ) next/bunker5 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( 64 -64 64 ) ( -64 -64 72 ) ( -64 -64 64 ) next/bunker5 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +} +// brush 8 +{ +( 128 128 128 ) ( 128 -128 128 ) ( -128 128 128 ) next/bunker5 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( -128 -128 -64 ) ( -128 128 -64 ) ( -128 -128 64 ) next/bunker5 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -128 128 64 ) ( 128 -128 64 ) ( 128 128 64 ) next/bunker5 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( 64 64 72 ) ( -64 64 72 ) ( 64 64 64 ) next/bunker5 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -64 -64 64 ) ( -64 -64 72 ) ( 64 -64 64 ) next/bunker5 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -64 -64 72 ) ( -64 64 64 ) ( -64 -64 64 ) next/bunker5 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +} +// brush 9 +{ +( 64 64 144 ) ( 64 -64 144 ) ( -64 64 144 ) common/skyportal [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 +( 64 64 144 ) ( -64 64 144 ) ( 64 64 128 ) common/skyportal [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 +( 64 64 144 ) ( 64 64 128 ) ( 64 -64 144 ) common/skyportal [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 +( -64 -64 128 ) ( 64 -64 128 ) ( -64 64 128 ) common/skyportal [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 +( -64 -64 128 ) ( -64 -64 144 ) ( 64 -64 128 ) common/skyportal [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 +( -64 -64 128 ) ( -64 64 128 ) ( -64 -64 144 ) common/skyportal [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 +} +// brush 10 +{ +( 0 32 32 ) ( 0 -48 32 ) ( -8 32 32 ) next/bunker2 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( 0 32 24 ) ( -8 32 24 ) ( 0 32 16 ) next/bunker2 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( 8 32 -56 ) ( 8 32 -64 ) ( 8 -48 -56 ) next/bunker2 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -8 -40 -64 ) ( 0 -40 -64 ) ( -8 40 -64 ) next/bunker2 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 +( -8 -32 -64 ) ( -8 -32 -56 ) ( 0 -32 -64 ) next/bunker2 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +( -8 -40 -64 ) ( -8 40 -64 ) ( -8 -40 -56 ) next/bunker2 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 +} +} +// entity 1 +{ +"classname" "info_player_start" +"origin" "-96.000000 0.000000 0.000000" +} +// entity 2 +{ +"classname" "light_environment" +"origin" "0.000000 0.000000 96.000000" +"color" "1 1 1" +"intensity" "1000" +"pitch" "-145" +"samples" "16" +"sunspreadangle" "6" +"filterradius" "1" +"ambientcolor" "0.7 0.8 1" +} diff --git a/base/test_maps.pk3dir/maps/test_coloredlights.bsp b/base/test_maps.pk3dir/maps/test_coloredlights.bsp new file mode 100644 index 00000000..626c4967 Binary files /dev/null and b/base/test_maps.pk3dir/maps/test_coloredlights.bsp differ diff --git a/base/test_maps.pk3dir/maps/test_coloredlights.map b/base/test_maps.pk3dir/maps/test_coloredlights.map new file mode 100644 index 00000000..43b4e6bd --- /dev/null +++ b/base/test_maps.pk3dir/maps/test_coloredlights.map @@ -0,0 +1,109 @@ + +// entity 0 +{ +"classname" "worldspawn" +// brush 0 +{ +( 248 192 -64 ) ( 248 -192 -64 ) ( -264 192 -64 ) measure/floor [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 256 192 8 ) ( -256 192 8 ) ( 256 192 0 ) measure/floor [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 256 192 8 ) ( 256 192 0 ) ( 256 -192 8 ) measure/floor [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 -128 ) ( 256 -192 -128 ) ( -256 192 -128 ) measure/floor [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 0 ) ( -256 -192 8 ) ( 256 -192 0 ) measure/floor [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 0 ) ( -256 192 0 ) ( -256 -192 8 ) measure/floor [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +// brush 1 +{ +( 248 192 192 ) ( 248 -192 192 ) ( -264 192 192 ) measure/floor [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 256 192 264 ) ( -256 192 264 ) ( 256 192 256 ) measure/floor [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 256 192 264 ) ( 256 192 256 ) ( 256 -192 264 ) measure/floor [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 128 ) ( 256 -192 128 ) ( -256 192 128 ) measure/floor [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 256 ) ( -256 -192 264 ) ( 256 -192 256 ) measure/floor [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 256 ) ( -256 192 256 ) ( -256 -192 264 ) measure/floor [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +// brush 2 +{ +( 184 192 192 ) ( 184 -192 192 ) ( -328 192 192 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 192 192 264 ) ( -320 192 264 ) ( 192 192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 192 8 ) ( -256 192 0 ) ( -256 -192 8 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -768 -192 -128 ) ( -256 -192 -128 ) ( -768 192 -128 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( -320 -192 256 ) ( -320 -192 264 ) ( 192 -192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -320 -192 256 ) ( -320 192 256 ) ( -320 -192 264 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +// brush 3 +{ +( 760 192 192 ) ( 760 -192 192 ) ( 248 192 192 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 768 192 264 ) ( 256 192 264 ) ( 768 192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 320 192 8 ) ( 320 192 0 ) ( 320 -192 8 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -192 -192 -128 ) ( 320 -192 -128 ) ( -192 192 -128 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 256 -192 256 ) ( 256 -192 264 ) ( 768 -192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 256 -192 256 ) ( 256 192 256 ) ( 256 -192 264 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +// brush 4 +{ +( 184 -192 192 ) ( 184 -576 192 ) ( -328 -192 192 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 192 -192 264 ) ( -320 -192 264 ) ( 192 -192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 320 96 8 ) ( 320 96 0 ) ( 320 -288 8 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -768 -576 -128 ) ( -256 -576 -128 ) ( -768 -192 -128 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 272 -256 256 ) ( 272 -256 264 ) ( 784 -256 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -320 -576 256 ) ( -320 -192 256 ) ( -320 -576 264 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +// brush 5 +{ +( 184 256 192 ) ( 184 -128 192 ) ( -328 256 192 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 192 256 264 ) ( -320 256 264 ) ( 192 256 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 320 544 8 ) ( 320 544 0 ) ( 320 160 8 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -768 -128 -128 ) ( -256 -128 -128 ) ( -768 256 -128 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 272 192 256 ) ( 272 192 264 ) ( 784 192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -320 -128 256 ) ( -320 256 256 ) ( -320 -128 264 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +} +// entity 1 +{ +"classname" "info_player_start" +} +// entity 2 +{ +"classname" "info_player_deathmatch" +} +// entity 3 +{ +"classname" "light" +"origin" "0.000000 128.000000 112.000000" +"light" "150" +"color" "1 0 0" +} +// entity 4 +{ +"classname" "light" +"origin" "0.000000 -128.000000 104.000000" +"light" "150" +"color" "0 0 1" +} +// entity 5 +{ +"classname" "light" +"origin" "128.000000 0.000000 112.000000" +"light" "150" +"color" "0 1 0" +} +// entity 6 +{ +"classname" "light" +"origin" "8.000000 120.000000 -32.000000" +"light" "150" +"color" "1 0 0" +} +// entity 7 +{ +"classname" "light" +"origin" "8.000000 -136.000000 -40.000000" +"light" "150" +"color" "0 0 1" +} +// entity 8 +{ +"classname" "light" +"origin" "136.000000 -8.000000 -32.000000" +"light" "150" +"color" "0 1 0" +} diff --git a/base/test_maps.pk3dir/maps/test_detail.bsp b/base/test_maps.pk3dir/maps/test_detail.bsp new file mode 100644 index 00000000..255bd82b Binary files /dev/null and b/base/test_maps.pk3dir/maps/test_detail.bsp differ diff --git a/base/test_maps.pk3dir/maps/test_detail.map b/base/test_maps.pk3dir/maps/test_detail.map new file mode 100644 index 00000000..c842966c --- /dev/null +++ b/base/test_maps.pk3dir/maps/test_detail.map @@ -0,0 +1,219 @@ + +// entity 0 +{ +"classname" "worldspawn" +"skyname" "textures/skies/smudge/bg" +// brush 0 +{ +( 256 8 -64 ) ( 256 0 -64 ) ( -256 8 -64 ) next/asphalt1 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( 304 256 -64 ) ( -208 256 -64 ) ( 304 256 -104 ) next/asphalt1 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( 256 8 -64 ) ( 256 8 -104 ) ( 256 0 -64 ) next/asphalt1 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -256 0 -104 ) ( 256 0 -104 ) ( -256 8 -104 ) next/asphalt1 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( -232 -256 -104 ) ( -232 -256 -64 ) ( 280 -256 -104 ) next/asphalt1 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -256 0 -104 ) ( -256 8 -104 ) ( -256 0 -64 ) next/asphalt1 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +} +// brush 1 +{ +( 384 -256 64 ) ( 384 -320 64 ) ( -320 -256 64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( 424 -256 64 ) ( -280 -256 64 ) ( 424 -256 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( 320 -256 64 ) ( 320 -256 -64 ) ( 320 -320 64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -320 -320 -64 ) ( 384 -320 -64 ) ( -320 -256 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( -320 -320 -64 ) ( -320 -320 64 ) ( 384 -320 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -320 -320 -64 ) ( -320 -256 -64 ) ( -320 -320 64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +} +// brush 2 +{ +( 384 256 64 ) ( 384 192 64 ) ( -320 256 64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( 424 256 64 ) ( -280 256 64 ) ( 424 256 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -256 -192 64 ) ( -256 -192 -64 ) ( -256 -256 64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -320 192 -64 ) ( 384 192 -64 ) ( -320 256 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( -896 -256 -64 ) ( -896 -256 64 ) ( -192 -256 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -320 192 -64 ) ( -320 256 -64 ) ( -320 192 64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +} +// brush 3 +{ +( 960 256 64 ) ( 960 192 64 ) ( 256 256 64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( 1000 256 64 ) ( 296 256 64 ) ( 1000 256 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( 320 -192 64 ) ( 320 -192 -64 ) ( 320 -256 64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( 256 192 -64 ) ( 960 192 -64 ) ( 256 256 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( -320 -256 -64 ) ( -320 -256 64 ) ( 384 -256 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( 256 192 -64 ) ( 256 256 -64 ) ( 256 192 64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +} +// brush 4 +{ +( 384 320 64 ) ( 384 256 64 ) ( -320 320 64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( 384 320 64 ) ( -320 320 64 ) ( 384 320 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( 320 320 64 ) ( 320 320 -64 ) ( 320 256 64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -320 256 -64 ) ( 384 256 -64 ) ( -320 320 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( -280 256 -64 ) ( -280 256 64 ) ( 424 256 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -64 240 72 ) ( -64 384 -56 ) ( -64 384 72 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +} +// brush 5 +{ +( 384 320 64 ) ( 384 256 64 ) ( -320 320 64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( 384 320 64 ) ( -320 320 64 ) ( 384 320 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -320 256 -64 ) ( 384 256 -64 ) ( -320 320 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( -280 256 -64 ) ( -280 256 64 ) ( 424 256 -64 ) next/bunker3 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -320 256 -64 ) ( -320 320 -64 ) ( -320 256 64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -64 240 64 ) ( -64 384 -64 ) ( -64 240 -64 ) next/bunker3 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +} +// brush 6 +{ +( 384 -256 192 ) ( 384 -320 192 ) ( -320 -256 192 ) common/skyportal [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 1 1 0 0 0 +( 424 -256 192 ) ( -280 -256 192 ) ( 424 -256 64 ) common/skyportal [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +( 320 -256 192 ) ( 320 -256 64 ) ( 320 -320 192 ) common/skyportal [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +( -320 -320 64 ) ( 384 -320 64 ) ( -320 -256 64 ) common/skyportal [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 1 1 0 0 0 +( -320 -320 64 ) ( -320 -320 192 ) ( 384 -320 64 ) common/skyportal [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +( -320 -320 64 ) ( -320 -256 64 ) ( -320 -320 192 ) common/skyportal [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +} +// brush 7 +{ +( 384 256 192 ) ( 384 192 192 ) ( -320 256 192 ) common/skyportal [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 1 1 0 0 0 +( 424 256 192 ) ( -280 256 192 ) ( 424 256 64 ) common/skyportal [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +( -256 -192 192 ) ( -256 -192 64 ) ( -256 -256 192 ) common/skyportal [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +( -320 192 64 ) ( 384 192 64 ) ( -320 256 64 ) common/skyportal [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 1 1 0 0 0 +( -896 -256 64 ) ( -896 -256 192 ) ( -192 -256 64 ) common/skyportal [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +( -320 192 64 ) ( -320 256 64 ) ( -320 192 192 ) common/skyportal [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +} +// brush 8 +{ +( 960 256 192 ) ( 960 192 192 ) ( 256 256 192 ) common/skyportal [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 1 1 0 0 0 +( 1000 256 192 ) ( 296 256 192 ) ( 1000 256 64 ) common/skyportal [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +( 320 -192 192 ) ( 320 -192 64 ) ( 320 -256 192 ) common/skyportal [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +( 256 192 64 ) ( 960 192 64 ) ( 256 256 64 ) common/skyportal [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 1 1 0 0 0 +( -320 -256 64 ) ( -320 -256 192 ) ( 384 -256 64 ) common/skyportal [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +( 256 192 64 ) ( 256 256 64 ) ( 256 192 192 ) common/skyportal [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +} +// brush 9 +{ +( 384 320 192 ) ( 384 256 192 ) ( -320 320 192 ) common/skyportal [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 1 1 0 0 0 +( 424 320 192 ) ( -280 320 192 ) ( 424 320 64 ) common/skyportal [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +( 320 320 192 ) ( 320 320 64 ) ( 320 256 192 ) common/skyportal [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +( -320 256 64 ) ( 384 256 64 ) ( -320 320 64 ) common/skyportal [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 1 1 0 0 0 +( -320 256 64 ) ( -320 256 192 ) ( 384 256 64 ) common/skyportal [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +( -320 256 64 ) ( -320 320 64 ) ( -320 256 192 ) common/skyportal [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +} +// brush 10 +{ +( 256 8 232 ) ( 256 0 232 ) ( -256 8 232 ) common/skyportal [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 1 1 0 0 0 +( 304 256 232 ) ( -208 256 232 ) ( 304 256 192 ) common/skyportal [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +( 256 8 232 ) ( 256 8 192 ) ( 256 0 232 ) common/skyportal [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +( -256 0 192 ) ( 256 0 192 ) ( -256 8 192 ) common/skyportal [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 1 1 0 0 0 +( -232 -256 192 ) ( -232 -256 232 ) ( 280 -256 192 ) common/skyportal [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +( -256 0 192 ) ( -256 8 192 ) ( -256 0 232 ) common/skyportal [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 1 1 0 0 0 +} +} +// entity 1 +{ +"classname" "info_player_deathmatch" +"origin" "-128.000000 0.000000 0.000000" +} +// entity 2 +{ +"classname" "info_player_start" +"origin" "-128.000000 0.000000 0.000000" +} +// entity 3 +{ +"classname" "env_cubemap" +"origin" "0.000000 160.000000 0.000000" +} +// entity 4 +{ +"classname" "env_cubemap" +"origin" "0.000000 -160.000000 0.000000" +} +// entity 5 +{ +"classname" "env_cubemap" +"origin" "-160.000000 0.000000 0.000000" +} +// entity 6 +{ +"classname" "env_cubemap" +"origin" "160.000000 0.000000 0.000000" +} +// entity 7 +{ +"classname" "light_environment" +"origin" "0.000000 0.000000 176.000000" +"color255" "255 255 255" +"ambientcolor255" "64 64 255" +"intensity" "250" +"sunangle" "35" +"pitch" "-145.86" +"filterradius" "1" +"sunspreadangle" "3" +"samples" "16" +} + +// entity 7 +{ +"classname" "light_surface" +"origin" "0.000000 0.000000 176.000000" +"surfacename" "textures/test_me" +"light" "250" +"color255" "255 0 0" +"backsplash_fraction" "100" +"backsplash_distance" "10" +} + +// entity 8 +{ +"classname" "func_detail_illusionary" +// brush 0 +{ +( 72 64 64 ) ( 72 -64 64 ) ( -56 64 64 ) test_me [ 1 0 0 128 ] [ -0 -1 -0 128 ] -0 0.5 0.5 0 0 0 +( 64 64 8 ) ( -64 64 8 ) ( 64 64 0 ) test_me [ 1 0 0 128 ] [ -0 -0 -1 128 ] -0 -0.5 0.5 0 0 0 +( 64 64 8 ) ( 64 64 0 ) ( 64 -64 8 ) test_me [ 0 1 0 128 ] [ -0 -0 -1 128 ] -0 0.5 0.5 0 0 0 +( -48 -64 -64 ) ( 80 -64 -64 ) ( -48 64 -64 ) test_me [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( -64 -64 0 ) ( -64 -64 8 ) ( 64 -64 0 ) test_me [ 1 0 0 128 ] [ -0 -0 -1 128 ] -0 0.5 0.5 0 0 0 +( -64 -64 0 ) ( -64 64 0 ) ( -64 -64 8 ) test_me [ 0 1 0 128 ] [ -0 -0 -1 128 ] -0 -0.5 0.5 0 0 0 +} +} +// entity 9 +{ +"classname" "func_detail" +// brush 0 +{ +patchDef2 +{ +next/asphalt1 +( 9 3 0 0 0 ) +( +( ( -192 160 -64 0 0 ) ( -192 160 0 0 -5.25 ) ( -192 160 64 0 -10.5 ) ) +( ( -192 128 -64 1 0 ) ( -192 128 0 1 -5.25 ) ( -192 128 64 1 -10.5 ) ) +( ( -156 128 -64 2.125 0 ) ( -156 128 0 2.125 -5.25 ) ( -156 128 64 2.125 -10.5 ) ) +( ( -120 128 -64 3.25 0 ) ( -120 128 0 3.25 -5.25 ) ( -120 128 64 3.25 -10.5 ) ) +( ( -120 160 -64 4.25 0 ) ( -120 160 0 4.25 -5.25 ) ( -120 160 64 4.25 -10.5 ) ) +( ( -120 192 -64 5.25 0 ) ( -120 192 0 5.25 -5.25 ) ( -120 192 64 5.25 -10.5 ) ) +( ( -156 192 -64 6.375 0 ) ( -156 192 0 6.375 -5.25 ) ( -156 192 64 6.375 -10.5 ) ) +( ( -192 192 -64 7.5 0 ) ( -192 192 0 7.5 -5.25 ) ( -192 192 64 7.5 -10.5 ) ) +( ( -192 160 -64 8.5 0 ) ( -192 160 0 8.5 -5.25 ) ( -192 160 64 8.5 -10.5 ) ) +) +} +} +} +// entity 10 +{ +"classname" "func_detail_illusionary" +// brush 0 +{ +patchDef2 +{ +next/asphalt1 +( 9 3 0 0 0 ) +( +( ( 64 160 -64 0 0 ) ( 64 160 0 0 -5.25 ) ( 64 160 64 0 -10.5 ) ) +( ( 64 128 -64 1 0 ) ( 64 128 0 1 -5.25 ) ( 64 128 64 1 -10.5 ) ) +( ( 100 128 -64 2.125 0 ) ( 100 128 0 2.125 -5.25 ) ( 100 128 64 2.125 -10.5 ) ) +( ( 136 128 -64 3.25 0 ) ( 136 128 0 3.25 -5.25 ) ( 136 128 64 3.25 -10.5 ) ) +( ( 136 160 -64 4.25 0 ) ( 136 160 0 4.25 -5.25 ) ( 136 160 64 4.25 -10.5 ) ) +( ( 136 192 -64 5.25 0 ) ( 136 192 0 5.25 -5.25 ) ( 136 192 64 5.25 -10.5 ) ) +( ( 100 192 -64 6.375 0 ) ( 100 192 0 6.375 -5.25 ) ( 100 192 64 6.375 -10.5 ) ) +( ( 64 192 -64 7.5 0 ) ( 64 192 0 7.5 -5.25 ) ( 64 192 64 7.5 -10.5 ) ) +( ( 64 160 -64 8.5 0 ) ( 64 160 0 8.5 -5.25 ) ( 64 160 64 8.5 -10.5 ) ) +) +} +} +} diff --git a/base/test_maps.pk3dir/maps/test_dlights.bsp b/base/test_maps.pk3dir/maps/test_dlights.bsp index b9972e3e..ffb7e2b6 100644 Binary files a/base/test_maps.pk3dir/maps/test_dlights.bsp and b/base/test_maps.pk3dir/maps/test_dlights.bsp differ diff --git a/base/test_maps.pk3dir/maps/test_dlights.map b/base/test_maps.pk3dir/maps/test_dlights.map index 04b69059..d3664269 100644 --- a/base/test_maps.pk3dir/maps/test_dlights.map +++ b/base/test_maps.pk3dir/maps/test_dlights.map @@ -209,7 +209,7 @@ } // entity 6 { -"classname" "dynamic_light" +"classname" "light_dynamic" "origin" "-192.000000 128.000000 64.000000" "_light" "255 255 255" "brightness" "250" @@ -222,7 +222,7 @@ } // entity 8 { -"classname" "dynamic_light" +"classname" "light_dynamic" "origin" "-192.000000 -64.000000 64.000000" "pattern" "zm" "_light" "255 255 128" @@ -236,7 +236,7 @@ } // entity 10 { -"classname" "dynamic_light" +"classname" "light_dynamic" "origin" "192.000000 128.000000 64.000000" "targetname" "foobar1" "style" "1" @@ -251,7 +251,7 @@ } // entity 12 { -"classname" "dynamic_light" +"classname" "light_dynamic" "origin" "192.000000 -128.000000 64.000000" "targetname" "foobar2" "style" "2" diff --git a/base/test_maps.pk3dir/maps/test_dustcloud.bsp b/base/test_maps.pk3dir/maps/test_dustcloud.bsp new file mode 100644 index 00000000..d6e3cdd5 Binary files /dev/null and b/base/test_maps.pk3dir/maps/test_dustcloud.bsp differ diff --git a/base/test_maps.pk3dir/maps/test_dustcloud.map b/base/test_maps.pk3dir/maps/test_dustcloud.map new file mode 100644 index 00000000..5d1e5243 --- /dev/null +++ b/base/test_maps.pk3dir/maps/test_dustcloud.map @@ -0,0 +1,166 @@ + +// entity 0 +{ +"classname" "worldspawn" +// brush 0 +{ +( 248 192 -64 ) ( 248 -192 -64 ) ( -264 192 -64 ) measure/floor [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 256 192 8 ) ( -256 192 8 ) ( 256 192 0 ) measure/floor [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 256 192 8 ) ( 256 192 0 ) ( 256 -192 8 ) measure/floor [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 -128 ) ( 256 -192 -128 ) ( -256 192 -128 ) measure/floor [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 0 ) ( -256 -192 8 ) ( 256 -192 0 ) measure/floor [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 0 ) ( -256 192 0 ) ( -256 -192 8 ) measure/floor [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +// brush 1 +{ +( 248 192 192 ) ( 248 -192 192 ) ( -264 192 192 ) measure/floor [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 256 192 264 ) ( -256 192 264 ) ( 256 192 256 ) measure/floor [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 256 192 264 ) ( 256 192 256 ) ( 256 -192 264 ) measure/floor [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 128 ) ( 256 -192 128 ) ( -256 192 128 ) measure/floor [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 256 ) ( -256 -192 264 ) ( 256 -192 256 ) measure/floor [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 256 ) ( -256 192 256 ) ( -256 -192 264 ) measure/floor [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +// brush 2 +{ +( 184 192 192 ) ( 184 -192 192 ) ( -328 192 192 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 192 192 264 ) ( -320 192 264 ) ( 192 192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 192 8 ) ( -256 192 0 ) ( -256 -192 8 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -768 -192 -128 ) ( -256 -192 -128 ) ( -768 192 -128 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( -320 -192 256 ) ( -320 -192 264 ) ( 192 -192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -320 -192 256 ) ( -320 192 256 ) ( -320 -192 264 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +// brush 3 +{ +( 760 192 192 ) ( 760 -192 192 ) ( 248 192 192 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 768 192 264 ) ( 256 192 264 ) ( 768 192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 320 192 8 ) ( 320 192 0 ) ( 320 -192 8 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -192 -192 -128 ) ( 320 -192 -128 ) ( -192 192 -128 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 256 -192 256 ) ( 256 -192 264 ) ( 768 -192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 256 -192 256 ) ( 256 192 256 ) ( 256 -192 264 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +// brush 4 +{ +( 184 -192 192 ) ( 184 -576 192 ) ( -328 -192 192 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 192 -192 264 ) ( -320 -192 264 ) ( 192 -192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 320 96 8 ) ( 320 96 0 ) ( 320 -288 8 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -768 -576 -128 ) ( -256 -576 -128 ) ( -768 -192 -128 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 272 -256 256 ) ( 272 -256 264 ) ( 784 -256 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -320 -576 256 ) ( -320 -192 256 ) ( -320 -576 264 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +// brush 5 +{ +( 184 256 192 ) ( 184 -128 192 ) ( -328 256 192 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 192 256 264 ) ( -320 256 264 ) ( 192 256 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 320 544 8 ) ( 320 544 0 ) ( 320 160 8 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -768 -128 -128 ) ( -256 -128 -128 ) ( -768 256 -128 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 272 192 256 ) ( 272 192 264 ) ( 784 192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -320 -128 256 ) ( -320 256 256 ) ( -320 -128 264 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +} +// entity 1 +{ +"classname" "info_player_start" +} +// entity 2 +{ +"classname" "info_player_deathmatch" +} +// entity 3 +{ +"classname" "light" +"origin" "0.000000 128.000000 112.000000" +"light" "150" +"color" "1 0 0" +} +// entity 4 +{ +"classname" "light" +"origin" "0.000000 -128.000000 104.000000" +"light" "150" +"color" "0 0 1" +} +// entity 5 +{ +"classname" "light" +"origin" "128.000000 0.000000 112.000000" +"light" "150" +"color" "0 1 0" +} +// entity 6 +{ +"classname" "light" +"origin" "8.000000 120.000000 -32.000000" +"light" "150" +"color" "1 0 0" +} +// entity 7 +{ +"classname" "light" +"origin" "8.000000 -136.000000 -40.000000" +"light" "150" +"color" "0 0 1" +} +// entity 8 +{ +"classname" "light" +"origin" "136.000000 -8.000000 -32.000000" +"light" "150" +"color" "0 1 0" +} +// entity 9 +{ +"classname" "func_dustcloud" +"SizeMin" "100" +"SizeMax" "200" +"LifetimeMin" "3" +"LifetimeMax" "5" +"SpawnRate" "40" +"Color" "255 255 255" +"Alpha" "30" +"SpeedMax" "13" +"DistMax" "1024" +// brush 0 +{ +( 256 192 128 ) ( 256 -192 128 ) ( -8 192 128 ) common/trigger [ 1 0 0 -0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 256 192 72 ) ( -8 192 72 ) ( 256 192 -56 ) common/trigger [ 1 0 0 -0 ] [ -0 -0 -1 16 ] -0 0.5 0.5 0 0 0 +( 256 192 72 ) ( 256 192 -56 ) ( 256 -192 72 ) common/trigger [ 0 1 0 0 ] [ -0 -0 -1 16 ] -0 0.5 0.5 0 0 0 +( -8 -192 -64 ) ( 256 -192 -64 ) ( -8 192 -64 ) common/trigger [ 1 0 0 -0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( -8 -192 -56 ) ( -8 -192 72 ) ( 256 -192 -56 ) common/trigger [ 1 0 0 -0 ] [ -0 -0 -1 16 ] -0 0.5 0.5 0 0 0 +( -8 -192 -56 ) ( -8 192 -56 ) ( -8 -192 72 ) common/trigger [ 0 1 0 0 ] [ -0 -0 -1 16 ] -0 0.5 0.5 0 0 0 +} +} +// entity 10 +{ +"classname" "func_smokevolume" +"ParticleDrawWidth" "24" +"Color1" "0 0 0" +"Color2" "128 128 128" +"MaxDrawDistance" "1024" +// brush 0 +{ +( 8 192 128 ) ( 8 -192 128 ) ( -256 192 128 ) common/trigger [ 1 0 0 48 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 8 192 72 ) ( -256 192 72 ) ( 8 192 -56 ) common/trigger [ 1 0 0 48 ] [ -0 -0 -1 16 ] -0 0.5 0.5 0 0 0 +( -128 192 72 ) ( -128 192 -56 ) ( -128 -192 72 ) common/trigger [ 0 1 0 0 ] [ -0 -0 -1 16 ] -0 0.5 0.5 0 0 0 +( -248 -192 64 ) ( 16 -192 64 ) ( -248 192 64 ) common/trigger [ 1 0 0 32 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 -56 ) ( -256 -192 72 ) ( 8 -192 -56 ) common/trigger [ 1 0 0 48 ] [ -0 -0 -1 16 ] -0 0.5 0.5 0 0 0 +( -256 -192 -56 ) ( -256 192 -56 ) ( -256 -192 72 ) common/trigger [ 0 1 0 0 ] [ -0 -0 -1 16 ] -0 0.5 0.5 0 0 0 +} +} +// entity 11 +{ +"classname" "func_smokevolume" +"ParticleDrawWidth" "24" +"Color1" "0 0 0" +"Color2" "128 128 128" +"spawnflags" "1" +"MaxDrawDistance" "1024" +// brush 0 +{ +( 16 192 0 ) ( 16 -192 0 ) ( -248 192 0 ) common/trigger [ 1 0 0 32 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 16 192 -56 ) ( -248 192 -56 ) ( 16 192 -184 ) common/trigger [ 1 0 0 32 ] [ -0 -0 -1 16 ] -0 0.5 0.5 0 0 0 +( -120 192 -56 ) ( -120 192 -184 ) ( -120 -192 -56 ) common/trigger [ 0 1 0 0 ] [ -0 -0 -1 16 ] -0 0.5 0.5 0 0 0 +( -240 -192 -64 ) ( 24 -192 -64 ) ( -240 192 -64 ) common/trigger [ 1 0 0 16 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( -248 -192 -184 ) ( -248 -192 -56 ) ( 16 -192 -184 ) common/trigger [ 1 0 0 32 ] [ -0 -0 -1 16 ] -0 0.5 0.5 0 0 0 +( -248 -192 -184 ) ( -248 192 -184 ) ( -248 -192 -56 ) common/trigger [ 0 1 0 0 ] [ -0 -0 -1 16 ] -0 0.5 0.5 0 0 0 +} +} diff --git a/base/test_maps.pk3dir/maps/test_light255.bsp b/base/test_maps.pk3dir/maps/test_light255.bsp new file mode 100644 index 00000000..a51f8930 Binary files /dev/null and b/base/test_maps.pk3dir/maps/test_light255.bsp differ diff --git a/base/test_maps.pk3dir/maps/test_light255.map b/base/test_maps.pk3dir/maps/test_light255.map new file mode 100644 index 00000000..488c3912 --- /dev/null +++ b/base/test_maps.pk3dir/maps/test_light255.map @@ -0,0 +1,97 @@ + +// entity 0 +{ +"classname" "worldspawn" +// brush 0 +{ +( 248 192 -64 ) ( 248 -192 -64 ) ( -264 192 -64 ) measure/floor [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 256 192 8 ) ( -256 192 8 ) ( 256 192 0 ) measure/floor [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 256 192 8 ) ( 256 192 0 ) ( 256 -192 8 ) measure/floor [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 -128 ) ( 256 -192 -128 ) ( -256 192 -128 ) measure/floor [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 0 ) ( -256 -192 8 ) ( 256 -192 0 ) measure/floor [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 0 ) ( -256 192 0 ) ( -256 -192 8 ) measure/floor [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +// brush 1 +{ +( 248 192 192 ) ( 248 -192 192 ) ( -264 192 192 ) measure/floor [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 256 192 264 ) ( -256 192 264 ) ( 256 192 256 ) measure/floor [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 256 192 264 ) ( 256 192 256 ) ( 256 -192 264 ) measure/floor [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 128 ) ( 256 -192 128 ) ( -256 192 128 ) measure/floor [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 256 ) ( -256 -192 264 ) ( 256 -192 256 ) measure/floor [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 256 ) ( -256 192 256 ) ( -256 -192 264 ) measure/floor [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +// brush 2 +{ +( 184 192 192 ) ( 184 -192 192 ) ( -328 192 192 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 192 192 264 ) ( -320 192 264 ) ( 192 192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 192 8 ) ( -256 192 0 ) ( -256 -192 8 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -768 -192 -128 ) ( -256 -192 -128 ) ( -768 192 -128 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( -320 -192 256 ) ( -320 -192 264 ) ( 192 -192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -320 -192 256 ) ( -320 192 256 ) ( -320 -192 264 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +// brush 3 +{ +( 760 192 192 ) ( 760 -192 192 ) ( 248 192 192 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 768 192 264 ) ( 256 192 264 ) ( 768 192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 320 192 8 ) ( 320 192 0 ) ( 320 -192 8 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -192 -192 -128 ) ( 320 -192 -128 ) ( -192 192 -128 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 256 -192 256 ) ( 256 -192 264 ) ( 768 -192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 256 -192 256 ) ( 256 192 256 ) ( 256 -192 264 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +// brush 4 +{ +( 184 -192 192 ) ( 184 -576 192 ) ( -328 -192 192 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 192 -192 264 ) ( -320 -192 264 ) ( 192 -192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 320 96 8 ) ( 320 96 0 ) ( 320 -288 8 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -768 -576 -128 ) ( -256 -576 -128 ) ( -768 -192 -128 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 272 -256 256 ) ( 272 -256 264 ) ( 784 -256 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -320 -576 256 ) ( -320 -192 256 ) ( -320 -576 264 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +// brush 5 +{ +( 184 256 192 ) ( 184 -128 192 ) ( -328 256 192 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 192 256 264 ) ( -320 256 264 ) ( 192 256 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 320 544 8 ) ( 320 544 0 ) ( 320 160 8 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -768 -128 -128 ) ( -256 -128 -128 ) ( -768 256 -128 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 272 192 256 ) ( 272 192 264 ) ( 784 192 256 ) measure/wall128gr [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -320 -128 256 ) ( -320 256 256 ) ( -320 -128 264 ) measure/wall128gr [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +} +// entity 1 +{ +"classname" "info_player_start" +} +// entity 2 +{ +"classname" "info_player_deathmatch" +} +// entity 3 +{ +"classname" "light" +"origin" "128.000000 128.000000 112.000000" +"light" "100" +"_color" "1 1 1" +"target" "info_null2" +"radius" "300" +} +// entity 4 +{ +"classname" "light" +"origin" "128.000000 -128.000000 112.000000" +"light" "100" +"_color255" "255 255 255" +"target" "info_null1" +"radius" "300" +} +// entity 5 +{ +"classname" "info_null" +"origin" "128.000000 128.000000 -56.000000" +"targetname" "info_null2" +} +// entity 6 +{ +"classname" "info_null" +"origin" "128.000000 -128.000000 -56.000000" +"targetname" "info_null1" +} diff --git a/base/test_maps.pk3dir/maps/test_staticprops.bsp b/base/test_maps.pk3dir/maps/test_staticprops.bsp new file mode 100644 index 00000000..175a6304 Binary files /dev/null and b/base/test_maps.pk3dir/maps/test_staticprops.bsp differ diff --git a/base/test_maps.pk3dir/maps/test_staticprops.map b/base/test_maps.pk3dir/maps/test_staticprops.map new file mode 100644 index 00000000..89d00374 --- /dev/null +++ b/base/test_maps.pk3dir/maps/test_staticprops.map @@ -0,0 +1,94 @@ + +// entity 0 +{ +"classname" "worldspawn" +// brush 0 +{ +( 248 192 -64 ) ( 248 -192 -64 ) ( -264 192 -64 ) next/cracked1 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( 256 192 8 ) ( -256 192 8 ) ( 256 192 0 ) next/cracked1 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( 256 192 8 ) ( 256 192 0 ) ( 256 -192 8 ) next/cracked1 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -256 -192 -128 ) ( 256 -192 -128 ) ( -256 192 -128 ) next/cracked1 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( -256 -192 0 ) ( -256 -192 8 ) ( 256 -192 0 ) next/cracked1 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -256 -192 0 ) ( -256 192 0 ) ( -256 -192 8 ) next/cracked1 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +} +// brush 1 +{ +( 248 192 192 ) ( 248 -192 192 ) ( -264 192 192 ) skies/yukongold [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( 256 192 264 ) ( -256 192 264 ) ( 256 192 256 ) skies/yukongold [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( 256 192 264 ) ( 256 192 256 ) ( 256 -192 264 ) skies/yukongold [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 128 ) ( 256 -192 128 ) ( -256 192 128 ) skies/yukongold [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 256 ) ( -256 -192 264 ) ( 256 -192 256 ) skies/yukongold [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +( -256 -192 256 ) ( -256 192 256 ) ( -256 -192 264 ) skies/yukongold [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.5 0.5 0 0 0 +} +// brush 2 +{ +( 184 192 192 ) ( 184 -192 192 ) ( -328 192 192 ) next/bunker2 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( 192 192 264 ) ( -320 192 264 ) ( 192 192 256 ) next/bunker2 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -256 192 8 ) ( -256 192 0 ) ( -256 -192 8 ) next/bunker2 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -768 -192 -128 ) ( -256 -192 -128 ) ( -768 192 -128 ) next/bunker2 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( -320 -192 256 ) ( -320 -192 264 ) ( 192 -192 256 ) next/bunker2 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -320 -192 256 ) ( -320 192 256 ) ( -320 -192 264 ) next/bunker2 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +} +// brush 3 +{ +( 760 192 192 ) ( 760 -192 192 ) ( 248 192 192 ) next/bunker2 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( 768 192 264 ) ( 256 192 264 ) ( 768 192 256 ) next/bunker2 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( 320 192 8 ) ( 320 192 0 ) ( 320 -192 8 ) next/bunker2 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -192 -192 -128 ) ( 320 -192 -128 ) ( -192 192 -128 ) next/bunker2 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( 256 -192 256 ) ( 256 -192 264 ) ( 768 -192 256 ) next/bunker2 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( 256 -192 256 ) ( 256 192 256 ) ( 256 -192 264 ) next/bunker2 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +} +// brush 4 +{ +( 184 -192 192 ) ( 184 -576 192 ) ( -328 -192 192 ) next/bunker2 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( 192 -192 264 ) ( -320 -192 264 ) ( 192 -192 256 ) next/bunker2 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( 320 96 8 ) ( 320 96 0 ) ( 320 -288 8 ) next/bunker2 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -768 -576 -128 ) ( -256 -576 -128 ) ( -768 -192 -128 ) next/bunker2 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( 272 -256 256 ) ( 272 -256 264 ) ( 784 -256 256 ) next/bunker2 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -320 -576 256 ) ( -320 -192 256 ) ( -320 -576 264 ) next/bunker2 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +} +// brush 5 +{ +( 184 256 192 ) ( 184 -128 192 ) ( -328 256 192 ) next/bunker2 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( 192 256 264 ) ( -320 256 264 ) ( 192 256 256 ) next/bunker2 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( 320 544 8 ) ( 320 544 0 ) ( 320 160 8 ) next/bunker2 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -768 -128 -128 ) ( -256 -128 -128 ) ( -768 256 -128 ) next/bunker2 [ 1 0 0 0 ] [ -0 -1 -0 0 ] -0 0.25 0.25 0 0 0 +( 272 192 256 ) ( 272 192 264 ) ( 784 192 256 ) next/bunker2 [ 1 0 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +( -320 -128 256 ) ( -320 256 256 ) ( -320 -128 264 ) next/bunker2 [ 0 1 0 0 ] [ -0 -0 -1 0 ] -0 0.25 0.25 0 0 0 +} +} +// entity 1 +{ +"classname" "info_player_start" +"origin" "-128.000000 0.000000 0.000000" +} +// entity 2 +{ +"classname" "info_player_deathmatch" +"origin" "-128.000000 0.000000 0.000000" +} +// entity 3 +{ +"classname" "light" +"origin" "128.000000 0.000000 64.000000" +"light" "100" +} +// entity 4 +{ +"classname" "light" +"origin" "-128.000000 0.000000 64.000000" +"light" "100" +} +// entity 5 +{ +"classname" "prop_static" +"origin" "64.000000 64.000000 0.000000" +"model" "models/logos/visions.vvm" +} +// entity 6 +{ +"classname" "prop_static" +"origin" "64.000000 -64.000000 0.000000" +"model" "models/logos/visions.vvm" +"generatelightmaps" "1" +} diff --git a/build.cfg b/build.cfg index a8f50bba..280d4cf3 100644 --- a/build.cfg +++ b/build.cfg @@ -32,7 +32,7 @@ BUILD_IQMTOOL=1 BUILD_IMGTOOL=1 # Specify which engine revision to build, these are considered 'stable'; 0 = latest -BUILD_ENGINEREVISION=6278 +BUILD_ENGINEREVISION=6282 # Whether or not to run 'git pull' or 'svn up' before building a component BUILD_UPDATE=1 diff --git a/build_engine.sh b/build_engine.sh index 493053e8..a8b08344 100755 --- a/build_engine.sh +++ b/build_engine.sh @@ -142,11 +142,11 @@ fi if [ "$BUILD_ENGINE_DEPENDENCIES" -eq 1 ] then - $MAKE -j $BUILD_PROC CC=$ENGINE_CC CXX=$ENGINE_CXX makelibs FTE_TARGET=$PLATFORM + $MAKE -j $BUILD_PROC CC=$ENGINE_CC CXX=$ENGINE_CXX makelibs FTE_TARGET=$PLATFORM printf "Built the static dependencies successfully.\n\n" fi -$MAKE -j $BUILD_PROC CC=$ENGINE_CC CXX=$ENGINE_CXX $MAKETARGET CFLAGS=-DMULTITHREAD FTE_TARGET=$PLATFORM +$MAKE -j $BUILD_PROC CC=$ENGINE_CC CXX=$ENGINE_CXX $MAKETARGET CFLAGS=-DMULTITHREAD FTE_TARGET=$PLATFORM cp -v "$OUTPUT" ../../../bin/fteqw printf "Built the client engine successfully.\n\n" diff --git a/platform/base_sound.pk3dir/sound/damage_bullet.sndshd b/platform/base_sound.pk3dir/sound/damage_bullet.sndshd deleted file mode 100644 index f8053f56..00000000 --- a/platform/base_sound.pk3dir/sound/damage_bullet.sndshd +++ /dev/null @@ -1,4 +0,0 @@ -damage_bullet.hit -{ - sample misc/missing.wav -} diff --git a/platform/base_sound.pk3dir/sound/env_spark.sndshd b/platform/base_sound.pk3dir/sound/env_spark.sndshd deleted file mode 100644 index 9723fda2..00000000 --- a/platform/base_sound.pk3dir/sound/env_spark.sndshd +++ /dev/null @@ -1,4 +0,0 @@ -env_spark.sfx -{ - sample misc/missing.wav -} diff --git a/platform/base_sound.pk3dir/sound/footsteps.sndshd b/platform/base_sound.pk3dir/sound/footsteps.sndshd deleted file mode 100644 index 164844cd..00000000 --- a/platform/base_sound.pk3dir/sound/footsteps.sndshd +++ /dev/null @@ -1,239 +0,0 @@ -step_default.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_default.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_alien.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_alien.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_computer.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_computer.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_concrete.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_concrete.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_dirt.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_dirt.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_flesh.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_flesh.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_foliage.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_foliage.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_glass.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_glass.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_grate.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_grate.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_metal.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_metal.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_slosh.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_slosh.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_sand.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_sand.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_snow.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_snow.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_tile.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_tile.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_vent.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_vent.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_wood.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_wood.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_ladder.left -{ - attenuation static - footstep - sample misc/null.wav -} -step_ladder.right -{ - attenuation static - footstep - sample misc/null.wav -} - -step_wade.left -{ - sample misc/null.wav -} -step_wade.right -{ - sample misc/null.wav -} - -step_swim.left -{ - sample misc/null.wav -} -step_swim.right -{ - sample misc/null.wav -} - diff --git a/platform/base_sound.pk3dir/sound/func_breakable.sndshd b/platform/base_sound.pk3dir/sound/func_breakable.sndshd deleted file mode 100644 index 9b92bfb1..00000000 --- a/platform/base_sound.pk3dir/sound/func_breakable.sndshd +++ /dev/null @@ -1,44 +0,0 @@ -func_breakable.impact_glassunbreakable -{ - sample misc/missing.wav -} - -func_breakable.impact_computer -{ - sample misc/missing.wav -} - -func_breakable.impact_glass -{ - sample misc/missing.wav -} - -func_breakable.impact_wood -{ - sample misc/missing.wav -} - -func_breakable.impact_metal -{ - sample misc/missing.wav -} - -func_breakable.impact_flesh -{ - sample misc/missing.wav -} - -func_breakable.impact_cinder -{ - sample misc/missing.wav -} - -func_breakable.impact_concrete -{ - sample misc/missing.wav -} - -func_breakable.impact_rock -{ - sample misc/missing.wav -} diff --git a/platform/base_sound.pk3dir/sound/func_button.sndshd b/platform/base_sound.pk3dir/sound/func_button.sndshd deleted file mode 100644 index aba7fb0f..00000000 --- a/platform/base_sound.pk3dir/sound/func_button.sndshd +++ /dev/null @@ -1,101 +0,0 @@ -func_button.qsfx_1 -{ - sample buttons/airbut1.wav -} -func_button.qsfx_2 -{ - sample buttons/switch21.wav -} -func_button.qsfx_3 -{ - sample buttons/switch02.wav -} -func_button.qsfx_4 -{ - sample buttons/switch04.wav -} - -func_button.hlsfx_1 -{ - sample common/null.wav -} -func_button.hlsfx_2 -{ - sample buttons/button1.wav -} -func_button.hlsfx_3 -{ - sample buttons/button2.wav -} -func_button.hlsfx_4 -{ - sample buttons/button3.wav -} -func_button.hlsfx_5 -{ - sample buttons/button4.wav -} -func_button.hlsfx_6 -{ - sample buttons/button5.wav -} -func_button.hlsfx_7 -{ - sample buttons/button6.wav -} -func_button.hlsfx_8 -{ - sample buttons/button7.wav -} -func_button.hlsfx_9 -{ - sample buttons/button8.wav -} -func_button.hlsfx_10 -{ - sample buttons/button9.wav -} -func_button.hlsfx_11 -{ - sample buttons/button10.wav -} -func_button.hlsfx_12 -{ - sample buttons/button11.wav -} -func_button.hlsfx_13 -{ - sample buttons/latchlocked1.wav -} -func_button.hlsfx_14 -{ - sample buttons/latchunlocked1.wav -} -func_button.hlsfx_15 -{ - sample buttons/lightswitch2.wav -} -func_button.hlsfx_16 -{ - sample buttons/lever1.wav -} -func_button.hlsfx_17 -{ - sample buttons/lever2.wav -} -func_button.hlsfx_18 -{ - sample buttons/lever3.wav -} -func_button.hlsfx_19 -{ - sample buttons/lever4.wav -} -func_button.hlsfx_20 -{ - sample buttons/lever5.wav -} -func_button.hlsfx_21 -{ - sample buttons/button9.wav -} diff --git a/platform/base_sound.pk3dir/sound/func_door.sndshd b/platform/base_sound.pk3dir/sound/func_door.sndshd deleted file mode 100644 index 103b1761..00000000 --- a/platform/base_sound.pk3dir/sound/func_door.sndshd +++ /dev/null @@ -1,9 +0,0 @@ -func_door.move_0 -{ - sample misc/missing.wav -} - -func_door.stop_0 -{ - sample misc/missing.wav -} diff --git a/platform/base_sound.pk3dir/sound/func_door_rotating.sndshd b/platform/base_sound.pk3dir/sound/func_door_rotating.sndshd deleted file mode 100644 index 74f5643e..00000000 --- a/platform/base_sound.pk3dir/sound/func_door_rotating.sndshd +++ /dev/null @@ -1,9 +0,0 @@ -func_door_rotating.move_0 -{ - sample misc/missing.wav -} - -func_door_rotating.stop_0 -{ - sample misc/missing.wav -} diff --git a/platform/base_sound.pk3dir/sound/func_train.sndshd b/platform/base_sound.pk3dir/sound/func_train.sndshd deleted file mode 100644 index 7a7d8975..00000000 --- a/platform/base_sound.pk3dir/sound/func_train.sndshd +++ /dev/null @@ -1,9 +0,0 @@ -func_train.move_1 -{ - sample misc/missing.wav -} - -func_train.stop_1 -{ - sample misc/missing.wav -} diff --git a/platform/base_sound.pk3dir/sound/impacts.sndshd b/platform/base_sound.pk3dir/sound/impacts.sndshd deleted file mode 100644 index 351c83a1..00000000 --- a/platform/base_sound.pk3dir/sound/impacts.sndshd +++ /dev/null @@ -1,79 +0,0 @@ -sfx_impact.default -{ - sample misc/missing.wav -} - -sfx_impact.alien -{ - sample misc/missing.wav -} - -sfx_impact.flesh -{ - sample misc/missing.wav -} - -sfx_impact.foliage -{ - sample misc/missing.wav -} - -sfx_impact.computer -{ - sample misc/missing.wav -} - -sfx_impact.dirt -{ - sample misc/missing.wav -} - -sfx_impact.vent -{ - sample misc/missing.wav -} - -sfx_impact.grate -{ - sample misc/missing.wav -} - -sfx_impact.metal -{ - sample misc/missing.wav -} - -sfx_impact.glass -{ - sample misc/missing.wav -} - -sfx_impact.sand -{ - sample misc/missing.wav -} - -sfx_impact.slosh -{ - sample misc/missing.wav -} - -sfx_impact.snow -{ - sample misc/missing.wav -} - -sfx_impact.tile -{ - sample misc/missing.wav -} - -sfx_impact.wood -{ - sample misc/missing.wav -} - -sfx_impact.concrete -{ - sample misc/missing.wav -} diff --git a/platform/base_sound.pk3dir/sound/modelevent_shell.sndshd b/platform/base_sound.pk3dir/sound/modelevent_shell.sndshd deleted file mode 100644 index 2737f7ca..00000000 --- a/platform/base_sound.pk3dir/sound/modelevent_shell.sndshd +++ /dev/null @@ -1,9 +0,0 @@ -modelevent_shell.eject -{ - sample misc/missing.wav -} - -modelevent_shell.land -{ - sample misc/missing.wav -} diff --git a/platform/base_sound.pk3dir/sound/player.sndshd b/platform/base_sound.pk3dir/sound/player.sndshd deleted file mode 100644 index c20751ca..00000000 --- a/platform/base_sound.pk3dir/sound/player.sndshd +++ /dev/null @@ -1,28 +0,0 @@ -player.fall -{ - sample misc/missing.wav -} -player.lightfall -{ - sample misc/missing.wav -} -player.die -{ - sample misc/missing.wav -} -player.gasplight -{ - sample misc/missing.wav -} -player.gaspheavy -{ - sample misc/missing.wav -} -player.waterexit -{ - sample misc/missing.wav -} -player.waterenter -{ - sample misc/missing.wav -} diff --git a/platform/base_sound.pk3dir/sound/sentences.txt b/platform/base_sound.pk3dir/sound/sentences.txt new file mode 100644 index 00000000..c49c586f --- /dev/null +++ b/platform/base_sound.pk3dir/sound/sentences.txt @@ -0,0 +1,3 @@ +// https://developer.vera-visions.com/wiki/Sentences + +TEST (p120) misc/missing (p80) missing (p50) missing diff --git a/platform/base_textures.pk3dir/gfx/background.mat b/platform/base_textures.pk3dir/gfx/background.mat new file mode 100644 index 00000000..38f3d6c9 --- /dev/null +++ b/platform/base_textures.pk3dir/gfx/background.mat @@ -0,0 +1,22 @@ +// Vera Visions Material +{ + { + map "textures/dev/model_bone.tga" + tcMod scroll -1 2 + tcMod scale 0.1 0.1 + } + { + map "textures/dev/info_node.tga" + tcMod scroll -2 4 + tcMod scale 0.05 0.05 + blendFunc blend + } + + { + map "logos/fte.tga" + tcMod turb triangle 0.25 1.0 0.15 + tcMod scale 8 8 + blendFunc blend + alphaGen const 0.25 + } +} diff --git a/platform/base_textures.pk3dir/gfx/palette.lmp b/platform/base_textures.pk3dir/gfx/palette.lmp new file mode 100644 index 00000000..08f81a71 Binary files /dev/null and b/platform/base_textures.pk3dir/gfx/palette.lmp differ diff --git a/src/botlib/bot.h b/src/botlib/bot.h index 096353ae..7d42e969 100644 --- a/src/botlib/bot.h +++ b/src/botlib/bot.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #define COST_INFINITE 99999 #define BOTROUTE_DESTINATION -1 diff --git a/src/botlib/bot.qc b/src/botlib/bot.qc index 39f66cce..cc6d6b8c 100644 --- a/src/botlib/bot.qc +++ b/src/botlib/bot.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void SV_SendChat(entity sender, string msg, entity eEnt, float fType); diff --git a/src/botlib/bot_chat.qc b/src/botlib/bot_chat.qc index 9364d751..93a8c494 100644 --- a/src/botlib/bot_chat.qc +++ b/src/botlib/bot_chat.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void bot::ChatSay(string msg) diff --git a/src/botlib/bot_combat.qc b/src/botlib/bot_combat.qc index 95817274..085b225f 100644 --- a/src/botlib/bot_combat.qc +++ b/src/botlib/bot_combat.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void bot::Pain(void) diff --git a/src/botlib/botinfo.h b/src/botlib/botinfo.h index a555beb3..37f684fd 100644 --- a/src/botlib/botinfo.h +++ b/src/botlib/botinfo.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* we need to keep this an enum so find() does its work faster */ enum diff --git a/src/botlib/cmd.qc b/src/botlib/cmd.qc index 22e0516a..e8b9240e 100644 --- a/src/botlib/cmd.qc +++ b/src/botlib/cmd.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Bot_PickName(entity target) diff --git a/src/botlib/cvar.h b/src/botlib/cvar.h index 641f4a87..9b82310a 100644 --- a/src/botlib/cvar.h +++ b/src/botlib/cvar.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var int autocvar_bot_pacifist = FALSE; var int autocvar_bot_wait = FALSE; diff --git a/src/botlib/defs.h b/src/botlib/defs.h index c7443b1c..4236081c 100644 --- a/src/botlib/defs.h +++ b/src/botlib/defs.h @@ -1,22 +1,22 @@ -/* - * 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 - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER - * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include "bot.h" -#include "botinfo.h" -#include "cvar.h" - - +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + +#include "bot.h" +#include "botinfo.h" +#include "cvar.h" + + vector Route_SelectDestination( bot target ); diff --git a/src/botlib/route.qc b/src/botlib/route.qc index 829d436c..d19ae931 100644 --- a/src/botlib/route.qc +++ b/src/botlib/route.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* * Begin calculating a route. diff --git a/src/botlib/way.qc b/src/botlib/way.qc index a6166cf0..f9ff72c4 100644 --- a/src/botlib/way.qc +++ b/src/botlib/way.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ typedef struct waypoint_s { diff --git a/src/client/chat.qc b/src/client/chat.qc index 7c09dbff..5165495d 100644 --- a/src/client/chat.qc +++ b/src/client/chat.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var bool autocvar_cl_chat_enabled = true; diff --git a/src/client/cmd.h b/src/client/cmd.h index b2e8c047..80c64532 100644 --- a/src/client/cmd.h +++ b/src/client/cmd.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Cmd_Init(void); int Cmd_Parse(string); diff --git a/src/client/cmd.qc b/src/client/cmd.qc index d5df7eb6..f6c25dc9 100644 --- a/src/client/cmd.qc +++ b/src/client/cmd.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void CMD_testPointLight(void) diff --git a/src/client/damage.qc b/src/client/damage.qc index 544c24c5..7d1ca657 100644 --- a/src/client/damage.qc +++ b/src/client/damage.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* ================= diff --git a/src/client/defs.h b/src/client/defs.h index 5173a9c0..921f91ed 100644 --- a/src/client/defs.h +++ b/src/client/defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #include "text.h" #include "textmenu.h" diff --git a/src/client/detailtex.qc b/src/client/detailtex.qc index 7bd7fe96..ec84089c 100644 --- a/src/client/detailtex.qc +++ b/src/client/detailtex.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* This file adds support for GoldSrc styled detail texture definitions. diff --git a/src/client/efx.h b/src/client/efx.h index a4ceeeda..d22b0d89 100644 --- a/src/client/efx.h +++ b/src/client/efx.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ reverbinfo_t *g_efx; string *g_efx_name; diff --git a/src/client/efx.qc b/src/client/efx.qc index a7a8da95..7c2bf6c5 100644 --- a/src/client/efx.qc +++ b/src/client/efx.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifndef EFXDATA_DYNAMIC #ifndef EFXDATA_MAX diff --git a/src/client/entities.qc b/src/client/entities.qc index 1b0bfb02..23d19683 100644 --- a/src/client/entities.qc +++ b/src/client/entities.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Entity_EntityUpdate(float type, float new) diff --git a/src/client/entry.qc b/src/client/entry.qc index 317e9681..8870966b 100644 --- a/src/client/entry.qc +++ b/src/client/entry.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* ================= diff --git a/src/client/event.qc b/src/client/event.qc index 5518da7e..468aa60a 100644 --- a/src/client/event.qc +++ b/src/client/event.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Event_Parse(float type) diff --git a/src/client/fade.h b/src/client/fade.h index 3633df17..78005d96 100644 --- a/src/client/fade.h +++ b/src/client/fade.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,9 +12,9 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Fade_Init(void); void Fade_Update (int x, int y, int w, int h); void Fade_StartDark(void); -void Fade_Parse(void); \ No newline at end of file +void Fade_Parse(void); diff --git a/src/client/fade.qc b/src/client/fade.qc index 34dac63c..675913f7 100644 --- a/src/client/fade.qc +++ b/src/client/fade.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*enum { diff --git a/src/client/fog.qc b/src/client/fog.qc index 6bda6870..d5fa5062 100644 --- a/src/client/fog.qc +++ b/src/client/fog.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var string g_strFogParms; diff --git a/src/client/font.h b/src/client/font.h index e5493643..97168fe7 100644 --- a/src/client/font.h +++ b/src/client/font.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* flags for 2d drawing */ #define DRAWFLAG_NORMAL 0 diff --git a/src/client/font.qc b/src/client/font.qc index 87524055..36a9d888 100644 --- a/src/client/font.qc +++ b/src/client/font.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ float Font_GetID(font_s fnt) diff --git a/src/client/modelevent.qc b/src/client/modelevent.qc index 0ad8cdf5..3361a307 100644 --- a/src/client/modelevent.qc +++ b/src/client/modelevent.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* ==================== diff --git a/src/client/music.qc b/src/client/music.qc index a80ecb8e..9c81b6f0 100644 --- a/src/client/music.qc +++ b/src/client/music.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* We'll let the menu handle the music, as it may want to do special stuff with * track orders and whatnot. We also cannot predict the paths that easily diff --git a/src/client/player.qc b/src/client/player.qc index bb8ff6cb..a1ced993 100644 --- a/src/client/player.qc +++ b/src/client/player.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void player::draw(void) @@ -71,16 +71,25 @@ player::predraw(void) } if (autocvar_cl_thirdperson == TRUE || !this_us) { + renderflags &= ~RF_EXTERNALMODEL; + Voice_Draw3D(this); Player_PreDraw(this, TRUE); - if (p_model) + if (p_model) { + p_model.renderflags &= ~RF_EXTERNALMODEL; addentity(p_model); + } //addentity(this); } else { + renderflags |= RF_EXTERNALMODEL; + Player_PreDraw(this, FALSE); - if (p_model) - removeentity(p_model); - removeentity(this); + + if (p_model) { + p_model.renderflags |= RF_EXTERNALMODEL; + addentity(p_model); + } + addentity(this); } return (PREDRAW_NEXT); diff --git a/src/client/predict.qc b/src/client/predict.qc index 10b12e2f..b3b8d80c 100644 --- a/src/client/predict.qc +++ b/src/client/predict.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* ================= diff --git a/src/client/prints.qc b/src/client/prints.qc index 8bee437e..43a972ca 100644 --- a/src/client/prints.qc +++ b/src/client/prints.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Print_Draw(void) diff --git a/src/client/sentences.qc b/src/client/sentences.qc index 72aad388..27c3cef9 100644 --- a/src/client/sentences.qc +++ b/src/client/sentences.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* voice sentence samples for AI and other triggers that are supposed to talk. * the formatting is messy as hell and I feel dirty for even bothering with all diff --git a/src/client/shake.qc b/src/client/shake.qc index 71d7da4a..ffa784a5 100644 --- a/src/client/shake.qc +++ b/src/client/shake.qc @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + void Shake_Update(NSClientPlayer pl) { diff --git a/src/client/sky.qc b/src/client/sky.qc index cecad6fd..9dde3083 100644 --- a/src/client/sky.qc +++ b/src/client/sky.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var string g_strSkyName; diff --git a/src/client/text.h b/src/client/text.h index 3cbe38d3..f75d35ef 100644 --- a/src/client/text.h +++ b/src/client/text.h @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + typedef struct { string m_strMessage; @@ -12,4 +28,4 @@ typedef struct float m_flFXTime; float m_flTime; } gametext_t; -gametext_t g_textchannels[6]; \ No newline at end of file +gametext_t g_textchannels[6]; diff --git a/src/client/text.qc b/src/client/text.qc index 4b30e77f..500fee12 100644 --- a/src/client/text.qc +++ b/src/client/text.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* for effect 2 */ int diff --git a/src/client/textmenu.h b/src/client/textmenu.h index 664c7940..637e34eb 100644 --- a/src/client/textmenu.h +++ b/src/client/textmenu.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var string g_textmenu = ""; var float g_textmenucheck = 0.0f; diff --git a/src/client/textmenu.qc b/src/client/textmenu.qc index 838eaa88..cc10ccb7 100644 --- a/src/client/textmenu.qc +++ b/src/client/textmenu.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* Old style Counter-Strike/TFC menus */ diff --git a/src/client/titles.qc b/src/client/titles.qc index 857417a1..35d856e8 100644 --- a/src/client/titles.qc +++ b/src/client/titles.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* * these message titles are used for all sorts of in-game messages. diff --git a/src/client/util.h b/src/client/util.h index 36ae818a..4809b2db 100644 --- a/src/client/util.h +++ b/src/client/util.h @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + /* Returns if the specified client is a NSClientSpectator, doesn't matter if real or fake */ float Client_IsSpectator(NSClient); diff --git a/src/client/util.qc b/src/client/util.qc index 6e5a880e..21ae8713 100644 --- a/src/client/util.qc +++ b/src/client/util.qc @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ float Client_IsSpectator(NSClient cl) diff --git a/src/client/vgui.qc b/src/client/vgui.qc index ecd9dbcb..1558066d 100644 --- a/src/client/vgui.qc +++ b/src/client/vgui.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CUIWidget g_uiDesktop; diff --git a/src/client/view.qc b/src/client/view.qc index 9ccf73bc..97121dee 100644 --- a/src/client/view.qc +++ b/src/client/view.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var bool autocvar_v_modellag = 0; var bool autocvar_v_muzzledlight = 1; @@ -26,28 +26,28 @@ View_Init(void) /* right side */ pSeat->m_eViewModel = spawn(); pSeat->m_eViewModel.classname = "vm"; - pSeat->m_eViewModel.renderflags = RF_DEPTHHACK; + pSeat->m_eViewModel.renderflags = RF_DEPTHHACK | RF_FIRSTPERSON; pSeat->m_eViewModel.effects |= EF_NOSHADOW; pSeat->m_eViewModel.alpha = 1.0f; setsize(pSeat->m_eViewModel, [0,0,0], [0,0,0]); pSeat->m_eMuzzleflash = spawn(); pSeat->m_eMuzzleflash.classname = "mflash"; - pSeat->m_eMuzzleflash.renderflags = RF_ADDITIVE; + pSeat->m_eMuzzleflash.renderflags = RF_ADDITIVE | RF_FIRSTPERSON; pSeat->m_eMuzzleflash.effects |= EF_NOSHADOW; setsize(pSeat->m_eMuzzleflash, [0,0,0], [0,0,0]); /* left side */ pSeat->m_eViewModelL = spawn(); pSeat->m_eViewModelL.classname = "vm"; - pSeat->m_eViewModelL.renderflags = RF_DEPTHHACK; + pSeat->m_eViewModelL.renderflags = RF_DEPTHHACK | RF_FIRSTPERSON; pSeat->m_eViewModelL.effects |= EF_NOSHADOW; pSeat->m_eViewModelL.alpha = 1.0f; setsize(pSeat->m_eViewModelL, [0,0,0], [0,0,0]); pSeat->m_eMuzzleflashL = spawn(); pSeat->m_eMuzzleflashL.classname = "mflash"; - pSeat->m_eMuzzleflashL.renderflags = RF_ADDITIVE; + pSeat->m_eMuzzleflashL.renderflags = RF_ADDITIVE | RF_FIRSTPERSON; pSeat->m_eMuzzleflashL.effects |= EF_NOSHADOW; setsize(pSeat->m_eMuzzleflashL, [0,0,0], [0,0,0]); } diff --git a/src/client/voice.qc b/src/client/voice.qc index ccd0f8ef..22065093 100644 --- a/src/client/voice.qc +++ b/src/client/voice.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* ================= diff --git a/src/client/way.qc b/src/client/way.qc index 4250f182..8a4c30e2 100644 --- a/src/client/way.qc +++ b/src/client/way.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Way_Init(void) diff --git a/src/gs-entbase/baseentity.h b/src/gs-entbase/baseentity.h index 7bd03e4d..c7217555 100644 --- a/src/gs-entbase/baseentity.h +++ b/src/gs-entbase/baseentity.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,9 +12,8 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ -#ifdef GS_RENDERFX enum { RM_NORMAL = 0, @@ -53,6 +52,5 @@ enum RFX_GLOWSHELL2 = 20, RFX_Q2PULSE = 21 }; -#endif .bool _mapspawned; diff --git a/src/gs-entbase/client.src b/src/gs-entbase/client.src index f7ca4483..5ede91fd 100644 --- a/src/gs-entbase/client.src +++ b/src/gs-entbase/client.src @@ -12,7 +12,6 @@ client/env_glow.qc client/env_sun.qc client/env_sound.qc client/env_soundscape.qc -client/env_sprite.qc client/env_particle.qc client/env_laser.qc client/func_lod.qc diff --git a/src/gs-entbase/client/defs.h b/src/gs-entbase/client/defs.h index 31d8ba24..93217e64 100644 --- a/src/gs-entbase/client/defs.h +++ b/src/gs-entbase/client/defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ vector g_vecSunDir; diff --git a/src/gs-entbase/client/env_cubemap.qc b/src/gs-entbase/client/env_cubemap.qc index 1469cbb4..993baa11 100644 --- a/src/gs-entbase/client/env_cubemap.qc +++ b/src/gs-entbase/client/env_cubemap.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_cubemap (0 0 1) (-8 -8 -8) (8 8 8) Specifies a location for which a cubemap will be generated when the diff --git a/src/gs-entbase/client/env_glow.qc b/src/gs-entbase/client/env_glow.qc index a85b6c75..ac016592 100644 --- a/src/gs-entbase/client/env_glow.qc +++ b/src/gs-entbase/client/env_glow.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_glow (0 0.5 1) (-8 -8 -8) (8 8 8) EVGLOW_ORIENT Client-side glare/glow orb effect like the flares in 1997's Unreal. diff --git a/src/gs-entbase/client/env_laser.qc b/src/gs-entbase/client/env_laser.qc index de0506fc..9a76ad44 100644 --- a/src/gs-entbase/client/env_laser.qc +++ b/src/gs-entbase/client/env_laser.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void(float radius, vector texcoordbias) R_EndPolygonRibbon = #0; diff --git a/src/gs-entbase/client/env_particle.qc b/src/gs-entbase/client/env_particle.qc index 6b4850bc..5a74518d 100644 --- a/src/gs-entbase/client/env_particle.qc +++ b/src/gs-entbase/client/env_particle.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_particle (1 0 0) (-8 -8 -8) (8 8 8) Client-side particle effect. Active at runtime, fully client-side. diff --git a/src/gs-entbase/client/env_sound.qc b/src/gs-entbase/client/env_sound.qc index 026001a1..4ff29230 100644 --- a/src/gs-entbase/client/env_sound.qc +++ b/src/gs-entbase/client/env_sound.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* this is causing crashes on OpenAL 1.19.1 when enabled */ //#define DSP_LERP diff --git a/src/gs-entbase/client/env_soundscape.qc b/src/gs-entbase/client/env_soundscape.qc index bc9e9548..3c1e8618 100644 --- a/src/gs-entbase/client/env_soundscape.qc +++ b/src/gs-entbase/client/env_soundscape.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_soundscape (0 1 0.3) (-8 -8 -8) (8 8 8) Client-side environmental soundscape modifier. diff --git a/src/gs-entbase/client/env_sprite.qc b/src/gs-entbase/client/env_sprite.qc index 840e0edb..e69de29b 100644 --- a/src/gs-entbase/client/env_sprite.qc +++ b/src/gs-entbase/client/env_sprite.qc @@ -1,141 +0,0 @@ -/* - * 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 - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER - * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -class env_sprite:NSRenderableEntity -{ - float framerate; - int loops; - int maxframe; - string m_strMaterial; - - virtual float(void) predraw; - virtual void(float,float) ReceiveEntity; - virtual void(void) think; -}; - -float -env_sprite::predraw(void) -{ - if (!m_strMaterial) { - return super::predraw(); - } - - int s = (float)getproperty(VF_ACTIVESEAT); - pSeat = &g_seats[s]; - vector vecPlayer = pSeat->m_vecPredictedOrigin; - makevectors(view_angles); - makevectors(vectoangles(origin - vecPlayer)); - vector forg = origin + (v_forward * -16); - vector fsize = [64,64]; - - traceline(origin, vecPlayer, MOVE_WORLDONLY, this); - - if (trace_fraction < 1.0) - return (PREDRAW_NEXT); - - R_BeginPolygon(m_strMaterial, 1, 0); - R_PolygonVertex(forg + v_right * fsize[0] - v_up * fsize[1], - [1,1], m_vecRenderColor, 1.0); - R_PolygonVertex(forg - v_right * fsize[0] - v_up * fsize[1], - [0,1], m_vecRenderColor, 1.0); - R_PolygonVertex(forg - v_right * fsize[0] + v_up * fsize[1], - [0,0], m_vecRenderColor, 1.0); - R_PolygonVertex(forg + v_right * fsize[0] + v_up * fsize[1], - [1,0], m_vecRenderColor, 1.0); - R_EndPolygon(); - - addentity(this); - - return (PREDRAW_NEXT); -} - -void -env_sprite::think(void) -{ - if (frame >= (maxframe-1)) { - if (loops == 0) { - remove(this); - } else { - frame = 0; - } - } else { - frame += 1; - } - - nextthink = time + (1 / framerate); -} - -void -env_sprite::ReceiveEntity(float flNew, float flChanged) -{ - origin[0] = readcoord(); - origin[1] = readcoord(); - origin[2] = readcoord(); - modelindex = readfloat(); - framerate = readfloat(); - scale = readfloat(); - m_strMaterial = readstring(); - -#ifdef GS_RENDERFX - m_iRenderFX = readbyte(); - m_iRenderMode = readbyte(); - m_vecRenderColor[0] = readfloat(); - m_vecRenderColor[1] = readfloat(); - m_vecRenderColor[2] = readfloat(); - m_flRenderAmt = readfloat(); -#endif - - drawmask = MASK_ENGINE; - nextthink = time + (1 / framerate); - maxframe = modelframecount(modelindex); - loops = 1; /* repeats */ - setorigin(this, origin); -} - -/* make sure we're not spawning on the client-side */ -void -env_sprite::env_sprite(void) -{ - isCSQC = false; -} - -void -EnvSprite_ParseEvent(void) -{ - env_sprite spr = spawn(env_sprite); - spr.origin[0] = readcoord(); - spr.origin[1] = readcoord(); - spr.origin[2] = readcoord(); - spr.modelindex = readfloat(); - spr.framerate = readfloat(); - spr.scale = readfloat(); - spr.m_strMaterial = readstring(); - -#ifdef GS_RENDERFX - spr.m_iRenderFX = readbyte(); - spr.m_iRenderMode = readbyte(); - spr.m_vecRenderColor[0] = readfloat(); - spr.m_vecRenderColor[1] = readfloat(); - spr.m_vecRenderColor[2] = readfloat(); - spr.m_flRenderAmt = readfloat(); -#endif - - spr.drawmask = MASK_ENGINE; - spr.nextthink = time + (1 / spr.framerate); - spr.maxframe = modelframecount(spr.modelindex); - spr.loops = 0; /* does not repeat */ - setorigin(spr, spr.origin); -} diff --git a/src/gs-entbase/client/env_sun.qc b/src/gs-entbase/client/env_sun.qc index 6bfc2e47..b8ec6604 100644 --- a/src/gs-entbase/client/env_sun.qc +++ b/src/gs-entbase/client/env_sun.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int trace_surfaceflagsi; diff --git a/src/gs-entbase/client/func_dustcloud.qc b/src/gs-entbase/client/func_dustcloud.qc index 34cf8326..38c4659d 100644 --- a/src/gs-entbase/client/func_dustcloud.qc +++ b/src/gs-entbase/client/func_dustcloud.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_dustcloud (0 .5 .8) ? Dust cloud emitting brush volume. diff --git a/src/gs-entbase/client/func_dustmotes.qc b/src/gs-entbase/client/func_dustmotes.qc index e427db26..c09e5733 100644 --- a/src/gs-entbase/client/func_dustmotes.qc +++ b/src/gs-entbase/client/func_dustmotes.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_dustmotes (0 .5 .8) ? Dustmote emitting brush volume. diff --git a/src/gs-entbase/client/func_lod.qc b/src/gs-entbase/client/func_lod.qc index a979f9f3..123b753c 100644 --- a/src/gs-entbase/client/func_lod.qc +++ b/src/gs-entbase/client/func_lod.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_lod (0 .5 .8) ? Level of Detail brush entity, disappears at a set distance. diff --git a/src/gs-entbase/client/func_smokevolume.qc b/src/gs-entbase/client/func_smokevolume.qc index 6ce57c2f..79367b7e 100644 --- a/src/gs-entbase/client/func_smokevolume.qc +++ b/src/gs-entbase/client/func_smokevolume.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_smokevolume (0 .5 .8) ? FULLBRIGHT Smoke cloud emitting brush volume. diff --git a/src/gs-entbase/client/info_notnull.qc b/src/gs-entbase/client/info_notnull.qc index 98a3d13f..ad8b5692 100644 --- a/src/gs-entbase/client/info_notnull.qc +++ b/src/gs-entbase/client/info_notnull.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class info_notnull:NSEntity { diff --git a/src/gs-entbase/client/infodecal.qc b/src/gs-entbase/client/infodecal.qc index dbebc531..086db1ad 100644 --- a/src/gs-entbase/client/infodecal.qc +++ b/src/gs-entbase/client/infodecal.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class infodecal:NSEntity diff --git a/src/gs-entbase/client/light_environment.qc b/src/gs-entbase/client/light_environment.qc index 16ceca7c..0fedfc79 100644 --- a/src/gs-entbase/client/light_environment.qc +++ b/src/gs-entbase/client/light_environment.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED light_environment (1 0 0) (-8 -8 -8) (8 8 8) ? Defines the overall ambient skylight in the map. diff --git a/src/gs-entbase/client/point_message.qc b/src/gs-entbase/client/point_message.qc index 1bee8170..80ab490c 100644 --- a/src/gs-entbase/client/point_message.qc +++ b/src/gs-entbase/client/point_message.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED point_message (0.2 1 0.2) (-8 -8 -8) (8 8 8) Client-side overlay/message that is projected in relation to its position diff --git a/src/gs-entbase/client/prop_static.qc b/src/gs-entbase/client/prop_static.qc index 94a28cd4..07a115e9 100644 --- a/src/gs-entbase/client/prop_static.qc +++ b/src/gs-entbase/client/prop_static.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Vera Visions L.L.C. + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class prop_static:NSEntity diff --git a/src/gs-entbase/client/sky_camera.qc b/src/gs-entbase/client/sky_camera.qc index 80b43ab4..fde07e22 100644 --- a/src/gs-entbase/client/sky_camera.qc +++ b/src/gs-entbase/client/sky_camera.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED sky_camera (1 0.3 1) (-8 -8 -8) (8 8 8) Defines the position of a skyroom camera. diff --git a/src/gs-entbase/decals.h b/src/gs-entbase/decals.h index 792b49c4..4228b3e3 100644 --- a/src/gs-entbase/decals.h +++ b/src/gs-entbase/decals.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class decal { diff --git a/src/gs-entbase/server.src b/src/gs-entbase/server.src index f819e38f..2f21f85c 100644 --- a/src/gs-entbase/server.src +++ b/src/gs-entbase/server.src @@ -16,7 +16,6 @@ server/cycler_sprite.qc server/env_beam.qc server/env_fade.qc server/env_hudhint.qc -server/env_sprite.qc server/env_spark.qc server/env_explosion.qc server/env_render.qc diff --git a/src/gs-entbase/server/NSOutput.h b/src/gs-entbase/server/NSOutput.h index 2a095a73..caa7dc29 100644 --- a/src/gs-entbase/server/NSOutput.h +++ b/src/gs-entbase/server/NSOutput.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* inspired by https://developer.valvesoftware.com/wiki/Inputs_and_Outputs a lot of the action happens in NSIO. diff --git a/src/gs-entbase/server/NSOutput.qc b/src/gs-entbase/server/NSOutput.qc index 54fb2686..4be25994 100644 --- a/src/gs-entbase/server/NSOutput.qc +++ b/src/gs-entbase/server/NSOutput.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void NSOutput::TriggerOutput(void) diff --git a/src/gs-entbase/server/button_target.qc b/src/gs-entbase/server/button_target.qc index 20bf0976..cf737404 100644 --- a/src/gs-entbase/server/button_target.qc +++ b/src/gs-entbase/server/button_target.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED button_target (0 .5 .8) ? BUTTA_USE BUTTA_TEXON Non-moving button that can either be used by hand, or shot. diff --git a/src/gs-entbase/server/cycler.qc b/src/gs-entbase/server/cycler.qc index 79155f97..052c2050 100644 --- a/src/gs-entbase/server/cycler.qc +++ b/src/gs-entbase/server/cycler.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED cycler (1 0 0) (-8 -8 -8) (8 8 8) Animation cycler entity. For development purposes mainly. diff --git a/src/gs-entbase/server/cycler_sprite.qc b/src/gs-entbase/server/cycler_sprite.qc index 3a29a66b..1d8ecd5e 100644 --- a/src/gs-entbase/server/cycler_sprite.qc +++ b/src/gs-entbase/server/cycler_sprite.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED cycler_sprite (1 0 0) (-8 -8 -8) (8 8 8) Decorative, does nothing yet. diff --git a/src/gs-entbase/server/defs.h b/src/gs-entbase/server/defs.h index 62f95674..d6d31964 100644 --- a/src/gs-entbase/server/defs.h +++ b/src/gs-entbase/server/defs.h @@ -1,7 +1,7 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * - * Permission to use, copy, modify, and distribute this software for any+ + * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #include "../shared/baseentity.h" #include "NSOutput.h" diff --git a/src/gs-entbase/server/env_beam.qc b/src/gs-entbase/server/env_beam.qc index 2c84f97d..70281a3e 100644 --- a/src/gs-entbase/server/env_beam.qc +++ b/src/gs-entbase/server/env_beam.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_beam (1 0 0) (-8 -8 -8) (8 8 8) This entity is incomplete. Purely stub. diff --git a/src/gs-entbase/server/env_beverage.qc b/src/gs-entbase/server/env_beverage.qc index 2994a81c..8e26ea72 100644 --- a/src/gs-entbase/server/env_beverage.qc +++ b/src/gs-entbase/server/env_beverage.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_beverage (1 0 0) (-8 -8 -8) (8 8 8) Upon triggered, the entity will spawn item_food in its place in diff --git a/src/gs-entbase/server/env_explosion.qc b/src/gs-entbase/server/env_explosion.qc index c1deaa99..a3ec951d 100644 --- a/src/gs-entbase/server/env_explosion.qc +++ b/src/gs-entbase/server/env_explosion.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_explosion (1 0 0) (-8 -8 -8) (8 8 8) ENVEXPLO_NODAMAGE ENVEXPLO_REPEATABLE ENVEXPLO_NOBALL ENVEXPLO_NOSMOKE ENVEXPLO_NODECAL ENVEXPLO_NOSPARKS When triggered, creates an explosion at its location. diff --git a/src/gs-entbase/server/env_fade.qc b/src/gs-entbase/server/env_fade.qc index b1343824..3bcd17d9 100644 --- a/src/gs-entbase/server/env_fade.qc +++ b/src/gs-entbase/server/env_fade.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_fade (0 0 0) (-8 -8 -8) (8 8 8) EVF_FADEDROM EVF_MODULATE EVF_ONLYUSER Overlay that blinds/obscures players vision when triggered. @@ -85,17 +85,10 @@ env_fade::Trigger(entity act, int state) WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, EV_FADE); -#ifdef GS_RENDERFX WriteFloat(MSG_MULTICAST, m_vecRenderColor[0]); WriteFloat(MSG_MULTICAST, m_vecRenderColor[1]); WriteFloat(MSG_MULTICAST, m_vecRenderColor[2]); WriteFloat(MSG_MULTICAST, m_flRenderAmt); -#else - WriteFloat(MSG_MULTICAST, colormod[0]); - WriteFloat(MSG_MULTICAST, colormod[1]); - WriteFloat(MSG_MULTICAST, colormod[2]); - WriteFloat(MSG_MULTICAST, alpha); -#endif WriteFloat(MSG_MULTICAST, m_flFadeDuration); WriteFloat(MSG_MULTICAST, m_flFadeHold); diff --git a/src/gs-entbase/server/env_global.qc b/src/gs-entbase/server/env_global.qc index a24a7d4f..6d9bd679 100644 --- a/src/gs-entbase/server/env_global.qc +++ b/src/gs-entbase/server/env_global.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_global (1 0 0) (-8 -8 -8) (8 8 8) GLOBAL_SETSPAWN Persistent storage for variables that carry over level changes. diff --git a/src/gs-entbase/server/env_hudhint.qc b/src/gs-entbase/server/env_hudhint.qc index 980cdd2d..c626f786 100644 --- a/src/gs-entbase/server/env_hudhint.qc +++ b/src/gs-entbase/server/env_hudhint.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_hudhint (0 0 0) (-8 -8 -8) (8 8 8) EHH_ALLPLAYERS Will display a hint message to the client who activates it. diff --git a/src/gs-entbase/server/env_laser.qc b/src/gs-entbase/server/env_laser.qc index 8d70c180..3eb31cad 100644 --- a/src/gs-entbase/server/env_laser.qc +++ b/src/gs-entbase/server/env_laser.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_laser (1 0 0) (-8 -8 -8) (8 8 8) ENVLAZ_STARTON x x x ENVLAZ_STARTSPARK ENVLAZ_ENDSPARK ENVLAZ_DECALEND Shoots a frickin lazer. diff --git a/src/gs-entbase/server/env_message.qc b/src/gs-entbase/server/env_message.qc index 379e1421..295d9ab3 100644 --- a/src/gs-entbase/server/env_message.qc +++ b/src/gs-entbase/server/env_message.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_message (1 0 0) (-8 -8 -8) (8 8 8) EMF_ONCE EMF_ALLPLAYERS Displays a basic message or titles.txt entry. diff --git a/src/gs-entbase/server/env_render.qc b/src/gs-entbase/server/env_render.qc index 103edc89..1a2f755c 100644 --- a/src/gs-entbase/server/env_render.qc +++ b/src/gs-entbase/server/env_render.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_render (1 0 0) (-8 -8 -8) (8 8 8) SF_NORENDERFX SF_NORENDERAMT SF_NORENDERMODE SF_NORENDERCOLOR Changes the visual appearance of a target. @@ -68,7 +68,6 @@ Supported Render-FX ("renderfx") values: This entity was introduced in Half-Life (1998). */ -#ifdef GS_RENDERFX enumflags { SF_NORENDERFX, @@ -116,4 +115,3 @@ void env_render::env_render(void) { } -#endif diff --git a/src/gs-entbase/server/env_shake.qc b/src/gs-entbase/server/env_shake.qc index 7a281f3b..4e0e00c8 100644 --- a/src/gs-entbase/server/env_shake.qc +++ b/src/gs-entbase/server/env_shake.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_shake (1 0.5 0) (-8 -8 -8) (8 8 8) EVS_GLOBAL Causes an earthquake/shaking effect when triggered. diff --git a/src/gs-entbase/server/env_shooter.qc b/src/gs-entbase/server/env_shooter.qc index 6157699c..6f55eb6f 100644 --- a/src/gs-entbase/server/env_shooter.qc +++ b/src/gs-entbase/server/env_shooter.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,9 +12,9 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ -/*QUAKED env_shooter (1 0 0) (-8 -8 -8) (8 8 8) +/*QUAKED env_shooter (1 0 0) (-8 -8 -8) (8 8 8) EVSHOOTER_REPEATABLE Shoots model entities from its location. -------- KEYS -------- @@ -35,6 +35,8 @@ Shoots model entities from its location. This entity was introduced in Half-Life (1998). */ +#define EVSHOOTER_REPEATABLE 1 + class env_shooter:NSPointTrigger { int m_iGibs; @@ -92,6 +94,9 @@ env_shooter::Trigger(entity act, int state) nextthink = 0.0f; break; case TRIG_ON: + if (spawnflags & EVSHOOTER_REPEATABLE) + m_iGibsLeft = m_iGibs; + think = ShootGib; nextthink = time + m_flVariance; break; @@ -106,6 +111,11 @@ env_shooter::Trigger(entity act, int state) void env_shooter::Respawn(void) { + if (!m_strShootModel) { + Destroy(); + return; + } + m_iGibsLeft = m_iGibs; think = __NULL__; } @@ -150,7 +160,14 @@ env_shooter::SpawnKey(string strKey, string strValue) void env_shooter::env_shooter(void) { - if (!m_strShootModel) { - remove(this); - } + m_flVariance = 0.0f; + m_flDelay = 0.0f; + m_iGibs = 1; + m_iGibsLeft = 1; + m_flVelocity = 0; + m_flGibLife = 1.0f; + m_strShootModel = __NULL__; + m_flShootSounds = 0; + m_flScale = 1.0; + m_flSkin = 0; } diff --git a/src/gs-entbase/server/env_spark.qc b/src/gs-entbase/server/env_spark.qc index a832c726..dba367b5 100644 --- a/src/gs-entbase/server/env_spark.qc +++ b/src/gs-entbase/server/env_spark.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_spark (1 0 0) (-8 -8 -8) (8 8 8) x x x x x EVSPARK_TOGGLE EVSPARK_STARTON Creates a series (or just one) spark effect with sound when triggered. diff --git a/src/gs-entbase/server/env_sprite.qc b/src/gs-entbase/server/env_sprite.qc index 917736b9..e69de29b 100644 --- a/src/gs-entbase/server/env_sprite.qc +++ b/src/gs-entbase/server/env_sprite.qc @@ -1,200 +0,0 @@ -/* - * 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 - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER - * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/*QUAKED env_sprite (1 0 0) (-8 -8 -8) (8 8 8) ENVS_STARTON ENVS_PLAYONCE -A sprite entity manager with fancy overrides. - --------- KEYS -------- -"targetname" : Name -"target" : Target when triggered. -"killtarget" : Target to kill when triggered. -"angles" : Sets the pitch, yaw and roll angles of the sprite. -"model" : Path to the sprite in question. -"rendercolor" : Color modifier of the sprite. -"renderamt" : Alpha modifier of the sprite. -"rendermode" : Render mode of the sprite. -"framerate" : Rate between frames in seconds. -"scale" : Scale modifier of the sprite. - --------- SPAWNFLAGS -------- -ENVS_STARTON : Start visible. -ENVS_PLAYONCE : Play once from start to finish, then make invisible. - --------- NOTES -------- -Only used with an external sprite format, like SPR, SPRHL and SPR32. - --------- TRIVIA -------- -This entity was introduced in Half-Life (1998). -*/ - -enumflags -{ - ENVS_STARTON, - ENVS_PLAYONCE -}; - -class env_sprite:NSRenderableEntity -{ - bool m_iIsShader; - int m_iToggled; - float m_flFramerate; - float m_flScale; - float m_flEffects; - string m_strMaterial; - - void(void) env_sprite; - - virtual void(void) Spawned; - virtual void(entity, int) Trigger; - virtual float(entity, float) SendEntity; - virtual void(string, string) SpawnKey; - virtual void(entity, string, string) Input; -}; - -void -env_sprite::Input(entity eAct, string strInput, string strData) -{ - switch (strInput) { - case "Color": - m_vecRenderColor = stov(strData) / 255; - SendFlags |= 1; - break; - default: - super::Input(eAct, strInput, strData); - } -} - -float -env_sprite::SendEntity(entity ePEnt, float flags) -{ - if (clienttype(ePEnt) != CLIENTTYPE_REAL) - return (0); - - if (HasSpawnFlags(ENVS_PLAYONCE)) - return (0); - - /* Delete it on the client. */ - if (m_iToggled == FALSE) - return (0); - - WriteByte(MSG_ENTITY, ENT_SPRITE); - WriteFloat(MSG_ENTITY, 666); - WriteCoord(MSG_ENTITY, origin[0]); - WriteCoord(MSG_ENTITY, origin[1]); - WriteCoord(MSG_ENTITY, origin[2]); - WriteFloat(MSG_ENTITY, modelindex); - WriteFloat(MSG_ENTITY, m_flFramerate); - WriteFloat(MSG_ENTITY, m_flScale); - WriteString(MSG_ENTITY, m_strMaterial); - -#ifdef GS_RENDERFX - WriteByte(MSG_ENTITY, m_iRenderFX); - WriteByte(MSG_ENTITY, m_iRenderMode); - WriteFloat(MSG_ENTITY, m_vecRenderColor[0]); - WriteFloat(MSG_ENTITY, m_vecRenderColor[1]); - WriteFloat(MSG_ENTITY, m_vecRenderColor[2]); - WriteFloat(MSG_ENTITY, m_flRenderAmt); -#else - WriteFloat(MSG_ENTITY, colormod[0]); - WriteFloat(MSG_ENTITY, colormod[1]); - WriteFloat(MSG_ENTITY, colormod[2]); - WriteFloat(MSG_ENTITY, alpha); -#endif - - return (1); -} - -void -env_sprite::NetworkOnce(void) -{ - WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); - WriteByte(MSG_MULTICAST, EV_SPRITE); - WriteCoord(MSG_MULTICAST, origin[0]); - WriteCoord(MSG_MULTICAST, origin[1]); - WriteCoord(MSG_MULTICAST, origin[2]); - WriteFloat(MSG_MULTICAST, modelindex); - WriteFloat(MSG_MULTICAST, m_flFramerate); - WriteFloat(MSG_MULTICAST, m_flScale); - WriteString(MSG_MULTICAST, m_strMaterial); - -#ifdef GS_RENDERFX - WriteByte(MSG_MULTICAST, m_iRenderFX); - WriteByte(MSG_MULTICAST, m_iRenderMode); - WriteFloat(MSG_MULTICAST, m_vecRenderColor[0]); - WriteFloat(MSG_MULTICAST, m_vecRenderColor[1]); - WriteFloat(MSG_MULTICAST, m_vecRenderColor[2]); - WriteFloat(MSG_MULTICAST, m_flRenderAmt); -#else - WriteFloat(MSG_MULTICAST, colormod[0]); - WriteFloat(MSG_MULTICAST, colormod[1]); - WriteFloat(MSG_MULTICAST, colormod[2]); - WriteFloat(MSG_MULTICAST, alpha); -#endif - - msg_entity = this; - multicast(origin, MULTICAST_PVS); -} - -/* TODO: Implement state */ -void -env_sprite::Trigger(entity act, int state) -{ - if (HasSpawnFlags(ENVS_PLAYONCE)) { - NetworkOnce(); - } else { - m_iToggled = 1 - m_iToggled; - SendFlags = 1; - } -} - -void -env_sprite::SpawnKey(string strKey, string strValue) -{ - switch (strKey) { - case "shader": - case "material": - m_strMaterial = strValue; - break; - case "framerate": - m_flFramerate = stof(strValue); - break; - case "scale": - m_flScale = stof(strValue); - break; - default: - super::SpawnKey(strKey, strValue); - } -} - -void -env_sprite::Spawned(void) -{ - super::Spawned(); - - m_iToggled = (HasSpawnFlags(ENVS_STARTON) > 0) ? TRUE : FALSE; - - /* how pointless this would be otherwise. */ - if (!targetname) - m_iToggled = TRUE; -} - -void -env_sprite::env_sprite(void) -{ - m_iIsShader = false; - m_flFramerate = 10; - m_flScale = 1.0f; -} diff --git a/src/gs-entbase/server/func_areaportal.qc b/src/gs-entbase/server/func_areaportal.qc index 649f26ca..3efffdd0 100644 --- a/src/gs-entbase/server/func_areaportal.qc +++ b/src/gs-entbase/server/func_areaportal.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_areaportal (0 .5 .8) ? Manages a space between two areas. @@ -132,4 +132,4 @@ func_areaportal::PortalClose(void) void func_areaportal::func_areaportal(void) { -} \ No newline at end of file +} diff --git a/src/gs-entbase/server/func_breakable.qc b/src/gs-entbase/server/func_breakable.qc index 7541ae12..d75acabf 100644 --- a/src/gs-entbase/server/func_breakable.qc +++ b/src/gs-entbase/server/func_breakable.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_breakable (0 .5 .8) ? SF_TRIGGER SF_TOUCH SF_PRESSURE Brush volume that can break into lots of little pieces. diff --git a/src/gs-entbase/server/func_brush.qc b/src/gs-entbase/server/func_brush.qc index 372a6fee..34ae1a2d 100644 --- a/src/gs-entbase/server/func_brush.qc +++ b/src/gs-entbase/server/func_brush.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_brush (0 .5 .8) ? Combination of func_illusionary, func_wall, func_wall_toggle. diff --git a/src/gs-entbase/server/func_button.qc b/src/gs-entbase/server/func_button.qc index 18afbf14..1a6aa706 100644 --- a/src/gs-entbase/server/func_button.qc +++ b/src/gs-entbase/server/func_button.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_button (0 .5 .8) ? SF_BTT_NOMOVE x x x x SF_BTT_TOGGLE SF_BTT_SPARKS x SF_BTT_TOUCH_ONLY A brush entity which can be used either by touching, interaction (via a games' diff --git a/src/gs-entbase/server/func_conveyor.qc b/src/gs-entbase/server/func_conveyor.qc index c405dfca..435d2d84 100644 --- a/src/gs-entbase/server/func_conveyor.qc +++ b/src/gs-entbase/server/func_conveyor.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_conveyor (0 .5 .8) ? -------- KEYS -------- diff --git a/src/gs-entbase/server/func_detail.qc b/src/gs-entbase/server/func_detail.qc index 8e1284de..a7323d15 100644 --- a/src/gs-entbase/server/func_detail.qc +++ b/src/gs-entbase/server/func_detail.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_detail (0 .5 .8) ? A "fake" entity for level editors. diff --git a/src/gs-entbase/server/func_detail_illusionary.qc b/src/gs-entbase/server/func_detail_illusionary.qc index 5145136c..4af7543e 100644 --- a/src/gs-entbase/server/func_detail_illusionary.qc +++ b/src/gs-entbase/server/func_detail_illusionary.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_detail_illusionary (0 .5 .8) ? A "fake" entity for level editors. diff --git a/src/gs-entbase/server/func_door.qc b/src/gs-entbase/server/func_door.qc index 18e35ad9..4067c32c 100644 --- a/src/gs-entbase/server/func_door.qc +++ b/src/gs-entbase/server/func_door.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_door (0 .5 .8) ? SF_MOV_OPEN x SF_MOV_UNLINK SF_MOV_PASSABLE x SF_MOV_TOGGLE x x SF_MOV_USE This sliding door entity has the ability to slide forth and back on any diff --git a/src/gs-entbase/server/func_door_rotating.qc b/src/gs-entbase/server/func_door_rotating.qc index e7e994a6..326d8446 100644 --- a/src/gs-entbase/server/func_door_rotating.qc +++ b/src/gs-entbase/server/func_door_rotating.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_door_rotating (0 .5 .8) ? SF_ROT_OPEN SF_ROT_BACKWARDS x SF_ROT_PASSABLE SF_ROT_ONEWAY SF_ROT_TOGGLE SF_ROT_ZAXIS SF_ROT_XAXIS SF_ROT_USE SF_ROT_NOMONSTERS Rotating brush door entity. It's basically the same as func_door, it just does diff --git a/src/gs-entbase/server/func_group.qc b/src/gs-entbase/server/func_group.qc index bdc912bf..fa1fc6e2 100644 --- a/src/gs-entbase/server/func_group.qc +++ b/src/gs-entbase/server/func_group.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_group (0 .5 .8) ? A "fake" entity for level editors, used to group together patches and diff --git a/src/gs-entbase/server/func_guntarget.qc b/src/gs-entbase/server/func_guntarget.qc index a3365761..97d08d10 100644 --- a/src/gs-entbase/server/func_guntarget.qc +++ b/src/gs-entbase/server/func_guntarget.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_guntarget (0 .5 .8) ? Gun targets brushes that trigger a target once they 'die'. diff --git a/src/gs-entbase/server/func_healthcharger.qc b/src/gs-entbase/server/func_healthcharger.qc index ba45bc43..29026ec0 100644 --- a/src/gs-entbase/server/func_healthcharger.qc +++ b/src/gs-entbase/server/func_healthcharger.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_healthcharger (0 .5 .8) ? Brush that fills up your health when used, to a maximum of 100 HP. diff --git a/src/gs-entbase/server/func_lod.qc b/src/gs-entbase/server/func_lod.qc index d616568c..ad992032 100644 --- a/src/gs-entbase/server/func_lod.qc +++ b/src/gs-entbase/server/func_lod.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class func_lod:NSEntity { diff --git a/src/gs-entbase/server/func_mortar_field.qc b/src/gs-entbase/server/func_mortar_field.qc index 1016ba32..3dd64214 100644 --- a/src/gs-entbase/server/func_mortar_field.qc +++ b/src/gs-entbase/server/func_mortar_field.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_mortar_field (0 .5 .8) ? This brush volume acts as mortar drop area. diff --git a/src/gs-entbase/server/func_pendulum.qc b/src/gs-entbase/server/func_pendulum.qc index 2e1eec7c..588436c3 100644 --- a/src/gs-entbase/server/func_pendulum.qc +++ b/src/gs-entbase/server/func_pendulum.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_pendulum (0 .5 .8) ? FUNCPEND_STARTON x x FUNCPEND_NONSOLID FUNCPEND_RETURNONTRIGGER x FUNCPEND_XAXIS FUNCPEND_YAXIS A brush that swings along a pivot point like a pendulum. diff --git a/src/gs-entbase/server/func_physbox.qc b/src/gs-entbase/server/func_physbox.qc index ad203946..7370e823 100644 --- a/src/gs-entbase/server/func_physbox.qc +++ b/src/gs-entbase/server/func_physbox.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_physbox (0 .5 .8) ? x x x x x x x x x x x x FNCPHYBX_ASLEEP Physics brush. diff --git a/src/gs-entbase/server/func_plat.qc b/src/gs-entbase/server/func_plat.qc index 12b7a525..11994f1d 100644 --- a/src/gs-entbase/server/func_plat.qc +++ b/src/gs-entbase/server/func_plat.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_plat (0 .5 .8) ? FNCPLAT_TRIGGER It's a simple elevator. It goes down... and back up. diff --git a/src/gs-entbase/server/func_platrot.qc b/src/gs-entbase/server/func_platrot.qc index 13b47094..2a03da74 100644 --- a/src/gs-entbase/server/func_platrot.qc +++ b/src/gs-entbase/server/func_platrot.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_platrot (0 .5 .8) ? A vertically moving platform that rotates. @@ -237,4 +237,4 @@ void func_platrot::func_platrot(void) { m_flSpeed = 100.0f; -} \ No newline at end of file +} diff --git a/src/gs-entbase/server/func_pushable.qc b/src/gs-entbase/server/func_pushable.qc index 1860c7b0..8596b133 100644 --- a/src/gs-entbase/server/func_pushable.qc +++ b/src/gs-entbase/server/func_pushable.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_pushable (0 .5 .8) ? SF_TRIGGER SF_TOUCH SF_PRESSURE This is essentially the same entity as a func_breakable, but diff --git a/src/gs-entbase/server/func_recharge.qc b/src/gs-entbase/server/func_recharge.qc index f3c0f9e7..870cc1e8 100644 --- a/src/gs-entbase/server/func_recharge.qc +++ b/src/gs-entbase/server/func_recharge.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_recharge (0 .5 .8) ? Brush that fills up your armor when used, to a maximum of 100 points. diff --git a/src/gs-entbase/server/func_rot_button.qc b/src/gs-entbase/server/func_rot_button.qc index 6ce5cda3..f7aa6770 100644 --- a/src/gs-entbase/server/func_rot_button.qc +++ b/src/gs-entbase/server/func_rot_button.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_rot_button (0 .5 .8) ? FNCROTBUT_NONSOLID FNCROTBUT_REVERSE x x x FNCROTBUT_TOGGLE FNCROTBUT_XAXIS FNCROTBUT_YAXIS FNCROTBUT_TOUCHABLE A button that rotates along a pivot point. Used for valves, spigots and alike. diff --git a/src/gs-entbase/server/func_rotating.qc b/src/gs-entbase/server/func_rotating.qc index 3fd17629..27e23bcf 100644 --- a/src/gs-entbase/server/func_rotating.qc +++ b/src/gs-entbase/server/func_rotating.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_rotating (0 .5 .8) ? FR_STARTON FR_REVERSE FR_ZAXIS FR_XAXIS FR_ACCDCC FR_FANPAIN FR_NOTSOLID FR_SMALLRADIUS FR_MRADIUS FR_LRADIUS FR_TOGGLEDIR Rotating brush object. Useful for fans, etc. diff --git a/src/gs-entbase/server/func_tank.qc b/src/gs-entbase/server/func_tank.qc index ed0f39ed..4aa24cd8 100644 --- a/src/gs-entbase/server/func_tank.qc +++ b/src/gs-entbase/server/func_tank.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_tank (0 .5 .8) ? FNCTANK_ACTIVE x x x FNCTANK_DIRECTONLY FNCTANK_CONTROLLABLE A mountable tank gun turret type entity. A player (or NPC) can interact with diff --git a/src/gs-entbase/server/func_tankcontrols.qc b/src/gs-entbase/server/func_tankcontrols.qc index c8a3a641..080e72c1 100644 --- a/src/gs-entbase/server/func_tankcontrols.qc +++ b/src/gs-entbase/server/func_tankcontrols.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_tankcontrols (0 .5 .8) ? Brush that marks the usable region of a func_tankmortar, in order diff --git a/src/gs-entbase/server/func_tracktrain.qc b/src/gs-entbase/server/func_tracktrain.qc index aac21bf7..62376c91 100644 --- a/src/gs-entbase/server/func_tracktrain.qc +++ b/src/gs-entbase/server/func_tracktrain.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_tracktrain (0 .5 .8) ? TRAIN_WAIT TRAIN_NOPITCH x TRAIN_NOTSOLID Moving platform following along path_corner entities, aka nodes. @@ -209,7 +209,7 @@ func_tracktrain::PathMove(void) vecAngleDiff = vecAngleDest - angles; vecAngleDiff[2] = 0; - print(sprintf("vecAngleDiff: %v\n", vecAngleDiff)); + //print(sprintf("vecAngleDiff: %v\n", vecAngleDiff)); if (vecAngleDiff[1] == 0) angles = vecAngleDest; diff --git a/src/gs-entbase/server/func_tracktraincontrols.qc b/src/gs-entbase/server/func_tracktraincontrols.qc index 9a1f2524..ae1c0bdc 100644 --- a/src/gs-entbase/server/func_tracktraincontrols.qc +++ b/src/gs-entbase/server/func_tracktraincontrols.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_traincontrols (0 .5 .8) ? Brush that marks the usable region of a func_tracktrain, in order diff --git a/src/gs-entbase/server/func_train.qc b/src/gs-entbase/server/func_train.qc index 80fec552..abd36549 100644 --- a/src/gs-entbase/server/func_train.qc +++ b/src/gs-entbase/server/func_train.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_train (0 .5 .8) ? TRAIN_WAIT x x TRAIN_NOTSOLID Moving platform following along path_corner entities, aka nodes. diff --git a/src/gs-entbase/server/func_vehicle.qc b/src/gs-entbase/server/func_vehicle.qc index ba22be27..8792efb5 100644 --- a/src/gs-entbase/server/func_vehicle.qc +++ b/src/gs-entbase/server/func_vehicle.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_vehicle (0 .5 .8) ? FUNCVEH_NOPITCH FUNCVEH_NOUSER x FUNCVEH_PASSABLE FUNCVEH_FWDRIVE FUNCVEH_RWDRIVE Primitive brush-based vehicle entity. diff --git a/src/gs-entbase/server/func_vehiclecontrols.qc b/src/gs-entbase/server/func_vehiclecontrols.qc index d960d38a..3ebefffa 100644 --- a/src/gs-entbase/server/func_vehiclecontrols.qc +++ b/src/gs-entbase/server/func_vehiclecontrols.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_vehiclecontrols (0 .5 .8) ? Brush that marks the usable region of a func_vehicle, in order diff --git a/src/gs-entbase/server/func_wall_toggle.qc b/src/gs-entbase/server/func_wall_toggle.qc index 5fb80f8e..f257ade8 100644 --- a/src/gs-entbase/server/func_wall_toggle.qc +++ b/src/gs-entbase/server/func_wall_toggle.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_wall_toggle (0 .5 .8) ? FTW_STARTHIDDEN Brush that can be hidden and reappear when triggered. diff --git a/src/gs-entbase/server/game_counter.qc b/src/gs-entbase/server/game_counter.qc index 75ea6edc..9ca2a6f1 100644 --- a/src/gs-entbase/server/game_counter.qc +++ b/src/gs-entbase/server/game_counter.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED game_counter (0 .5 .8) (-8 -8 -8) (8 8 8) GMCNT_REMOVE GMCNT_RESET This entity counts the number of times it has been triggered and activates its diff --git a/src/gs-entbase/server/game_counter_set.qc b/src/gs-entbase/server/game_counter_set.qc index efd04f65..3c4f753f 100644 --- a/src/gs-entbase/server/game_counter_set.qc +++ b/src/gs-entbase/server/game_counter_set.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED game_counter_set (0 .5 .8) (-8 -8 -8) (8 8 8) GMCNTS_REMOVE When triggered, it'll change the internal counter of its target (a game_counter) diff --git a/src/gs-entbase/server/game_player_equip.qc b/src/gs-entbase/server/game_player_equip.qc index d509a214..e6df5e40 100644 --- a/src/gs-entbase/server/game_player_equip.qc +++ b/src/gs-entbase/server/game_player_equip.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED game_player_equip (1 0 0) (-8 -8 -8) (8 8 8) GPEFL_TRIGGERONLY Entity that emits items when triggered, or upon player spawn (MP-only). diff --git a/src/gs-entbase/server/game_text.qc b/src/gs-entbase/server/game_text.qc index 7801d404..2d3804a2 100644 --- a/src/gs-entbase/server/game_text.qc +++ b/src/gs-entbase/server/game_text.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED game_text (1 0 0) (-8 -8 -8) (8 8 8) GTF_ALLPLAYERS This entity displays a message of your choice on-screen. diff --git a/src/gs-entbase/server/gibshooter.qc b/src/gs-entbase/server/gibshooter.qc index ed2fe12f..4bef3ea4 100644 --- a/src/gs-entbase/server/gibshooter.qc +++ b/src/gs-entbase/server/gibshooter.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,9 +12,9 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ -/*QUAKED gibshooter (1 0 0) (-8 -8 -8) (8 8 8) +/*QUAKED gibshooter (1 0 0) (-8 -8 -8) (8 8 8) GIBS_REPEATABLE Shoots model bouncy entities from its location. -------- KEYS -------- @@ -35,16 +35,22 @@ Shoots model bouncy entities from its location. This entity was introduced in Half-Life (1998). */ -class gibshooter2:env_shooter +class gibshooter:env_shooter { - void(void) gibshooter2; + void(void) gibshooter; + virtual void(void) Spawned; }; -void gibshooter2::gibshooter2(void) +void +gibshooter::Spawned(void) { + super::Spawned(); + m_strShootModel = "models/hgibs.mdl"; m_flShootSounds = 3; - m_flScale = 1.0; - precache_model(m_strShootModel); } + +void gibshooter::gibshooter(void) +{ +} diff --git a/src/gs-entbase/server/info_intermission.qc b/src/gs-entbase/server/info_intermission.qc index c24f1a93..4b7030e8 100644 --- a/src/gs-entbase/server/info_intermission.qc +++ b/src/gs-entbase/server/info_intermission.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED info_intermission (1 0 0) (-8 -8 -8) (8 8 8) An entity that's used to create an 'Intermission' camera. diff --git a/src/gs-entbase/server/info_notnull.qc b/src/gs-entbase/server/info_notnull.qc index 8ea9118b..0f0e3dfd 100644 --- a/src/gs-entbase/server/info_notnull.qc +++ b/src/gs-entbase/server/info_notnull.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED info_notnull (1 0 0) (-8 -8 -8) (8 8 8) Helper entity for the game-logic its vast array of entities. diff --git a/src/gs-entbase/server/info_null.qc b/src/gs-entbase/server/info_null.qc index 520624e6..05749cc6 100644 --- a/src/gs-entbase/server/info_null.qc +++ b/src/gs-entbase/server/info_null.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED info_null (1 0 0) (-8 -8 -8) (8 8 8) Helper entity for the map creation process only. diff --git a/src/gs-entbase/server/infodecal.qc b/src/gs-entbase/server/infodecal.qc index 58143f58..76db63c7 100644 --- a/src/gs-entbase/server/infodecal.qc +++ b/src/gs-entbase/server/infodecal.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED infodecal (1 0 0) (-8 -8 -8) (8 8 8) Projects a decals.wad texture onto the nearest surface. diff --git a/src/gs-entbase/server/item_food.qc b/src/gs-entbase/server/item_food.qc index 0a811639..ee692782 100644 --- a/src/gs-entbase/server/item_food.qc +++ b/src/gs-entbase/server/item_food.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED item_food (1 0 0) (-8 -8 -8) (8 8 8) This is a food item that will give the user 1 health when touched. diff --git a/src/gs-entbase/server/light.qc b/src/gs-entbase/server/light.qc index 69ef207c..a7bdb74b 100644 --- a/src/gs-entbase/server/light.qc +++ b/src/gs-entbase/server/light.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED light (1 0 0) (-8 -8 -8) (8 8 8) LFL_LINEAR x LFL_DARK LFL_NOGRID x x Infinitely small point of light illuminating the scene. diff --git a/src/gs-entbase/server/logic_auto.qc b/src/gs-entbase/server/logic_auto.qc index c94dcbcf..8b83f3b0 100644 --- a/src/gs-entbase/server/logic_auto.qc +++ b/src/gs-entbase/server/logic_auto.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED logic_auto (1 0 0) (-8 -8 -8) (8 8 8) TA_USEONCE Will automatically trigger its outputs when the level has spawned. diff --git a/src/gs-entbase/server/momentary_door.qc b/src/gs-entbase/server/momentary_door.qc index 68ca2a40..93b5a176 100644 --- a/src/gs-entbase/server/momentary_door.qc +++ b/src/gs-entbase/server/momentary_door.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED momentary_door (0 .5 .8) ? Dynamic door that will move back down if it's not being used. diff --git a/src/gs-entbase/server/momentary_rot_button.qc b/src/gs-entbase/server/momentary_rot_button.qc index d97b8225..eaba2ddf 100644 --- a/src/gs-entbase/server/momentary_rot_button.qc +++ b/src/gs-entbase/server/momentary_rot_button.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED momentary_rot_button (0 .5 .8) ? MRBFL_DOORHACK MRBFL_NOTUSE x x MRBFL_AUTORETURN x MRBFL_XAXIS MRBFL_YAXIS Dyanmic button/wheel/lever that moves back into its original position when not diff --git a/src/gs-entbase/server/momentarybase.qc b/src/gs-entbase/server/momentarybase.qc index 40053acc..c0e05921 100644 --- a/src/gs-entbase/server/momentarybase.qc +++ b/src/gs-entbase/server/momentarybase.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ typedef enum { diff --git a/src/gs-entbase/server/monster_furniture.qc b/src/gs-entbase/server/monster_furniture.qc index 7b1b4c9d..2a3c3135 100644 --- a/src/gs-entbase/server/monster_furniture.qc +++ b/src/gs-entbase/server/monster_furniture.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED monster_furniture (1 0 0) (-8 -8 -8) (8 8 8) Decorative, does nothing yet. diff --git a/src/gs-entbase/server/monster_generic.qc b/src/gs-entbase/server/monster_generic.qc index 09743968..7fb962db 100644 --- a/src/gs-entbase/server/monster_generic.qc +++ b/src/gs-entbase/server/monster_generic.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED monster_generic (1 0 0) (-8 -8 -8) (8 8 8) x x MGF_NONSOLID Decorative, does nothing yet. diff --git a/src/gs-entbase/server/monstermaker.qc b/src/gs-entbase/server/monstermaker.qc index c9d56d04..97a7500e 100644 --- a/src/gs-entbase/server/monstermaker.qc +++ b/src/gs-entbase/server/monstermaker.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED monstermaker (1 0 0) (-8 -8 -8) (8 8 8) MMF_STARTON x MMF_NONTOGGLE MMF_MONSTERCLIP The monster maker is the end-all solution to timed/controlled spawning of diff --git a/src/gs-entbase/server/multi_manager.qc b/src/gs-entbase/server/multi_manager.qc index efa0ba88..7e7f9576 100644 --- a/src/gs-entbase/server/multi_manager.qc +++ b/src/gs-entbase/server/multi_manager.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED multi_manager (1 0 0) (-8 -8 -8) (8 8 8) MM_MULTITHREADED Triggers a maximum of 16 user defined entities with additonal timers. @@ -301,13 +301,14 @@ multi_manager::Spawned(void) if (!argv(i)) break; - // HACK: Avoid infinite loops - if (targetname != argv(i)) { - m_eTriggers[b].target = argv(i); - m_eTriggers[b].m_oldstrTarget = argv(i); - m_eTriggers[b].m_flUntilTriggered = stof(argv(i+1)); - b++; - } + /* avoid infinite-loops, only when MULTITHREADED flag is NOT set */ + if ((!HasSpawnFlags(MM_MULTITHREADED) && targetname == argv(i))) + continue; + + m_eTriggers[b].target = argv(i); + m_eTriggers[b].m_oldstrTarget = argv(i); + m_eTriggers[b].m_flUntilTriggered = stof(argv(i+1)); + b++; } } diff --git a/src/gs-entbase/server/multisource.qc b/src/gs-entbase/server/multisource.qc index ef57c5d8..597478db 100644 --- a/src/gs-entbase/server/multisource.qc +++ b/src/gs-entbase/server/multisource.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED multisource (1 0 0) (-8 -8 -8) (8 8 8) An AND-gate of sorts. Every entity that targets this must return a positive diff --git a/src/gs-entbase/server/path_corner.qc b/src/gs-entbase/server/path_corner.qc index a74a6a52..e8bce96d 100644 --- a/src/gs-entbase/server/path_corner.qc +++ b/src/gs-entbase/server/path_corner.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED path_corner (1 0 0) (-8 -8 -8) (8 8 8) PC_WAIT PC_TELEPORT PC_FIREONCE Node entities used for func_trains and func_guntargets. diff --git a/src/gs-entbase/server/path_track.qc b/src/gs-entbase/server/path_track.qc index 5ece06e4..ad407635 100644 --- a/src/gs-entbase/server/path_track.qc +++ b/src/gs-entbase/server/path_track.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED path_track (1 0 0) (-8 -8 -8) (8 8 8) Node entities used for func_tracktrains. diff --git a/src/gs-entbase/server/player_loadsaved.qc b/src/gs-entbase/server/player_loadsaved.qc index 03966bb9..d0793616 100644 --- a/src/gs-entbase/server/player_loadsaved.qc +++ b/src/gs-entbase/server/player_loadsaved.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED player_loadsaved (1 0 0) (-8 -8 -8) (8 8 8) This trigger reloads the last autosaved game with a custom message. @@ -93,17 +93,10 @@ player_loadsaved::Trigger(entity act, int unused) WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, EV_FADE); -#ifdef GS_RENDERFX WriteFloat(MSG_MULTICAST, m_vecRenderColor[0]); WriteFloat(MSG_MULTICAST, m_vecRenderColor[1]); WriteFloat(MSG_MULTICAST, m_vecRenderColor[2]); WriteFloat(MSG_MULTICAST, m_flRenderAmt); -#else - WriteFloat(MSG_MULTICAST, colormod[0]); - WriteFloat(MSG_MULTICAST, colormod[1]); - WriteFloat(MSG_MULTICAST, colormod[2]); - WriteFloat(MSG_MULTICAST, alpha); -#endif WriteFloat(MSG_MULTICAST, m_flFadeDuration); WriteFloat(MSG_MULTICAST, m_flFadeHold); diff --git a/src/gs-entbase/server/player_weaponstrip.qc b/src/gs-entbase/server/player_weaponstrip.qc index 18b075e6..58016d6b 100644 --- a/src/gs-entbase/server/player_weaponstrip.qc +++ b/src/gs-entbase/server/player_weaponstrip.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED player_weaponstrip (1 0 0) (-8 -8 -8) (8 8 8) Strips the activator of all of its weapons. diff --git a/src/gs-entbase/server/point_camera.qc b/src/gs-entbase/server/point_camera.qc index 4185fab9..fe0695bb 100644 --- a/src/gs-entbase/server/point_camera.qc +++ b/src/gs-entbase/server/point_camera.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED point_camera (1 0 0) (-8 -8 -8) (8 8 8) PCAMFL_STARTOFF A virtual camera of which its output can be displayed on a rendertarget. diff --git a/src/gs-entbase/server/prop_door_rotating.qc b/src/gs-entbase/server/prop_door_rotating.qc index 68ad424b..bebb8b4d 100644 --- a/src/gs-entbase/server/prop_door_rotating.qc +++ b/src/gs-entbase/server/prop_door_rotating.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #define PRPDRFL_OPEN 1 #define PRPDRFL_LOCKED 2048 diff --git a/src/gs-entbase/server/prop_dynamic.qc b/src/gs-entbase/server/prop_dynamic.qc index 10bfbe91..e1a2b350 100644 --- a/src/gs-entbase/server/prop_dynamic.qc +++ b/src/gs-entbase/server/prop_dynamic.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED prop_dynamic (0 0.2 1) (-8 -8 -8) (8 8 8) x x x x x x x x PRPDYN_NONSOLID Client-side decorative model entity. diff --git a/src/gs-entbase/server/prop_physics.qc b/src/gs-entbase/server/prop_physics.qc index 0a632f24..e9c65c05 100644 --- a/src/gs-entbase/server/prop_physics.qc +++ b/src/gs-entbase/server/prop_physics.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED prop_physics (0 0 0.8) (-16 -16 -16) (16 16 16) PRPPHYS_ASLEEP Physics model diff --git a/src/gs-entbase/server/prop_static.qc b/src/gs-entbase/server/prop_static.qc index aa2ae486..27115121 100644 --- a/src/gs-entbase/server/prop_static.qc +++ b/src/gs-entbase/server/prop_static.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED prop_static (0 0.2 1) (-8 -8 -8) (8 8 8) SF_BASIC_COL Decorative model entity that gets baked into the level file. diff --git a/src/gs-entbase/server/random_speaker.qc b/src/gs-entbase/server/random_speaker.qc index ad9f34e2..9029e039 100644 --- a/src/gs-entbase/server/random_speaker.qc +++ b/src/gs-entbase/server/random_speaker.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED random_speaker (1 0 0) (-8 -8 -8) (8 8 8) This entity plays a .wav file at random intervals. diff --git a/src/gs-entbase/server/random_trigger.qc b/src/gs-entbase/server/random_trigger.qc index aaf1aec5..18553c6d 100644 --- a/src/gs-entbase/server/random_trigger.qc +++ b/src/gs-entbase/server/random_trigger.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED random_trigger (1 0 0) (-8 -8 -8) (8 8 8) When triggered, it'll calculate some random interval until it triggers diff --git a/src/gs-entbase/server/scripted_sentence.qc b/src/gs-entbase/server/scripted_sentence.qc index 986037bd..6c0669a5 100644 --- a/src/gs-entbase/server/scripted_sentence.qc +++ b/src/gs-entbase/server/scripted_sentence.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED scripted_sentence (1 0 0) (-8 -8 -8) (8 8 8) Triggers a sound event on the client side associated with an entity in the diff --git a/src/gs-entbase/server/scripted_sequence.qc b/src/gs-entbase/server/scripted_sequence.qc index a02483c1..0ac419c5 100644 --- a/src/gs-entbase/server/scripted_sequence.qc +++ b/src/gs-entbase/server/scripted_sequence.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED scripted_sequence (1 0 0) (-8 -8 -8) (8 8 8) x x SSFL_REPEATABLE SSFL_LEAVECORPSE x SSFL_NOINTERRUPT SSFL_OVERRIDEAI SSFL_NOSCRIPTMOVE Allow an actor to be selected and given an action to perform. diff --git a/src/gs-entbase/server/speaker.qc b/src/gs-entbase/server/speaker.qc index 18765f13..60d74028 100644 --- a/src/gs-entbase/server/speaker.qc +++ b/src/gs-entbase/server/speaker.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED speaker (1 0 0) (-8 -8 -8) (8 8 8) Creates a public announcement system that randomly plays announcements from @@ -129,11 +129,8 @@ speaker::Respawn(void) /* force this thing to be networked */ SetModel("models/player.mdl"); SetOrigin(GetSpawnOrigin()); - -#ifdef GS_RENDERFX SetRenderMode(RM_COLOR); SetRenderAmt(0); -#endif think = Annouce; diff --git a/src/gs-entbase/server/stubs.qc b/src/gs-entbase/server/stubs.qc index 83da8743..eca7abf3 100644 --- a/src/gs-entbase/server/stubs.qc +++ b/src/gs-entbase/server/stubs.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED info_player_start (1 1 1) (-16 -16 -36) (16 16 36) Player spawn position for single-player games. diff --git a/src/gs-entbase/server/targ_speaker.qc b/src/gs-entbase/server/targ_speaker.qc index 0592e402..53206d37 100644 --- a/src/gs-entbase/server/targ_speaker.qc +++ b/src/gs-entbase/server/targ_speaker.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED targ_speaker (1 0 0) (-8 -8 -8) (8 8 8) This entity plays a sample upon triggering at a specified volume. diff --git a/src/gs-entbase/server/target_cdaudio.qc b/src/gs-entbase/server/target_cdaudio.qc index 11008373..2d535a29 100644 --- a/src/gs-entbase/server/target_cdaudio.qc +++ b/src/gs-entbase/server/target_cdaudio.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED target_cdaudio (1 0 0) (-8 -8 -8) (8 8 8) A radius based trigger_cdaudio. diff --git a/src/gs-entbase/server/trigger_auto.qc b/src/gs-entbase/server/trigger_auto.qc index 4a8a27de..ec09b0fc 100644 --- a/src/gs-entbase/server/trigger_auto.qc +++ b/src/gs-entbase/server/trigger_auto.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_auto (1 0 0) (-8 -8 -8) (8 8 8) TA_USEONCE Will automatically trigger its target when the level has spawned. diff --git a/src/gs-entbase/server/trigger_autosave.qc b/src/gs-entbase/server/trigger_autosave.qc index 7d8b7269..0eab882b 100644 --- a/src/gs-entbase/server/trigger_autosave.qc +++ b/src/gs-entbase/server/trigger_autosave.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_autosave (0 .5 .8) ? Volume that'll save the current game when a client enters its bounds. diff --git a/src/gs-entbase/server/trigger_cdaudio.qc b/src/gs-entbase/server/trigger_cdaudio.qc index 3fe11406..3de9c0b4 100644 --- a/src/gs-entbase/server/trigger_cdaudio.qc +++ b/src/gs-entbase/server/trigger_cdaudio.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_cdaudio (0 .5 .8) ? Switches the background music track when triggered. diff --git a/src/gs-entbase/server/trigger_changelevel.qc b/src/gs-entbase/server/trigger_changelevel.qc index 7e417cad..a6bfef87 100644 --- a/src/gs-entbase/server/trigger_changelevel.qc +++ b/src/gs-entbase/server/trigger_changelevel.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_changelevel (0 .5 .8) ? LC_NOINTERMISSION LC_USEONLY When a Landmark is specified, you will have to position two info_landmark diff --git a/src/gs-entbase/server/trigger_changetarget.qc b/src/gs-entbase/server/trigger_changetarget.qc index 6e90ced0..8407a724 100644 --- a/src/gs-entbase/server/trigger_changetarget.qc +++ b/src/gs-entbase/server/trigger_changetarget.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_changetarget (1 0 0) (-8 -8 -8) (8 8 8) When triggered, trigger_changetarget changes the 'target' value of any entity diff --git a/src/gs-entbase/server/trigger_counter.qc b/src/gs-entbase/server/trigger_counter.qc index 47c84283..56d59288 100644 --- a/src/gs-entbase/server/trigger_counter.qc +++ b/src/gs-entbase/server/trigger_counter.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_counter (0 .5 .8) ? TRCNT_SILENT TRCNT_NOCLIENTS TRCNT_PUSHABLES This entity counts the number of times it has been triggered and activates its @@ -111,11 +111,6 @@ trigger_counter::Respawn(void) m_iValue = 0; m_iCounted = 0; SetSolid(SOLID_TRIGGER); - -#ifdef GS_RENDERFX - //SetRenderMode(RM_TRIGGER); -#endif - InitBrushTrigger(); } diff --git a/src/gs-entbase/server/trigger_endsection.qc b/src/gs-entbase/server/trigger_endsection.qc index 7c07dd33..744e483e 100644 --- a/src/gs-entbase/server/trigger_endsection.qc +++ b/src/gs-entbase/server/trigger_endsection.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_endsection (0 .5 .8) ? This trigger shuts down the server. diff --git a/src/gs-entbase/server/trigger_hurt.qc b/src/gs-entbase/server/trigger_hurt.qc index 119ae4d9..eeb1c2b5 100644 --- a/src/gs-entbase/server/trigger_hurt.qc +++ b/src/gs-entbase/server/trigger_hurt.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_hurt (0 .5 .8) ? SF_HURT_ONCE SF_HURT_OFF x SF_HURT_NOPLAYERS SF_HURT_FIREONPLAYER SF_HURT_TOUCHPLAYER Trigger volume that damages everything it touches. diff --git a/src/gs-entbase/server/trigger_look.qc b/src/gs-entbase/server/trigger_look.qc index bbc6d763..4c71b325 100644 --- a/src/gs-entbase/server/trigger_look.qc +++ b/src/gs-entbase/server/trigger_look.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_look (0 .5 .8) ? Triggers itself when a player is inside its volume and is looking at a diff --git a/src/gs-entbase/server/trigger_multiple.qc b/src/gs-entbase/server/trigger_multiple.qc index d0aea378..66868475 100644 --- a/src/gs-entbase/server/trigger_multiple.qc +++ b/src/gs-entbase/server/trigger_multiple.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_multiple (0 .5 .8) ? TM_MONSTERS TM_NOCLIENTS TM_PUSHABLES A trigger volume which works more than once. diff --git a/src/gs-entbase/server/trigger_once.qc b/src/gs-entbase/server/trigger_once.qc index cf711163..4bdc2ce5 100644 --- a/src/gs-entbase/server/trigger_once.qc +++ b/src/gs-entbase/server/trigger_once.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_once (0 .5 .8) ? TO_MONSTERS TO_NOCLIENTS TO_PUSHABLES A trigger volume which works only once. diff --git a/src/gs-entbase/server/trigger_playerfreeze.qc b/src/gs-entbase/server/trigger_playerfreeze.qc index dcacc6c7..d9b2b3b3 100644 --- a/src/gs-entbase/server/trigger_playerfreeze.qc +++ b/src/gs-entbase/server/trigger_playerfreeze.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_playerfreeze (1 0 0) (-8 -8 -8) (8 8 8) Trigger that freezes all clients, until it is triggered again. diff --git a/src/gs-entbase/server/trigger_push.qc b/src/gs-entbase/server/trigger_push.qc index 8a830522..def7fadc 100644 --- a/src/gs-entbase/server/trigger_push.qc +++ b/src/gs-entbase/server/trigger_push.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_push (0 .5 .8) ? TP_ONCE TP_STARTOFF Pushes anything in its volume into a direction of your choosing. diff --git a/src/gs-entbase/server/trigger_relay.qc b/src/gs-entbase/server/trigger_relay.qc index 8e5eceb2..89daf573 100644 --- a/src/gs-entbase/server/trigger_relay.qc +++ b/src/gs-entbase/server/trigger_relay.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_relay (0 .5 .8) ? TRLY_ONCE This is an inbetween trigger that forces a desired output state diff --git a/src/gs-entbase/server/trigger_teleport.qc b/src/gs-entbase/server/trigger_teleport.qc index 2ddf1b9d..09b09133 100644 --- a/src/gs-entbase/server/trigger_teleport.qc +++ b/src/gs-entbase/server/trigger_teleport.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_teleport (0 .5 .8) ? Teleportation volume. Teleports anything it touches to the position of diff --git a/src/gs-entbase/server/trigger_transition.qc b/src/gs-entbase/server/trigger_transition.qc index b583af02..54bf9a90 100644 --- a/src/gs-entbase/server/trigger_transition.qc +++ b/src/gs-entbase/server/trigger_transition.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_transition (0 .5 .8) ? Currently unused. This is meant for defining level transition regions. diff --git a/src/gs-entbase/shared.src b/src/gs-entbase/shared.src index 7eb27260..10782cb2 100644 --- a/src/gs-entbase/shared.src +++ b/src/gs-entbase/shared.src @@ -20,6 +20,7 @@ shared/ambient_generic.qc shared/decals.qc shared/spraylogo.qc shared/func_friction.qc +shared/env_sprite.qc shared/env_bubbles.qc shared/env_projectedtexture.qc shared/env_fog_controller.qc diff --git a/src/gs-entbase/shared/NSBrushTrigger.h b/src/gs-entbase/shared/NSBrushTrigger.h index 886132bf..6d539504 100644 --- a/src/gs-entbase/shared/NSBrushTrigger.h +++ b/src/gs-entbase/shared/NSBrushTrigger.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class NSBrushTrigger:NSEntity { diff --git a/src/gs-entbase/shared/NSBrushTrigger.qc b/src/gs-entbase/shared/NSBrushTrigger.qc index 69ec9090..d59bc3b3 100644 --- a/src/gs-entbase/shared/NSBrushTrigger.qc +++ b/src/gs-entbase/shared/NSBrushTrigger.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifdef SERVER void @@ -27,4 +27,4 @@ NSBrushTrigger::InitBrushTrigger(void) void NSBrushTrigger::NSBrushTrigger(void) { -} \ No newline at end of file +} diff --git a/src/gs-entbase/shared/NSEntity.h b/src/gs-entbase/shared/NSEntity.h index ccb1b255..91945ef1 100644 --- a/src/gs-entbase/shared/NSEntity.h +++ b/src/gs-entbase/shared/NSEntity.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enumflags { @@ -29,13 +29,9 @@ enumflags BASEFL_CHANGED_BODY, BASEFL_CHANGED_SCALE, BASEFL_CHANGED_VELOCITY, -#ifdef GS_RENDERFX BASEFL_CHANGED_RENDERCOLOR, BASEFL_CHANGED_RENDERAMT, BASEFL_CHANGED_RENDERMODE, -#else - BASEFL_CHANGED_ALPHA, -#endif }; /* NSEntity is the lowest, user accessible class. diff --git a/src/gs-entbase/shared/NSEntity.qc b/src/gs-entbase/shared/NSEntity.qc index 9a3e459e..235409ab 100644 --- a/src/gs-entbase/shared/NSEntity.qc +++ b/src/gs-entbase/shared/NSEntity.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ float NSEntity::EntIndex(void) diff --git a/src/gs-entbase/shared/NSIO.h b/src/gs-entbase/shared/NSIO.h index 34554d37..4e9547d9 100644 --- a/src/gs-entbase/shared/NSIO.h +++ b/src/gs-entbase/shared/NSIO.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* NSIO class is responsible for handling entity spawns, respawns, save/load as well as key/value pair loading, as well as inputs/outputs diff --git a/src/gs-entbase/shared/NSIO.qc b/src/gs-entbase/shared/NSIO.qc index 8af42cf2..3f304a09 100644 --- a/src/gs-entbase/shared/NSIO.qc +++ b/src/gs-entbase/shared/NSIO.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void NSIO::Respawn(void) diff --git a/src/gs-entbase/shared/NSInteractiveSurface.qc b/src/gs-entbase/shared/NSInteractiveSurface.qc index 282593ad..8ea3bef9 100644 --- a/src/gs-entbase/shared/NSInteractiveSurface.qc +++ b/src/gs-entbase/shared/NSInteractiveSurface.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,19 +12,19 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED NSInteractiveSurface (1 0 0) (-8 -8 -8) (8 8 8) Fully interactive surface -------- KEYS -------- -"angles" : Sets the pitch, yaw and roll angles of the sprite. +"angles" : Sets the pitch, yaw and roll angles of the surface. "ui_class" : Which UI class to use "ui_res" : Resolution of the interface "ui_size" : Size of the interface in world coordinates -------- SPAWNFLAGS -------- -None +None yet -------- NOTES -------- Similar to surfaces in Doom III and Duke 4 @@ -167,6 +167,8 @@ NSInteractiveSurface::Input(float flEVType, float flKey, float flChar, float flD { if (m_UIChain) m_UIChain.Input(flEVType, flKey, flChar, flDevID); + + return true; } /* called whenever we are in the proximity of a surface */ diff --git a/src/gs-entbase/shared/NSMonster.h b/src/gs-entbase/shared/NSMonster.h index 15d48c30..ea645abf 100644 --- a/src/gs-entbase/shared/NSMonster.h +++ b/src/gs-entbase/shared/NSMonster.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ typedef enum { ACT_RESET = 0, diff --git a/src/gs-entbase/shared/NSMonster.qc b/src/gs-entbase/shared/NSMonster.qc index a03227fc..25d34621 100644 --- a/src/gs-entbase/shared/NSMonster.qc +++ b/src/gs-entbase/shared/NSMonster.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifdef SERVER int @@ -848,10 +848,8 @@ NSMonster::SendEntity(entity ePEnt, float fChanged) fChanged &= ~BASEFL_CHANGED_SOLID; if (movetype == MOVETYPE_NONE) fChanged &= ~BASEFL_CHANGED_MOVETYPE; -#ifdef GS_RENDERFX if (m_iRenderMode == RM_NORMAL) fChanged &= ~BASEFL_CHANGED_RENDERMODE; -#endif } /* don't network triggers unless provoked */ @@ -910,8 +908,6 @@ NSMonster::SendEntity(entity ePEnt, float fChanged) WriteFloat(MSG_ENTITY, velocity[1]); WriteFloat(MSG_ENTITY, velocity[2]); } - -#ifdef GS_RENDERFX if (fChanged & BASEFL_CHANGED_RENDERMODE) { WriteByte(MSG_ENTITY, m_iRenderMode); WriteByte(MSG_ENTITY, m_iRenderFX); @@ -925,11 +921,6 @@ NSMonster::SendEntity(entity ePEnt, float fChanged) if (fChanged & BASEFL_CHANGED_RENDERAMT) { WriteFloat(MSG_ENTITY, m_flRenderAmt); } -#else - if (fChanged & BASEFL_CHANGED_ALPHA) { - WriteFloat(MSG_ENTITY, alpha); - } -#endif return (1); } @@ -1027,7 +1018,6 @@ NSMonster::ReceiveEntity(float flNew, float flChanged) velocity[2] = readfloat(); } -#ifdef GS_RENDERFX if (flChanged & BASEFL_CHANGED_RENDERMODE) { m_iRenderMode = readbyte(); m_iRenderFX = readbyte(); @@ -1040,11 +1030,6 @@ NSMonster::ReceiveEntity(float flNew, float flChanged) if (flChanged & BASEFL_CHANGED_RENDERAMT) { m_flRenderAmt = readfloat(); } -#else - if (flChanged & BASEFL_CHANGED_ALPHA) { - alpha = readfloat(); - } -#endif if (modelindex) { drawmask = MASK_ENGINE; diff --git a/src/gs-entbase/shared/NSPhysicsEntity.h b/src/gs-entbase/shared/NSPhysicsEntity.h index 22bcd506..b89ad688 100644 --- a/src/gs-entbase/shared/NSPhysicsEntity.h +++ b/src/gs-entbase/shared/NSPhysicsEntity.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enum { @@ -49,13 +49,9 @@ enumflags PHYENT_CHANGED_BODY, PHYENT_CHANGED_SCALE, PHYENT_CHANGED_VELOCITY, -#ifdef GS_RENDERFX PHYENT_CHANGED_RENDERCOLOR, PHYENT_CHANGED_RENDERAMT, PHYENT_CHANGED_RENDERMODE, -#else - PHYENT_CHANGED_ALPHA, -#endif }; class NSPhysicsEntity:NSSurfacePropEntity diff --git a/src/gs-entbase/shared/NSPhysicsEntity.qc b/src/gs-entbase/shared/NSPhysicsEntity.qc index ace6fe8f..7506b90d 100644 --- a/src/gs-entbase/shared/NSPhysicsEntity.qc +++ b/src/gs-entbase/shared/NSPhysicsEntity.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #define ODE_MODE 1 @@ -107,7 +107,6 @@ NSPhysicsEntity::EvaluateEntity(void) SAVE_STATE(scale); SAVE_STATE(velocity); -#ifdef GS_RENDERFX if (ATTR_CHANGED(m_iRenderMode)) { SetSendFlags(PHYENT_CHANGED_RENDERMODE); } @@ -121,11 +120,6 @@ NSPhysicsEntity::EvaluateEntity(void) if (ATTR_CHANGED(m_flRenderAmt)) { SetSendFlags(PHYENT_CHANGED_RENDERAMT); } -#else - if (ATTR_CHANGED(alpha)) { - SetSendFlags(PHYENT_CHANGED_ALPHA); - } -#endif } float @@ -174,10 +168,8 @@ NSPhysicsEntity::SendEntity(entity ePEnt, float fChanged) fChanged &= ~PHYENT_CHANGED_SOLID; if (movetype == MOVETYPE_NONE) fChanged &= ~PHYENT_CHANGED_MOVETYPE; -#ifdef GS_RENDERFX if (m_iRenderMode == RM_NORMAL) fChanged &= ~PHYENT_CHANGED_RENDERMODE; -#endif } /* broadcast how much data is expected to be read */ @@ -242,7 +234,6 @@ NSPhysicsEntity::SendEntity(entity ePEnt, float fChanged) WriteFloat(MSG_ENTITY, velocity[2]); } -#ifdef GS_RENDERFX if (fChanged & PHYENT_CHANGED_RENDERMODE) { WriteByte(MSG_ENTITY, m_iRenderMode); WriteByte(MSG_ENTITY, m_iRenderFX); @@ -259,11 +250,6 @@ NSPhysicsEntity::SendEntity(entity ePEnt, float fChanged) if (fChanged & PHYENT_CHANGED_RENDERAMT) { WriteFloat(MSG_ENTITY, m_flRenderAmt); } -#else - if (fChanged & PHYENT_CHANGED_ALPHA) { - WriteFloat(MSG_ENTITY, alpha); - } -#endif return (1); } @@ -340,7 +326,6 @@ NSPhysicsEntity::ReceiveEntity(float flNew, float flChanged) velocity[2] = readfloat(); } -#ifdef GS_RENDERFX if (flChanged & PHYENT_CHANGED_RENDERMODE) { m_iRenderMode = readbyte(); m_iRenderFX = readbyte(); @@ -356,11 +341,6 @@ NSPhysicsEntity::ReceiveEntity(float flNew, float flChanged) if (flChanged & PHYENT_CHANGED_RENDERAMT) { m_flRenderAmt = readfloat(); } -#else - if (flChanged & PHYENT_CHANGED_ALPHA) { - alpha = readfloat(); - } -#endif if (modelindex) { drawmask = MASK_ENGINE; diff --git a/src/gs-entbase/shared/NSPointTrigger.h b/src/gs-entbase/shared/NSPointTrigger.h index 110ec0d2..46546070 100644 --- a/src/gs-entbase/shared/NSPointTrigger.h +++ b/src/gs-entbase/shared/NSPointTrigger.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class NSPointTrigger:NSEntity { @@ -21,4 +21,4 @@ class NSPointTrigger:NSEntity #ifdef SERVER virtual void(void) InitPointTrigger; #endif -}; \ No newline at end of file +}; diff --git a/src/gs-entbase/shared/NSPointTrigger.qc b/src/gs-entbase/shared/NSPointTrigger.qc index fdfa44f2..65351b4c 100644 --- a/src/gs-entbase/shared/NSPointTrigger.qc +++ b/src/gs-entbase/shared/NSPointTrigger.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void NSPointTrigger::InitPointTrigger(void) @@ -25,4 +25,4 @@ NSPointTrigger::InitPointTrigger(void) void NSPointTrigger::NSPointTrigger(void) { -} \ No newline at end of file +} diff --git a/src/gs-entbase/shared/NSProjectile.h b/src/gs-entbase/shared/NSProjectile.h index 366d2f6b..bf65269e 100644 --- a/src/gs-entbase/shared/NSProjectile.h +++ b/src/gs-entbase/shared/NSProjectile.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Vera Visions L.L.C. + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class NSProjectile:NSSurfacePropEntity { diff --git a/src/gs-entbase/shared/NSProjectile.qc b/src/gs-entbase/shared/NSProjectile.qc index a2244e24..5bdd9614 100644 --- a/src/gs-entbase/shared/NSProjectile.qc +++ b/src/gs-entbase/shared/NSProjectile.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Vera Visions L.L.C. + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void NSProjectile::ProjectileTouch(void) diff --git a/src/gs-entbase/shared/NSRenderableEntity.h b/src/gs-entbase/shared/NSRenderableEntity.h index 883a2779..5441f82b 100644 --- a/src/gs-entbase/shared/NSRenderableEntity.h +++ b/src/gs-entbase/shared/NSRenderableEntity.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enumflags { @@ -33,13 +33,9 @@ enumflags RDENT_CHANGED_BODY, RDENT_CHANGED_SCALE, RDENT_CHANGED_VELOCITY, -#ifdef GS_RENDERFX RDENT_CHANGED_RENDERCOLOR, RDENT_CHANGED_RENDERAMT, RDENT_CHANGED_RENDERMODE, -#else - RDENT_CHANGED_ALPHA, -#endif }; #ifdef CLIENT @@ -87,7 +83,6 @@ class NSRenderableEntity:NSEntity nonvirtual void(float) SetScale; virtual void(void) MakeStatic; -#ifdef GS_RENDERFX PREDICTED_FLOAT(m_iRenderFX); PREDICTED_FLOAT(m_iRenderMode); PREDICTED_FLOAT(m_flRenderAmt); @@ -108,5 +103,4 @@ class NSRenderableEntity:NSEntity float m_oldflRenderAmt; vector m_oldvecRenderColor; #endif -#endif }; diff --git a/src/gs-entbase/shared/NSRenderableEntity.qc b/src/gs-entbase/shared/NSRenderableEntity.qc index 7e9c80ff..13885867 100644 --- a/src/gs-entbase/shared/NSRenderableEntity.qc +++ b/src/gs-entbase/shared/NSRenderableEntity.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* ============ @@ -31,12 +31,10 @@ NSRenderableEntity::MakeStatic(void) #ifdef CLIENT /* give renderFX the opportunity to write into renderable * fields at least once before forever pulling it out the cgame */ -#ifdef GS_RENDERFX if (m_iRenderMode > RM_FULLBRIGHT) return; RenderFXPass(); -#endif /* static ents = no collision, so let's make a copy for visibility */ if (alpha > 0.0) @@ -114,7 +112,6 @@ NSRenderableEntity::EvaluateEntity(void) SAVE_STATE(scale); SAVE_STATE(velocity); -#ifdef GS_RENDERFX if (ATTR_CHANGED(m_iRenderMode)) { SetSendFlags(RDENT_CHANGED_RENDERMODE); } @@ -132,12 +129,6 @@ NSRenderableEntity::EvaluateEntity(void) SAVE_STATE(m_iRenderFX); SAVE_STATE(m_vecRenderColor); SAVE_STATE(m_flRenderAmt); -#else - if (ATTR_CHANGED(alpha)) { - SetSendFlags(RDENT_CHANGED_ALPHA); - } - SAVE_STATE(alpha); -#endif } /* Make sure StartFrame calls this */ @@ -188,10 +179,8 @@ NSRenderableEntity::SendEntity(entity ePEnt, float fChanged) fChanged &= ~RDENT_CHANGED_SOLID; if (movetype == MOVETYPE_NONE) fChanged &= ~RDENT_CHANGED_MOVETYPE; -#ifdef GS_RENDERFX if (m_iRenderMode == RM_NORMAL) fChanged &= ~RDENT_CHANGED_RENDERMODE; -#endif } #endif @@ -263,7 +252,6 @@ NSRenderableEntity::SendEntity(entity ePEnt, float fChanged) WriteFloat(MSG_ENTITY, velocity[2]); } -#ifdef GS_RENDERFX if (fChanged & RDENT_CHANGED_RENDERMODE) { WriteByte(MSG_ENTITY, m_iRenderMode); WriteByte(MSG_ENTITY, m_iRenderFX); @@ -280,16 +268,11 @@ NSRenderableEntity::SendEntity(entity ePEnt, float fChanged) if (fChanged & RDENT_CHANGED_RENDERAMT) { WriteFloat(MSG_ENTITY, m_flRenderAmt); } -#else - if (fChanged & RDENT_CHANGED_ALPHA) { - WriteFloat(MSG_ENTITY, alpha); - } -#endif return (1); } #else -#ifdef GS_RENDERFX + /* ============ NSRenderableEntity::RenderFXPass @@ -362,6 +345,8 @@ NSRenderableEntity::RenderFXPass(void) alpha = (m_flRenderAmt == 0.0) ? 0.0f : 1.0f; break; case RM_ADDITIVE: + effects = EF_ADDITIVE; + break; case RM_ADDFRAC: /* TODO: Figure out what this does differently */ effects = EF_ADDITIVE; if (autocvar_rm_unlit_additive == 0) { @@ -389,6 +374,7 @@ NSRenderableEntity::RenderFXPass(void) case RM_DONTRENDER: /* prevent addentity() from being called */ alpha = 0.0f; + break; } switch (m_iRenderFX) { @@ -506,7 +492,7 @@ NSRenderableEntity::RenderFXPass(void) glowmod[0] = 1.0f; } } -#endif + /* ============ NSRenderableEntity::ReceiveEntity @@ -579,11 +565,11 @@ NSRenderableEntity::ReceiveEntity(float flNew, float flChanged) velocity[2] = readfloat(); } -#ifdef GS_RENDERFX if (flChanged & RDENT_CHANGED_RENDERMODE) { m_iRenderMode = readbyte(); m_iRenderFX = readbyte(); } + if (flChanged & RDENT_CHANGED_RENDERCOLOR) { m_vecRenderColor[0] = readfloat(); m_vecRenderColor[1] = readfloat(); @@ -592,20 +578,10 @@ NSRenderableEntity::ReceiveEntity(float flNew, float flChanged) glowmod[1] = readfloat(); glowmod[2] = readfloat(); } + if (flChanged & RDENT_CHANGED_RENDERAMT) { m_flRenderAmt = readfloat(); } -#else - if (flChanged & RDENT_CHANGED_ALPHA) { - alpha = readfloat(); - } -#endif - - if (modelindex) { - drawmask = MASK_ENGINE; - } else { - drawmask = 0; - } if (scale == 0.0) scale = 1.0f; @@ -640,7 +616,7 @@ NSRenderableEntity::RenderDebugSkeleton(void) /* ============ -NSEntity::predraw +NSRenderableEntity::predraw a lot of the things in here don't even apply to most entities, so TODO: make things like anims, sentences apply @@ -654,10 +630,7 @@ NSRenderableEntity::predraw(void) return (PREDRAW_NEXT); } -#ifdef GS_RENDERFX RenderFXPass(); -#endif - RenderDebugSkeleton(); if (serverkeyfloat(SERVERKEY_PAUSESTATE) != 1) @@ -685,14 +658,12 @@ NSRenderableEntity::predraw(void) void NSRenderableEntity::Respawn(void) { - NSEntity::Respawn(); + super::Respawn(); -#ifdef GS_RENDERFX SetRenderFX(m_oldiRenderFX); SetRenderMode(m_oldiRenderMode); SetRenderAmt(m_oldflRenderAmt); SetRenderColor(m_oldvecRenderColor); -#endif } void @@ -753,7 +724,6 @@ NSRenderableEntity::SetScale(float newScale) setsize(this, m_vecMins * scale, m_vecMaxs * scale); } -#ifdef GS_RENDERFX void NSRenderableEntity::SetRenderFX(float newFX) { @@ -786,30 +756,21 @@ NSRenderableEntity::SetRenderColor(vector newColor) m_vecRenderColor = newColor; } -#endif - #ifdef SERVER void NSRenderableEntity::Save(float handle) { + super::Save(handle); SaveInt(handle, "body", m_iBody); SaveFloat(handle, "frame", frame); SaveFloat(handle, "scale", scale); SaveFloat(handle, "skin", skin); SaveFloat(handle, "effects", effects); - -#ifndef GS_RENDERFX - SaveVector(handle, "color", colormod); - SaveFloat(handle, "alpha", alpha); -#else SaveFloat(handle, "renderamt", m_flRenderAmt); SaveVector(handle, "rendercolor", m_vecRenderColor); SaveFloat(handle, "rendermode", m_iRenderMode); SaveFloat(handle, "renderfx", m_iRenderFX); -#endif - - super::Save(handle); } void NSRenderableEntity::Restore(string strKey, string strValue) @@ -830,14 +791,6 @@ NSRenderableEntity::Restore(string strKey, string strValue) case "effects": effects = stof(strValue); break; -#ifndef GS_RENDERFX - case "color": - colormod = stov(strValue); - break; - case "alpha": - alpha = stof(strValue); - break; -#else case "renderamt": m_flRenderAmt = stof(strValue) / 255; break; @@ -850,7 +803,6 @@ NSRenderableEntity::Restore(string strKey, string strValue) case "renderfx": m_iRenderFX = stof(strValue); break; -#endif default: super::Restore(strKey, strValue); } @@ -861,18 +813,10 @@ NSRenderableEntity::Input(entity eAct, string strInput, string strData) { switch (strInput) { case "Color": -#ifdef GS_RENDERFX SetRenderColor(stov(strData) / 255); -#else - colormod = stov(strData) / 255; -#endif break; case "Alpha": -#ifdef GS_RENDERFX SetRenderAmt(stof(strData) / 255); -#else - alpha = stof(strData) / 255; -#endif break; case "DisableShadow": effects |= EF_NOSHADOW; @@ -881,7 +825,7 @@ NSRenderableEntity::Input(entity eAct, string strInput, string strData) effects &= ~EF_NOSHADOW; break; default: - NSEntity::Input(eAct, strInput, strData); + super::Input(eAct, strInput, strData); } } #endif @@ -910,36 +854,33 @@ NSRenderableEntity::SpawnKey(string strKey, string strValue) if (stof(strValue) == 1) { effects |= EF_NOSHADOW; } - case "color": -#ifdef GS_RENDERFX - m_vecRenderColor = stov(strValue); -#else - colormod = stov(strValue); -#endif break; - case "alpha": -#ifdef GS_RENDERFX - m_flRenderAmt = stof(strValue); -#else - alpha = stof(strValue); -#endif - break; -#ifdef GS_RENDERFX case "renderamt": m_flRenderAmt = stof(strValue) / 255; +#ifdef SERVER + m_oldflRenderAmt = m_flRenderAmt; +#endif break; case "rendercolor": m_vecRenderColor = stov(strValue) / 255; +#ifdef SERVER + m_oldvecRenderColor = m_vecRenderColor; +#endif break; case "rendermode": m_iRenderMode = stof(strValue); +#ifdef SERVER + m_oldiRenderMode = m_iRenderMode; +#endif break; case "renderfx": m_iRenderFX = stof(strValue); - break; +#ifdef SERVER + m_oldiRenderFX = m_iRenderFX; #endif + break; default: - NSEntity::SpawnKey(strKey, strValue); + super::SpawnKey(strKey, strValue); break; } } @@ -948,18 +889,8 @@ void NSRenderableEntity::NSRenderableEntity(void) { effects |= EF_NOSHADOW; - //scale = 1.0f; -#ifdef SERVER -#ifdef GS_RENDERFX - m_oldiRenderFX = m_iRenderFX; - m_oldiRenderMode = m_iRenderMode; - m_oldvecRenderColor = m_vecRenderColor; - m_oldflRenderAmt = m_flRenderAmt; - m_oldvecRenderColor = m_vecRenderColor; - m_oldflRenderAmt = m_flRenderAmt; -#endif -#else +#ifdef CLIENT drawmask = MASK_ENGINE; #endif } @@ -977,7 +908,5 @@ NSRenderableEntity_ReadEntity(bool new) fl = readfloat(); rend.ReceiveEntity(new, fl); - - //print(sprintf("rendent ent update: %d %x %d %v\n", self.entnum, fl, self.origin, vlen(self.velocity))); } #endif diff --git a/src/gs-entbase/shared/NSSurfacePropEntity.h b/src/gs-entbase/shared/NSSurfacePropEntity.h index c52eb7b6..cf5701e4 100644 --- a/src/gs-entbase/shared/NSSurfacePropEntity.h +++ b/src/gs-entbase/shared/NSSurfacePropEntity.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enumflags { @@ -29,13 +29,9 @@ enumflags SRFENT_CHANGED_BODY, SRFENT_CHANGED_SCALE, SRFENT_CHANGED_VELOCITY, -#ifdef GS_RENDERFX SRFENT_CHANGED_RENDERCOLOR, SRFENT_CHANGED_RENDERAMT, SRFENT_CHANGED_RENDERMODE, -#else - SRFENT_CHANGED_ALPHA, -#endif }; class NSSurfacePropEntity:NSRenderableEntity diff --git a/src/gs-entbase/shared/NSSurfacePropEntity.qc b/src/gs-entbase/shared/NSSurfacePropEntity.qc index 92da51c4..bccb367c 100644 --- a/src/gs-entbase/shared/NSSurfacePropEntity.qc +++ b/src/gs-entbase/shared/NSSurfacePropEntity.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void NSSurfacePropEntity::Spawned(void) @@ -89,7 +89,6 @@ NSSurfacePropEntity::EvaluateEntity(void) SAVE_STATE(scale); SAVE_STATE(velocity); -#ifdef GS_RENDERFX if (ATTR_CHANGED(m_iRenderMode)) { SetSendFlags(SRFENT_CHANGED_RENDERMODE); } @@ -107,12 +106,6 @@ NSSurfacePropEntity::EvaluateEntity(void) SAVE_STATE(m_iRenderFX); SAVE_STATE(m_vecRenderColor); SAVE_STATE(m_flRenderAmt); -#else - if (ATTR_CHANGED(alpha)) { - SetSendFlags(SRFENT_CHANGED_ALPHA); - } - SAVE_STATE(alpha); -#endif } /* Make sure StartFrame calls this */ @@ -157,10 +150,8 @@ NSSurfacePropEntity::SendEntity(entity ePEnt, float fChanged) fChanged &= ~SRFENT_CHANGED_SOLID; if (movetype == MOVETYPE_NONE) fChanged &= ~SRFENT_CHANGED_MOVETYPE; -#ifdef GS_RENDERFX if (m_iRenderMode == RM_NORMAL) fChanged &= ~SRFENT_CHANGED_RENDERMODE; -#endif } #endif @@ -225,7 +216,6 @@ NSSurfacePropEntity::SendEntity(entity ePEnt, float fChanged) WriteFloat(MSG_ENTITY, velocity[2]); } -#ifdef GS_RENDERFX if (fChanged & SRFENT_CHANGED_RENDERMODE) { WriteByte(MSG_ENTITY, m_iRenderMode); WriteByte(MSG_ENTITY, m_iRenderFX); @@ -242,11 +232,7 @@ NSSurfacePropEntity::SendEntity(entity ePEnt, float fChanged) if (fChanged & SRFENT_CHANGED_RENDERAMT) { WriteFloat(MSG_ENTITY, m_flRenderAmt); } -#else - if (fChanged & SRFENT_CHANGED_ALPHA) { - WriteFloat(MSG_ENTITY, alpha); - } -#endif + return (1); } @@ -318,7 +304,6 @@ NSSurfacePropEntity::ReceiveEntity(float flNew, float flChanged) velocity[2] = readfloat(); } -#ifdef GS_RENDERFX if (flChanged & SRFENT_CHANGED_RENDERMODE) { m_iRenderMode = readbyte(); m_iRenderFX = readbyte(); @@ -334,11 +319,6 @@ NSSurfacePropEntity::ReceiveEntity(float flNew, float flChanged) if (flChanged & SRFENT_CHANGED_RENDERAMT) { m_flRenderAmt = readfloat(); } -#else - if (flChanged & SRFENT_CHANGED_ALPHA) { - alpha = readfloat(); - } -#endif if (modelindex) { drawmask = MASK_ENGINE; diff --git a/src/gs-entbase/shared/NSTalkMonster.h b/src/gs-entbase/shared/NSTalkMonster.h index df7861f0..9a7a7cc2 100644 --- a/src/gs-entbase/shared/NSTalkMonster.h +++ b/src/gs-entbase/shared/NSTalkMonster.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* NPCs are more advanced than regular monsters in that they express emotions * and are able to interact more with the environment */ diff --git a/src/gs-entbase/shared/NSTalkMonster.qc b/src/gs-entbase/shared/NSTalkMonster.qc index 7391ca5f..1be4cf09 100644 --- a/src/gs-entbase/shared/NSTalkMonster.qc +++ b/src/gs-entbase/shared/NSTalkMonster.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifdef SERVER void @@ -655,7 +655,6 @@ NSTalkMonster::SendEntity(entity ePEnt, float fChanged) WriteFloat(MSG_ENTITY, velocity[2]); } -#ifdef GS_RENDERFX if (fChanged & BASEFL_CHANGED_RENDERMODE) { WriteByte(MSG_ENTITY, m_iRenderMode); WriteByte(MSG_ENTITY, m_iRenderFX); @@ -669,11 +668,6 @@ NSTalkMonster::SendEntity(entity ePEnt, float fChanged) if (fChanged & BASEFL_CHANGED_RENDERAMT) { WriteFloat(MSG_ENTITY, m_flRenderAmt); } -#else - if (fChanged & BASEFL_CHANGED_ALPHA) { - WriteFloat(MSG_ENTITY, alpha); - } -#endif return (1); } @@ -860,7 +854,6 @@ NSTalkMonster::ReceiveEntity(float flNew, float flChanged) velocity[2] = readfloat(); } -#ifdef GS_RENDERFX if (flChanged & BASEFL_CHANGED_RENDERMODE) { m_iRenderMode = readbyte(); m_iRenderFX = readbyte(); @@ -873,11 +866,6 @@ NSTalkMonster::ReceiveEntity(float flNew, float flChanged) if (flChanged & BASEFL_CHANGED_RENDERAMT) { m_flRenderAmt = readfloat(); } -#else - if (flChanged & BASEFL_CHANGED_ALPHA) { - alpha = readfloat(); - } -#endif if (modelindex) { drawmask = MASK_ENGINE; diff --git a/src/gs-entbase/shared/NSTrigger.h b/src/gs-entbase/shared/NSTrigger.h index 8fea1019..03e53061 100644 --- a/src/gs-entbase/shared/NSTrigger.h +++ b/src/gs-entbase/shared/NSTrigger.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* NSTrigger class is responsible for the legacy trigger architecture. In the future, NSEntity can be configured so that legacy @@ -68,4 +68,4 @@ enum TRIG_OFF, TRIG_ON, TRIG_TOGGLE -}; \ No newline at end of file +}; diff --git a/src/gs-entbase/shared/NSTrigger.qc b/src/gs-entbase/shared/NSTrigger.qc index a0cb6933..383308cf 100644 --- a/src/gs-entbase/shared/NSTrigger.qc +++ b/src/gs-entbase/shared/NSTrigger.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifdef SERVER /* legacy trigger architecture */ diff --git a/src/gs-entbase/shared/NSVehicle.h b/src/gs-entbase/shared/NSVehicle.h index c125a7e5..0d7a4ace 100644 --- a/src/gs-entbase/shared/NSVehicle.h +++ b/src/gs-entbase/shared/NSVehicle.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class NSVehicle:NSSurfacePropEntity { diff --git a/src/gs-entbase/shared/NSVehicle.qc b/src/gs-entbase/shared/NSVehicle.qc index 12393cd3..f9114fd8 100644 --- a/src/gs-entbase/shared/NSVehicle.qc +++ b/src/gs-entbase/shared/NSVehicle.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ bool NSVehicle::CanDriverCrouch(void) diff --git a/src/gs-entbase/shared/ambient_generic.qc b/src/gs-entbase/shared/ambient_generic.qc index 8763bbaa..10cfb2a5 100644 --- a/src/gs-entbase/shared/ambient_generic.qc +++ b/src/gs-entbase/shared/ambient_generic.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED ambient_generic (1 1 1) (-8 -8 -8) (8 8 8) AS_ARADIUS AS_SRADIUS AS_MRADIUS AS_LRADIUS AS_SILENT AS_NOTTOGGLED Plays a sound sample of whatever format the engine is configured to support. diff --git a/src/gs-entbase/shared/baseentity.h b/src/gs-entbase/shared/baseentity.h index 7a546f3a..bbe85692 100644 --- a/src/gs-entbase/shared/baseentity.h +++ b/src/gs-entbase/shared/baseentity.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifndef BASEENTITY #define BASEENTITY @@ -28,4 +28,5 @@ #include "NSMonster.h" #include "NSTalkMonster.h" #include "NSProjectile.h" +#include "env_sprite.h" #endif diff --git a/src/gs-entbase/shared/decals.qc b/src/gs-entbase/shared/decals.qc index 772251a1..299dd7e0 100644 --- a/src/gs-entbase/shared/decals.qc +++ b/src/gs-entbase/shared/decals.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var int autocvar_r_drawdecals = TRUE; var int autocvar_sp_decals = 128; diff --git a/src/gs-entbase/shared/env_bubbles.qc b/src/gs-entbase/shared/env_bubbles.qc index de41b8d1..7aa7d194 100644 --- a/src/gs-entbase/shared/env_bubbles.qc +++ b/src/gs-entbase/shared/env_bubbles.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_bubbles (1 0 0) ? BUBFL_STARTOFF Brush volume that emits rising bubbles. diff --git a/src/gs-entbase/shared/env_fog_controller.qc b/src/gs-entbase/shared/env_fog_controller.qc index 2f159a1a..f79bb17c 100644 --- a/src/gs-entbase/shared/env_fog_controller.qc +++ b/src/gs-entbase/shared/env_fog_controller.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_fog_controller (1 0 0) (-8 -8 -8) (8 8 8) EVFOGCTL_MASTER Textured light projected. This is the type of lighting that's used for @@ -66,7 +66,6 @@ enumflags class env_fog_controller:NSPointTrigger { - /* networked attributes */ PREDICTED_INT(m_iFogActive); PREDICTED_INT(m_iFogBlend); diff --git a/src/gs-entbase/shared/env_projectedtexture.qc b/src/gs-entbase/shared/env_projectedtexture.qc index 8cbb2e88..44922812 100644 --- a/src/gs-entbase/shared/env_projectedtexture.qc +++ b/src/gs-entbase/shared/env_projectedtexture.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED env_projectedtexture (1 0 0) (-8 -8 -8) (8 8 8) PRTEXSF_STARTON Textured light projected. This is the type of lighting that's used for diff --git a/src/gs-entbase/shared/env_sprite.h b/src/gs-entbase/shared/env_sprite.h new file mode 100644 index 00000000..6472c35b --- /dev/null +++ b/src/gs-entbase/shared/env_sprite.h @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + +enumflags +{ + SPRITE_CHANGED_ORIGIN, + SPRITE_CHANGED_MODELINDEX, + SPRITE_CHANGED_FRAMERATE, + SPRITE_CHANGED_SCALE, + SPRITE_CHANGED_RENDERMODE, + SPRITE_CHANGED_RENDERFX, + SPRITE_CHANGED_RENDERCOLOR, + SPRITE_CHANGED_RENDERAMT, + SPRITE_CHANGED_MATERIAL, +}; diff --git a/src/gs-entbase/shared/env_sprite.qc b/src/gs-entbase/shared/env_sprite.qc new file mode 100644 index 00000000..525073a0 --- /dev/null +++ b/src/gs-entbase/shared/env_sprite.qc @@ -0,0 +1,386 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + +/*QUAKED env_sprite (1 0 0) (-8 -8 -8) (8 8 8) ENVS_STARTON ENVS_PLAYONCE +A sprite entity manager with fancy overrides. + +-------- KEYS -------- +"targetname" : Name +"target" : Target when triggered. +"killtarget" : Target to kill when triggered. +"angles" : Sets the pitch, yaw and roll angles of the sprite. +"model" : Path to the sprite in question. +"rendercolor" : Color modifier of the sprite. +"renderamt" : Alpha modifier of the sprite. +"rendermode" : Render mode of the sprite. +"framerate" : Rate between frames in seconds. +"scale" : Scale modifier of the sprite. + +-------- SPAWNFLAGS -------- +ENVS_STARTON : Start visible. +ENVS_PLAYONCE : Play once from start to finish, then make invisible. + +-------- NOTES -------- +Only used with an external sprite format, like SPR, SPRHL and SPR32. + +-------- TRIVIA -------- +This entity was introduced in Half-Life (1998). +*/ + +enumflags +{ + ENVS_STARTON, + ENVS_PLAYONCE +}; + +class env_sprite:NSRenderableEntity +{ + bool m_iIsShader; + int m_iToggled; + float m_flEffects; + + PREDICTED_STRING(m_strMaterial); + PREDICTED_FLOAT(m_flFramerate); + +#ifdef CLIENT + int m_iMaxFrame; + bool m_bLoops; +#endif + + void(void) env_sprite; + + virtual void(bool) SetFramerate; + +#ifdef SERVER + virtual void(void) Spawned; + virtual void(entity, int) Trigger; + virtual void(void) EvaluateEntity; + virtual float(entity, float) SendEntity; + virtual void(string, string) SpawnKey; +#else + virtual float(void) predraw; + virtual void(void) think; + virtual void(float, float) ReceiveEntity; + virtual void(int) SetMaxFrame; + virtual void(bool) SetLoopFlag; +#endif +}; + +#ifdef SERVER +void +env_sprite::EvaluateEntity(void) +{ + if (ATTR_CHANGED(origin)) { + SetSendFlags(SPRITE_CHANGED_ORIGIN); + } + if (ATTR_CHANGED(modelindex)) { + SetSendFlags(SPRITE_CHANGED_MODELINDEX); + } + if (ATTR_CHANGED(m_flFramerate)) { + SetSendFlags(SPRITE_CHANGED_FRAMERATE); + } + if (ATTR_CHANGED(scale)) { + SetSendFlags(SPRITE_CHANGED_SCALE); + } + if (ATTR_CHANGED(m_iRenderMode)) { + SetSendFlags(SPRITE_CHANGED_RENDERMODE); + } + if (ATTR_CHANGED(m_vecRenderColor)) { + SetSendFlags(SPRITE_CHANGED_RENDERCOLOR); + } + if (ATTR_CHANGED(m_flRenderAmt)) { + SetSendFlags(SPRITE_CHANGED_RENDERAMT); + } + if (ATTR_CHANGED(m_strMaterial)) { + SetSendFlags(SPRITE_CHANGED_MATERIAL); + } + + SAVE_STATE(origin); + SAVE_STATE(modelindex); + SAVE_STATE(m_flFramerate); + SAVE_STATE(scale); + SAVE_STATE(m_iRenderMode); + SAVE_STATE(m_iRenderFX); + SAVE_STATE(m_vecRenderColor); + SAVE_STATE(m_flRenderAmt); + SAVE_STATE(m_strMaterial); +} + +float +env_sprite::SendEntity(entity ePEnt, float flFlags) +{ + if (clienttype(ePEnt) != CLIENTTYPE_REAL) + return (0); + + if (HasSpawnFlags(ENVS_PLAYONCE)) + return (0); + + /* Delete it on the client. */ + if (m_iToggled == FALSE) + return (0); + + WriteByte(MSG_ENTITY, ENT_SPRITE); + WriteFloat(MSG_ENTITY, flFlags); + + if (flFlags & SPRITE_CHANGED_ORIGIN) { + WriteCoord(MSG_ENTITY, origin[0]); + WriteCoord(MSG_ENTITY, origin[1]); + WriteCoord(MSG_ENTITY, origin[2]); + } + + if (flFlags & SPRITE_CHANGED_MODELINDEX) { + WriteFloat(MSG_ENTITY, modelindex); + } + if (flFlags & SPRITE_CHANGED_FRAMERATE) { + WriteFloat(MSG_ENTITY, m_flFramerate); + } + if (flFlags & SPRITE_CHANGED_SCALE) { + WriteFloat(MSG_ENTITY, scale); + } + if (flFlags & SPRITE_CHANGED_RENDERMODE) { + WriteByte(MSG_ENTITY, m_iRenderMode); + } + if (flFlags & SPRITE_CHANGED_RENDERFX) { + WriteByte(MSG_ENTITY, m_iRenderFX); + } + if (flFlags & SPRITE_CHANGED_RENDERCOLOR) { + WriteFloat(MSG_ENTITY, m_vecRenderColor[0]); + WriteFloat(MSG_ENTITY, m_vecRenderColor[1]); + WriteFloat(MSG_ENTITY, m_vecRenderColor[2]); + } + if (flFlags & SPRITE_CHANGED_RENDERAMT) { + WriteFloat(MSG_ENTITY, m_flRenderAmt); + } + if (flFlags & SPRITE_CHANGED_MATERIAL) { + WriteString(MSG_ENTITY, m_strMaterial); + } + + return (1); +} + +void +env_sprite::NetworkOnce(void) +{ + WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); + WriteByte(MSG_MULTICAST, EV_SPRITE); + WriteCoord(MSG_MULTICAST, origin[0]); + WriteCoord(MSG_MULTICAST, origin[1]); + WriteCoord(MSG_MULTICAST, origin[2]); + WriteFloat(MSG_MULTICAST, modelindex); + WriteFloat(MSG_MULTICAST, m_flFramerate); + WriteFloat(MSG_MULTICAST, scale); + WriteByte(MSG_MULTICAST, m_iRenderMode); + WriteByte(MSG_MULTICAST, m_iRenderFX); + WriteFloat(MSG_MULTICAST, m_vecRenderColor[0]); + WriteFloat(MSG_MULTICAST, m_vecRenderColor[1]); + WriteFloat(MSG_MULTICAST, m_vecRenderColor[2]); + WriteFloat(MSG_MULTICAST, m_flRenderAmt); + WriteString(MSG_MULTICAST, m_strMaterial); + + msg_entity = this; + multicast(origin, MULTICAST_PVS); +} + +/* TODO: Implement state */ +void +env_sprite::Trigger(entity act, int state) +{ + if (HasSpawnFlags(ENVS_PLAYONCE)) { + NetworkOnce(); + } else { + m_iToggled = 1 - m_iToggled; + SendFlags = 1; + } +} + +void +env_sprite::SpawnKey(string strKey, string strValue) +{ + switch (strKey) { + case "shader": + case "material": + m_strMaterial = strValue; + break; + case "framerate": + m_flFramerate = stof(strValue); + break; + default: + super::SpawnKey(strKey, strValue); + } +} + +void +env_sprite::Spawned(void) +{ + super::Spawned(); + + m_iToggled = (HasSpawnFlags(ENVS_STARTON) > 0) ? TRUE : FALSE; + + /* how pointless this would be otherwise. */ + if (!targetname) + m_iToggled = TRUE; +} +#else +float +env_sprite::predraw(void) +{ + if (m_strMaterial == __NULL__) { + return super::predraw(); + } + + int s = (float)getproperty(VF_ACTIVESEAT); + pSeat = &g_seats[s]; + vector vecPlayer = pSeat->m_vecPredictedOrigin; + makevectors(view_angles); + makevectors(vectoangles(origin - vecPlayer)); + vector forg = origin + (v_forward * -16); + vector fsize = [64,64]; + + traceline(origin, vecPlayer, MOVE_WORLDONLY, this); + + if (trace_fraction < 1.0) + return (PREDRAW_NEXT); + + R_BeginPolygon(m_strMaterial, 1, 0); + R_PolygonVertex(forg + v_right * fsize[0] - v_up * fsize[1], + [1,1], m_vecRenderColor, 1.0); + R_PolygonVertex(forg - v_right * fsize[0] - v_up * fsize[1], + [0,1], m_vecRenderColor, 1.0); + R_PolygonVertex(forg - v_right * fsize[0] + v_up * fsize[1], + [0,0], m_vecRenderColor, 1.0); + R_PolygonVertex(forg + v_right * fsize[0] + v_up * fsize[1], + [1,0], m_vecRenderColor, 1.0); + R_EndPolygon(); + + addentity(this); + + return (PREDRAW_NEXT); +} + +void +env_sprite::think(void) +{ + if (frame >= (m_iMaxFrame-1)) { + if (m_bLoops == 0) { + Destroy(); + return; + } else { + frame = 0; + } + } else { + frame += 1; + } + + nextthink = time + (1 / m_flFramerate); +} + +void +env_sprite::ReceiveEntity(float flNew, float flFlags) +{ + if (flFlags & SPRITE_CHANGED_ORIGIN) { + origin[0] = readcoord(); + origin[1] = readcoord(); + origin[2] = readcoord(); + } + if (flFlags & SPRITE_CHANGED_MODELINDEX) { + modelindex = readfloat(); + } + if (flFlags & SPRITE_CHANGED_FRAMERATE) { + m_flFramerate = readfloat(); + } + if (flFlags & SPRITE_CHANGED_SCALE) { + scale = readfloat(); + } + if (flFlags & SPRITE_CHANGED_RENDERMODE) { + m_iRenderMode = readbyte(); + } + if (flFlags & SPRITE_CHANGED_RENDERFX) { + m_iRenderFX = readbyte(); + } + if (flFlags & SPRITE_CHANGED_RENDERCOLOR) { + m_vecRenderColor[0] = readfloat(); + m_vecRenderColor[1] = readfloat(); + m_vecRenderColor[2] = readfloat(); + } + if (flFlags & SPRITE_CHANGED_RENDERAMT) { + m_flRenderAmt = readfloat(); + } + if (flFlags & SPRITE_CHANGED_MATERIAL) { + m_strMaterial = readstring(); + } + + drawmask = MASK_ENGINE; + nextthink = time + (1 / m_flFramerate); + m_iMaxFrame = modelframecount(modelindex); + m_bLoops = 1; /* repeats */ + setorigin(this, origin); +} + +void +env_sprite::SetMaxFrame(int fr) +{ + m_iMaxFrame = fr; +} + +void +env_sprite::SetLoopFlag(bool loops) +{ + m_bLoops = loops; +} +#endif + + +void +env_sprite::SetFramerate(bool flag) +{ + +} + +void +env_sprite::env_sprite(void) +{ + m_iIsShader = false; + m_flFramerate = 10; + m_strMaterial = __NULL__; + scale = 1.0f; +} + +#ifdef CLIENT +void +EnvSprite_ParseEvent(void) +{ + env_sprite spr = spawn(env_sprite); + spr.origin[0] = readcoord(); + spr.origin[1] = readcoord(); + spr.origin[2] = readcoord(); + spr.modelindex = readfloat(); + spr.m_flFramerate = readfloat(); + spr.scale = readfloat(); + spr.m_iRenderMode = readbyte(); + spr.m_iRenderFX = readbyte(); + spr.m_vecRenderColor[0] = readfloat(); + spr.m_vecRenderColor[1] = readfloat(); + spr.m_vecRenderColor[2] = readfloat(); + spr.m_flRenderAmt = readfloat(); + spr.m_strMaterial = readstring(); + + spr.drawmask = MASK_ENGINE; + spr.nextthink = time + (1 / spr.m_flFramerate); + spr.m_iMaxFrame = modelframecount(spr.modelindex); + spr.m_bLoops = 0; /* does not repeat */ + setorigin(spr, spr.origin); +} +#endif diff --git a/src/gs-entbase/shared/func_friction.qc b/src/gs-entbase/shared/func_friction.qc index b99cba18..c10e3612 100644 --- a/src/gs-entbase/shared/func_friction.qc +++ b/src/gs-entbase/shared/func_friction.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_friction (0 .5 .8) ? Volume that permanently adds a modifier that affects an entities' friction. diff --git a/src/gs-entbase/shared/func_illusionary.qc b/src/gs-entbase/shared/func_illusionary.qc index f18da357..ed20df5e 100644 --- a/src/gs-entbase/shared/func_illusionary.qc +++ b/src/gs-entbase/shared/func_illusionary.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_illusionary (0 .5 .8) ? Brush that lets light to pass through it and is non-solid. diff --git a/src/gs-entbase/shared/func_ladder.qc b/src/gs-entbase/shared/func_ladder.qc index b8838cd0..3731747c 100644 --- a/src/gs-entbase/shared/func_ladder.qc +++ b/src/gs-entbase/shared/func_ladder.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_ladder (0 .5 .8) ? Ladder volume. Climb up ladders with this one simple brush. @@ -29,29 +29,14 @@ func_ladder:NSRenderableEntity { void(void) func_ladder; -#ifdef SERVER virtual void(void) Respawn; - virtual float(entity, float) SendEntity; + +#ifdef SERVER virtual void(entity, int) Trigger; -#else - virtual float() predraw; - virtual void(void) Init; #endif }; #ifdef SERVER -/* we're overriding SendEntity so that we don't network func_walls - * without a targetname. They'll never experience gameplay changes - * and therefore can be handled fully client-side */ -float -func_ladder::SendEntity(entity pvsent, float fl) -{ - if (targetname) - return super::SendEntity(pvsent, fl); - else - return (0); -} - void func_ladder::Trigger(entity act, int state) { @@ -66,13 +51,11 @@ func_ladder::Trigger(entity act, int state) SetFrame(1 - frame); } } +#endif void func_ladder::Respawn(void) { - /* reset the visual parameters */ - super::Respawn(); - /* func_ladder specifics */ SetMovetype(MOVETYPE_NONE); SetSolid(SOLID_BSP); @@ -80,51 +63,8 @@ func_ladder::Respawn(void) SetModel(GetSpawnModel()); SetOrigin(GetSpawnOrigin()); SetFrame(0); - ClearAngles(); - -#ifdef GS_RENDERFX SetRenderMode(RM_TRIGGER); -#endif } -#else -float -func_ladder::predraw(void) -{ - vector vecPlayer; - - int s = (float)getproperty(VF_ACTIVESEAT); - pSeat = &g_seats[s]; - vecPlayer = pSeat->m_vecPredictedOrigin; - - if (checkpvs(vecPlayer, this) == FALSE) { - return (PREDRAW_NEXT); - } - - super::predraw(); - addentity(self); - return (PREDRAW_NEXT); -} - -void -func_ladder::Init(void) -{ - super::Init(); - - /* this entity is being controlled by the server, remove it */ - if (targetname) { - Destroy(); - return; - } - - precache_model(model); - setmodel(this, model); - setorigin(this, origin); - movetype = MOVETYPE_NONE; - solid = SOLID_BSP; - skin = CONTENT_LADDER; - angles = [0,0,0]; -} -#endif void func_ladder::func_ladder(void) diff --git a/src/gs-entbase/shared/func_monitor.qc b/src/gs-entbase/shared/func_monitor.qc index 527bb4d3..3ce5a113 100644 --- a/src/gs-entbase/shared/func_monitor.qc +++ b/src/gs-entbase/shared/func_monitor.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_monitor (0 .5 .8) ? A monitor that renders the view of a linked point_camera entity. diff --git a/src/gs-entbase/shared/func_tankmortar.qc b/src/gs-entbase/shared/func_tankmortar.qc index 34f079d6..d8a67d87 100644 --- a/src/gs-entbase/shared/func_tankmortar.qc +++ b/src/gs-entbase/shared/func_tankmortar.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_tankmortar (0 .5 .8) ? A mountable tank mortar turret type entity. A player (or NPC) can interact with diff --git a/src/gs-entbase/shared/func_wall.qc b/src/gs-entbase/shared/func_wall.qc index 93602660..12cbaca1 100644 --- a/src/gs-entbase/shared/func_wall.qc +++ b/src/gs-entbase/shared/func_wall.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED func_wall (0 .5 .8) ? Brush that lets light to pass through it. diff --git a/src/gs-entbase/shared/info_particle_system.qc b/src/gs-entbase/shared/info_particle_system.qc index bfbfa009..29682c9b 100644 --- a/src/gs-entbase/shared/info_particle_system.qc +++ b/src/gs-entbase/shared/info_particle_system.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED info_particle_system (1 0 0) (-8 -8 -8) (8 8 8) PSFL_STARTACTIVE An entity that's spawns particles from the engine's particle system. diff --git a/src/gs-entbase/shared/light_dynamic.qc b/src/gs-entbase/shared/light_dynamic.qc index 3953af3b..f9ecd6c6 100644 --- a/src/gs-entbase/shared/light_dynamic.qc +++ b/src/gs-entbase/shared/light_dynamic.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED light_dynamic (1 0 0) (-8 -8 -8) (8 8 8) Dynamic light entity. Can be parented to things, it even has some inputs that @@ -223,7 +223,7 @@ light_dynamic::RendererRestarted(void) { OnRemoveEntity(); m_light = dynamiclight_spawnstatic(origin, m_flDistance, m_vecLight); - LightChanged(0xFFFFFFFF); + LightChanged(0xFFFFFF); } #else void diff --git a/src/gs-entbase/shared/prop_physics_multiplayer.qc b/src/gs-entbase/shared/prop_physics_multiplayer.qc index fdc35383..86e01b16 100644 --- a/src/gs-entbase/shared/prop_physics_multiplayer.qc +++ b/src/gs-entbase/shared/prop_physics_multiplayer.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED prop_physics_multiplayer (0 0 0.8) (-16 -16 -16) (16 16 16) PRPPHYS_ASLEEP Physics prop that is optimised for netplay. diff --git a/src/gs-entbase/shared/prop_rope.qc b/src/gs-entbase/shared/prop_rope.qc index 368a0196..1f1787bd 100644 --- a/src/gs-entbase/shared/prop_rope.qc +++ b/src/gs-entbase/shared/prop_rope.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED prop_rope (1 1 0.5) (-8 -8 -8) (8 8 8) ROPE_VERTICAL Client-side decorative rope entity. diff --git a/src/gs-entbase/shared/prop_vehicle_driveable.qc b/src/gs-entbase/shared/prop_vehicle_driveable.qc index 34d2adb6..7e9f5537 100644 --- a/src/gs-entbase/shared/prop_vehicle_driveable.qc +++ b/src/gs-entbase/shared/prop_vehicle_driveable.qc @@ -1,919 +1,919 @@ -/* - * 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 - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER - * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/*QUAKED prop_vehicle_driveable (0 0 1) (-50 -50 0) (50 50 70) -Point entity defining a 4-wheel vehicle that you can drive. - --------- KEYS -------- -"targetname" : Name - --------- SPAWNFLAGS -------- - - --------- NOTES -------- - - --------- TRIVIA -------- -This entity was introduced in Half-Life 2 (2004). -*/ - -#define VEH_SKIDDING FL_USE_RELEASED - -#define VEHSF_NOFLIP 2048 - -enumflags -{ - VEHFL_DRIVER, - VEHFL_MODELINDEX, - VEHFL_ORIGIN, - VEHFL_ANGLES, - VEHFL_VELOCITY, - VEHFL_TURNING, - VEHFL_FLAGS -}; - -class prop_vehicle_driveable_wheel -{ - void() prop_vehicle_driveable_wheel; - float m_flSuspension; - float m_flSuspensionForce; - -#ifdef CLIENT - - vector origin_net; - vector velocity_net; - vector angles_net; - virtual void(void) PredictPreFrame; - virtual void(void) PredictPostFrame; -#endif - - virtual void(float) UpdateSuspension; - virtual void(float) Move; - virtual void(vector) Bounce; - virtual void(float, float m_flTurn) Accel; - virtual void(float, float) Physics; -}; - -class prop_vehicle_driveable:NSVehicle -{ - /* map-entity fields */ - float m_flBounceFactor; - float m_flAcceleration; - float m_flSkidSpeed; - float m_flTraction; - float m_flBreakFactor; - float m_flSteerFactor; - float m_flStraightenFactor; - vector m_vecGravityDir; - float m_flTimeLength; - vector m_vecSeatOffest; - - /* collision boxes */ - NSEntity m_eCollBox1; - NSEntity m_eCollBox2; - - prop_vehicle_driveable_wheel m_wlFL; - prop_vehicle_driveable_wheel m_wlFR; - prop_vehicle_driveable_wheel m_wlBL; - prop_vehicle_driveable_wheel m_wlBR; - vector m_vecControlMins; - vector m_vecControlMaxs; - PREDICTED_FLOAT(m_flTurn); - - float m_flBRWheelAxel; - float m_flBLWheelAxel; - float m_flFLWheelAxel; - float m_flFRWheelAxel; - - float m_flUseTime; - - void(void) prop_vehicle_driveable; - - virtual void(void) Spawned; - virtual void(void) Physics; - virtual void(void) RunVehiclePhysics; - virtual void(void) WeaponInput; - virtual void(void) PlayerInput; - virtual void(void) OnRemoveEntity; - -#ifdef CLIENT - virtual bool(void) HideViewWeapon; - virtual void(void) PredictPreFrame; - virtual void(void) PredictPostFrame; - virtual void(float, float) ReceiveEntity; - virtual void(void) UpdateView; -#else - virtual void(void) Respawn; - virtual void(void) OnPlayerUse; - virtual void(void) EvaluateEntity; - virtual float(entity, float) SendEntity; -#endif -}; - -#ifdef CLIENT -bool -prop_vehicle_driveable::HideViewWeapon(void) -{ - return true; -} -#endif - -void -prop_vehicle_driveable::Physics(void) -{ -#ifdef CLIENT - DriverRelink(); -#endif - - /* if nobody is in the car, we need to run physics here - * with fake input frames */ - if (GetDriver() == __NULL__) { -#ifdef SERVER - m_flTimeLength = frametime; - m_vecMoveValues = [0,0,0]; - m_iMoveButtons = 0; - RunVehiclePhysics(); -#else - setorigin(this, origin); -#endif - } else { - //crossprint(sprintf("Driver: %s\n", GetDriver().classname)); - } - -#ifdef SERVER - /* support for think/nextthink */ - if (think && nextthink > 0.0f) { - if (nextthink < time) { - nextthink = 0.0f; - think(); - } - } -#endif -} - -void -prop_vehicle_driveable::OnRemoveEntity(void) -{ - remove(m_wlFL); - remove(m_wlFR); - remove(m_wlBL); - remove(m_wlBR); - remove(m_eCollBox1); - remove(m_eCollBox2); -} - -#ifdef CLIENT -void -prop_vehicle_driveable::UpdateView(void) -{ - vector vecStart, vecEnd; - - pSeat->m_vecPredictedOrigin = origin; - makevectors(view_angles); - vecStart = [pSeat->m_vecPredictedOrigin[0], pSeat->m_vecPredictedOrigin[1], pSeat->m_vecPredictedOrigin[2] + 16] + (v_right * 4); - vecEnd = vecStart + (v_forward * -256) + [0,0,16] + (v_right * 4); - other = world; - traceline(vecStart, vecEnd, MOVE_OTHERONLY, this); - setproperty(VF_ORIGIN, trace_endpos + (v_forward * 16)); -} - -void -prop_vehicle_driveable_wheel::PredictPreFrame(void) -{ - SAVE_STATE(angles); - SAVE_STATE(origin); - SAVE_STATE(velocity); -} - -void -prop_vehicle_driveable_wheel::PredictPostFrame(void) -{ - ROLL_BACK(angles); - ROLL_BACK(origin); - ROLL_BACK(velocity); -} -#endif - -void -prop_vehicle_driveable_wheel::Bounce(vector normal) -{ - prop_vehicle_driveable vehParent; - vehParent = (prop_vehicle_driveable)owner; - - vector vecBounce = (velocity * normal) * normal * vehParent.m_flBounceFactor; - velocity -= vecBounce; - vehParent.velocity = velocity; - -#ifdef SERVER - float flStregth = vlen((velocity * normal) * normal); - - if (flStregth > 96) { - Sound_Play(vehParent, CHAN_VOICE, "prop_vehicle_driveable.bounce"); - } -#endif -} - -void -prop_vehicle_driveable_wheel::Move(float flTimeLength) -{ - vector vecDest; - vector vecSavedNormal; - float flStepped; - float flMovetime; - int i; - - /* have a few attempts */ - for (i = 3, flMovetime = flTimeLength; flMovetime > 0 && i; i--) { - vecDest = origin + (velocity * flMovetime); - tracebox(origin, mins, maxs, vecDest, MOVE_NOMONSTERS, this); - - if (trace_startsolid) { - continue; - } - - origin = trace_endpos; - - if (trace_fraction < 1) { - vecSavedNormal = trace_plane_normal; - flMovetime -= flMovetime * trace_fraction; - - if (flMovetime) { - float roof_fraction; - vector roof_plane_normal; - - /* step up if we can */ - trace_endpos = origin; - trace_endpos[2] += 8; - - tracebox(origin, mins, maxs, trace_endpos, MOVE_NOMONSTERS, this); - flStepped = trace_endpos[2] - origin[2]; - - roof_fraction = trace_fraction; - roof_plane_normal = trace_plane_normal; - - vecDest = trace_endpos + velocity * flMovetime; - - /* only horizontally */ - vecDest[2] = trace_endpos[2]; - - /* move forwards */ - tracebox(trace_endpos, mins, maxs, vecDest, MOVE_NOMONSTERS, this); - - /* if we got anywhere, make this raised-step move count */ - if (trace_fraction != 0) { - float fwfrac; - vector fwplane; - - fwfrac = trace_fraction; - fwplane = trace_plane_normal; - - /* move down */ - vecDest = trace_endpos; - vecDest[2] -= flStepped + 1; - tracebox(trace_endpos, mins, maxs, vecDest, MOVE_NOMONSTERS, this); - - if (trace_fraction < 1 && trace_plane_normal[2] > 0.7f) { - flMovetime -= flMovetime * fwfrac; - - if (roof_fraction < 1) { - Bounce(roof_plane_normal); - } - - /* FIXME: do we need velocity < 0? */ - if (trace_fraction < 1) { - Bounce(trace_plane_normal); - } else if (fwfrac < 1) { - Bounce(fwplane); - } - - origin = trace_endpos; - continue; - } - } - } - - /* stepping failed, assume crash? */ - if (trace_ent == world) { - if (vlen(velocity) > 300) { - float impact; - impact = -dotproduct(trace_plane_normal, velocity); - int iImpactDamage = impact / 100; - } - } - - Bounce(vecSavedNormal); - /* Physics_DoTouch(this, trace_ent); */ - } else { - break; - } - } -} - -void -prop_vehicle_driveable_wheel::Accel(float flMoveTime, float m_flTurn) -{ - prop_vehicle_driveable vehParent; - entity eDriver; - float flTraction; - vector vecAngle; - - vehParent = (prop_vehicle_driveable)owner; - eDriver = vehParent.m_eDriver; - vecAngle = vehParent.angles; - - makevectors(vecAngle); - - if (m_flTurn) { - /* cripple turnrate by our current velocity */ - float turnbreak = bound(0, vlen(velocity), 100) * 0.5; - - /* rotates v_forward */ - rotatevectorsbyangle([ 0, m_flTurn * turnbreak, 0]); - } - - tracebox(origin, mins, maxs, origin - v_up, MOVE_NOMONSTERS, owner); - - /* allow a range, for 1qu's worth of spare tyre pressure. or something */ - flTraction = 1 - trace_fraction; - - /* air friction, doubles up for general rolling friction, ish */ - velocity *= 1 - flMoveTime * 0.1; - - if (flTraction) { - if (eDriver) { - velocity += v_forward * bound(-1, vehParent.m_vecMoveValues[0] / 400, 1) * vehParent.m_flAcceleration * flMoveTime * flTraction; - } - - /* test if this car is skidding */ - float skid = (velocity * v_right); - if ( fabs(skid) > vehParent.m_flSkidSpeed ) { - vehParent.flags |= VEH_SKIDDING; - } - - /* nuke sideways velocity. if a wheel is off the ground this probably - means that it'll be pushed further. players should try not to roll - too much. */ - /* FIXME: push opposite wheel up slightly to model chassis momentum - not slowing as much as the wheel itself (zomg: race conditions!) */ - velocity -= (velocity * v_right) * v_right * vehParent.m_flTraction * flMoveTime * flTraction; - - if (!eDriver || (vehParent.m_iMoveButtons & INPUT_BUTTON2 || vehParent.m_vecMoveValues[2] > 0)) { - vector t; - - /* empty cars are assumed to have their brakes on. - nuke forward velocity. if a wheel is off the ground this probably - means that it'll be pushed further. players should try not to - roll too much. - - Note: really we ought to be applying some axel friction even - when not breaking, but we'll just depend on air friction for - that. */ - velocity -= (velocity * v_forward) * v_forward * vehParent.m_flBreakFactor * flMoveTime * flTraction; - - /* if break is on, nuke the final part of the velocity, so we can - become truely motionless.*/ - t = velocity - velocity * dotproduct(velocity, vehParent.m_vecGravityDir); - if (vlen(t) < 15) { - velocity -= t; - } - - /* don't bother with gravity if we're already on the ground and - breaking. this avoids weird slides. */ - if (!trace_fraction && trace_plane_normal * vehParent.m_vecGravityDir < -0.7f) { - return; - } - } - } - - /* apply gravity */ - velocity += vehParent.m_vecGravityDir * flMoveTime * serverkeyfloat("phy_gravity") * trace_fraction; - - tracebox(origin, mins * 4.0, maxs * 4.0, origin, MOVE_NORMAL, owner); - if (trace_ent && trace_ent != vehParent.m_eDriver) { - int iImpactDamage = vlen(velocity) / 10; - - if (iImpactDamage > 10) { - trace_ent.velocity = velocity * 2.0 + [0,0,500]; - velocity *= 0.25f; -#ifdef SERVER - if (trace_ent.takedamage) { - NSSurfacePropEntity foo = (NSSurfacePropEntity)trace_ent; - Damage_Apply(foo, vehParent.m_eDriver, iImpactDamage, 0, DMG_VEHICLE); - //print(sprintf("Delivering %i impact damage\n", iImpactDamage)); - } -#endif - } - } -} - -void -prop_vehicle_driveable_wheel::UpdateSuspension(float flTimeLength) -{ - float flDamp; - float flForce; - - if (fabs(m_flSuspension) > 0.001 || fabs(m_flSuspensionForce) > 0.001) { - m_flSuspension += m_flSuspensionForce * flTimeLength; - - flForce = bound(0, flTimeLength * 65, 2); - flDamp = 1 - (flTimeLength * 4); - if (flDamp < 0) { - flDamp = 0; - } - m_flSuspensionForce *= flDamp; - m_flSuspensionForce -= m_flSuspension * flForce; - m_flSuspension = bound(-15, m_flSuspension, 15); - } -} - -void -prop_vehicle_driveable_wheel::Physics(float turnrate, float flTimeLength) -{ - vector owner_pos; - - /* try to correct the wheel's position, in case it got stuck */ - owner_pos = owner.origin + (owner.mins + owner.maxs) * 0.5f; - tracebox(owner_pos, mins, maxs, origin, MOVE_NORMAL, owner); - setorigin(this, trace_endpos); - - /* see if we're in-air */ - other = world; - tracebox(origin, mins, maxs, origin - [0,0,1], MOVE_OTHERONLY, this); - if (!trace_startsolid) { - if ((trace_fraction < 1) && (trace_plane_normal[2] > 0.7)) { - flags |= FL_ONGROUND; - } else { - flags &= ~FL_ONGROUND; - m_flSuspensionForce += flTimeLength * 200.0; - } - } - - Accel(flTimeLength / 2, turnrate); - Move(flTimeLength); - Accel(flTimeLength / 2, turnrate); - UpdateSuspension(flTimeLength); - //print(sprintf("suspension: %d, force: %d\n", m_flSuspension, m_flSuspensionForce)); -} - -void -prop_vehicle_driveable_wheel::prop_vehicle_driveable_wheel(void) -{ - mins = [-8,-8,-35]; - maxs = [8,8,8]; - hitcontentsmaski = CONTENTBIT_BODY | CONTENTBITS_POINTSOLID | CONTENTBIT_VEHICLECLIP; -} - -#ifdef CLIENT -void -prop_vehicle_driveable::PredictPreFrame(void) -{ - SAVE_STATE(modelindex); - SAVE_STATE(origin); - SAVE_STATE(angles); - SAVE_STATE(velocity); - SAVE_STATE(m_flTurn); - SAVE_STATE(flags); - SAVE_STATE(driver_entnum); - - m_wlFL.PredictPreFrame(); - m_wlFR.PredictPreFrame(); - m_wlBL.PredictPreFrame(); - m_wlBR.PredictPreFrame(); -} - -void -prop_vehicle_driveable::PredictPostFrame(void) -{ - ROLL_BACK(modelindex); - ROLL_BACK(angles); - ROLL_BACK(origin); - ROLL_BACK(velocity); - ROLL_BACK(m_flTurn); - ROLL_BACK(flags); - ROLL_BACK(driver_entnum); - - m_wlFL.PredictPostFrame(); - m_wlFR.PredictPostFrame(); - m_wlBL.PredictPostFrame(); - m_wlBR.PredictPostFrame(); -} -#endif - -void -prop_vehicle_driveable::WeaponInput(void) -{ - -} - -void -prop_vehicle_driveable::PlayerInput(void) -{ - m_vecMoveValues = input_movevalues; - m_iMoveButtons = input_buttons; - m_flTimeLength = input_timelength; - - /* prediction frame... */ - RunVehiclePhysics(); - -#ifdef SERVER - /* allow us to exit */ - if (m_flUseTime < time) { - if (input_buttons & INPUT_BUTTON5) { - eActivator = m_eDriver; - OnPlayerUse(); - input_buttons &= ~INPUT_BUTTON5; - } - } -#endif - - WeaponInput(); - - /* only allow use key */ - input_buttons = (input_buttons & INPUT_BUTTON5); -} - -void -prop_vehicle_driveable::RunVehiclePhysics(void) -{ -#if SERVER - /* eject the dead */ - if (m_eDriver && m_eDriver.health <= 0) { - PlayerLeave((NSClientPlayer)m_eDriver); - } -#endif - - if (m_eDriver) { - float y; - - y = m_vecMoveValues[1]; - y = bound(-200, y, 200) / 200; - y *= m_flSteerFactor; - - if (y) { - if (y < 0 && m_flTurn < 0) { - m_flTurn = 0.0f; - } else if (y > 0 && m_flTurn > 0) { - m_flTurn = 0.0f; - } else { - m_flTurn = bound(-1, m_flTurn - y * m_flTimeLength, 1); - } - } else { - /* straighten wheels forward over time */ - if (m_flTurn < 0) { - m_flTurn = min(0, m_flTurn + m_flTimeLength * m_flStraightenFactor); - } else if (m_flTurn > 0) { - m_flTurn = max(0, m_flTurn - m_flTimeLength * m_flStraightenFactor); - } - } - - PlayerUpdateFlags(); - } - - if (spawnflags & VEHSF_NOFLIP) { +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + +/*QUAKED prop_vehicle_driveable (0 0 1) (-50 -50 0) (50 50 70) +Point entity defining a 4-wheel vehicle that you can drive. + +-------- KEYS -------- +"targetname" : Name + +-------- SPAWNFLAGS -------- + + +-------- NOTES -------- + + +-------- TRIVIA -------- +This entity was introduced in Half-Life 2 (2004). +*/ + +#define VEH_SKIDDING FL_USE_RELEASED + +#define VEHSF_NOFLIP 2048 + +enumflags +{ + VEHFL_DRIVER, + VEHFL_MODELINDEX, + VEHFL_ORIGIN, + VEHFL_ANGLES, + VEHFL_VELOCITY, + VEHFL_TURNING, + VEHFL_FLAGS +}; + +class prop_vehicle_driveable_wheel +{ + void() prop_vehicle_driveable_wheel; + float m_flSuspension; + float m_flSuspensionForce; + +#ifdef CLIENT + + vector origin_net; + vector velocity_net; + vector angles_net; + virtual void(void) PredictPreFrame; + virtual void(void) PredictPostFrame; +#endif + + virtual void(float) UpdateSuspension; + virtual void(float) Move; + virtual void(vector) Bounce; + virtual void(float, float m_flTurn) Accel; + virtual void(float, float) Physics; +}; + +class prop_vehicle_driveable:NSVehicle +{ + /* map-entity fields */ + float m_flBounceFactor; + float m_flAcceleration; + float m_flSkidSpeed; + float m_flTraction; + float m_flBreakFactor; + float m_flSteerFactor; + float m_flStraightenFactor; + vector m_vecGravityDir; + float m_flTimeLength; + vector m_vecSeatOffest; + + /* collision boxes */ + NSEntity m_eCollBox1; + NSEntity m_eCollBox2; + + prop_vehicle_driveable_wheel m_wlFL; + prop_vehicle_driveable_wheel m_wlFR; + prop_vehicle_driveable_wheel m_wlBL; + prop_vehicle_driveable_wheel m_wlBR; + vector m_vecControlMins; + vector m_vecControlMaxs; + PREDICTED_FLOAT(m_flTurn); + + float m_flBRWheelAxel; + float m_flBLWheelAxel; + float m_flFLWheelAxel; + float m_flFRWheelAxel; + + float m_flUseTime; + + void(void) prop_vehicle_driveable; + + virtual void(void) Spawned; + virtual void(void) Physics; + virtual void(void) RunVehiclePhysics; + virtual void(void) WeaponInput; + virtual void(void) PlayerInput; + virtual void(void) OnRemoveEntity; + +#ifdef CLIENT + virtual bool(void) HideViewWeapon; + virtual void(void) PredictPreFrame; + virtual void(void) PredictPostFrame; + virtual void(float, float) ReceiveEntity; + virtual void(void) UpdateView; +#else + virtual void(void) Respawn; + virtual void(void) OnPlayerUse; + virtual void(void) EvaluateEntity; + virtual float(entity, float) SendEntity; +#endif +}; + +#ifdef CLIENT +bool +prop_vehicle_driveable::HideViewWeapon(void) +{ + return true; +} +#endif + +void +prop_vehicle_driveable::Physics(void) +{ +#ifdef CLIENT + DriverRelink(); +#endif + + /* if nobody is in the car, we need to run physics here + * with fake input frames */ + if (GetDriver() == __NULL__) { +#ifdef SERVER + m_flTimeLength = frametime; + m_vecMoveValues = [0,0,0]; + m_iMoveButtons = 0; + RunVehiclePhysics(); +#else + setorigin(this, origin); +#endif + } else { + //crossprint(sprintf("Driver: %s\n", GetDriver().classname)); + } + +#ifdef SERVER + /* support for think/nextthink */ + if (think && nextthink > 0.0f) { + if (nextthink < time) { + nextthink = 0.0f; + think(); + } + } +#endif +} + +void +prop_vehicle_driveable::OnRemoveEntity(void) +{ + remove(m_wlFL); + remove(m_wlFR); + remove(m_wlBL); + remove(m_wlBR); + remove(m_eCollBox1); + remove(m_eCollBox2); +} + +#ifdef CLIENT +void +prop_vehicle_driveable::UpdateView(void) +{ + vector vecStart, vecEnd; + + pSeat->m_vecPredictedOrigin = origin; + makevectors(view_angles); + vecStart = [pSeat->m_vecPredictedOrigin[0], pSeat->m_vecPredictedOrigin[1], pSeat->m_vecPredictedOrigin[2] + 16] + (v_right * 4); + vecEnd = vecStart + (v_forward * -256) + [0,0,16] + (v_right * 4); + other = world; + traceline(vecStart, vecEnd, MOVE_OTHERONLY, this); + setproperty(VF_ORIGIN, trace_endpos + (v_forward * 16)); +} + +void +prop_vehicle_driveable_wheel::PredictPreFrame(void) +{ + SAVE_STATE(angles); + SAVE_STATE(origin); + SAVE_STATE(velocity); +} + +void +prop_vehicle_driveable_wheel::PredictPostFrame(void) +{ + ROLL_BACK(angles); + ROLL_BACK(origin); + ROLL_BACK(velocity); +} +#endif + +void +prop_vehicle_driveable_wheel::Bounce(vector normal) +{ + prop_vehicle_driveable vehParent; + vehParent = (prop_vehicle_driveable)owner; + + vector vecBounce = (velocity * normal) * normal * vehParent.m_flBounceFactor; + velocity -= vecBounce; + vehParent.velocity = velocity; + +#ifdef SERVER + float flStregth = vlen((velocity * normal) * normal); + + if (flStregth > 96) { + Sound_Play(vehParent, CHAN_VOICE, "prop_vehicle_driveable.bounce"); + } +#endif +} + +void +prop_vehicle_driveable_wheel::Move(float flTimeLength) +{ + vector vecDest; + vector vecSavedNormal; + float flStepped; + float flMovetime; + int i; + + /* have a few attempts */ + for (i = 3, flMovetime = flTimeLength; flMovetime > 0 && i; i--) { + vecDest = origin + (velocity * flMovetime); + tracebox(origin, mins, maxs, vecDest, MOVE_NOMONSTERS, this); + + if (trace_startsolid) { + continue; + } + + origin = trace_endpos; + + if (trace_fraction < 1) { + vecSavedNormal = trace_plane_normal; + flMovetime -= flMovetime * trace_fraction; + + if (flMovetime) { + float roof_fraction; + vector roof_plane_normal; + + /* step up if we can */ + trace_endpos = origin; + trace_endpos[2] += 8; + + tracebox(origin, mins, maxs, trace_endpos, MOVE_NOMONSTERS, this); + flStepped = trace_endpos[2] - origin[2]; + + roof_fraction = trace_fraction; + roof_plane_normal = trace_plane_normal; + + vecDest = trace_endpos + velocity * flMovetime; + + /* only horizontally */ + vecDest[2] = trace_endpos[2]; + + /* move forwards */ + tracebox(trace_endpos, mins, maxs, vecDest, MOVE_NOMONSTERS, this); + + /* if we got anywhere, make this raised-step move count */ + if (trace_fraction != 0) { + float fwfrac; + vector fwplane; + + fwfrac = trace_fraction; + fwplane = trace_plane_normal; + + /* move down */ + vecDest = trace_endpos; + vecDest[2] -= flStepped + 1; + tracebox(trace_endpos, mins, maxs, vecDest, MOVE_NOMONSTERS, this); + + if (trace_fraction < 1 && trace_plane_normal[2] > 0.7f) { + flMovetime -= flMovetime * fwfrac; + + if (roof_fraction < 1) { + Bounce(roof_plane_normal); + } + + /* FIXME: do we need velocity < 0? */ + if (trace_fraction < 1) { + Bounce(trace_plane_normal); + } else if (fwfrac < 1) { + Bounce(fwplane); + } + + origin = trace_endpos; + continue; + } + } + } + + /* stepping failed, assume crash? */ + if (trace_ent == world) { + if (vlen(velocity) > 300) { + float impact; + impact = -dotproduct(trace_plane_normal, velocity); + int iImpactDamage = impact / 100; + } + } + + Bounce(vecSavedNormal); + /* Physics_DoTouch(this, trace_ent); */ + } else { + break; + } + } +} + +void +prop_vehicle_driveable_wheel::Accel(float flMoveTime, float m_flTurn) +{ + prop_vehicle_driveable vehParent; + entity eDriver; + float flTraction; + vector vecAngle; + + vehParent = (prop_vehicle_driveable)owner; + eDriver = vehParent.m_eDriver; + vecAngle = vehParent.angles; + + makevectors(vecAngle); + + if (m_flTurn) { + /* cripple turnrate by our current velocity */ + float turnbreak = bound(0, vlen(velocity), 100) * 0.5; + + /* rotates v_forward */ + rotatevectorsbyangle([ 0, m_flTurn * turnbreak, 0]); + } + + tracebox(origin, mins, maxs, origin - v_up, MOVE_NOMONSTERS, owner); + + /* allow a range, for 1qu's worth of spare tyre pressure. or something */ + flTraction = 1 - trace_fraction; + + /* air friction, doubles up for general rolling friction, ish */ + velocity *= 1 - flMoveTime * 0.1; + + if (flTraction) { + if (eDriver) { + velocity += v_forward * bound(-1, vehParent.m_vecMoveValues[0] / 400, 1) * vehParent.m_flAcceleration * flMoveTime * flTraction; + } + + /* test if this car is skidding */ + float skid = (velocity * v_right); + if ( fabs(skid) > vehParent.m_flSkidSpeed ) { + vehParent.flags |= VEH_SKIDDING; + } + + /* nuke sideways velocity. if a wheel is off the ground this probably + means that it'll be pushed further. players should try not to roll + too much. */ + /* FIXME: push opposite wheel up slightly to model chassis momentum + not slowing as much as the wheel itself (zomg: race conditions!) */ + velocity -= (velocity * v_right) * v_right * vehParent.m_flTraction * flMoveTime * flTraction; + + if (!eDriver || (vehParent.m_iMoveButtons & INPUT_BUTTON2 || vehParent.m_vecMoveValues[2] > 0)) { + vector t; + + /* empty cars are assumed to have their brakes on. + nuke forward velocity. if a wheel is off the ground this probably + means that it'll be pushed further. players should try not to + roll too much. + + Note: really we ought to be applying some axel friction even + when not breaking, but we'll just depend on air friction for + that. */ + velocity -= (velocity * v_forward) * v_forward * vehParent.m_flBreakFactor * flMoveTime * flTraction; + + /* if break is on, nuke the final part of the velocity, so we can + become truely motionless.*/ + t = velocity - velocity * dotproduct(velocity, vehParent.m_vecGravityDir); + if (vlen(t) < 15) { + velocity -= t; + } + + /* don't bother with gravity if we're already on the ground and + breaking. this avoids weird slides. */ + if (!trace_fraction && trace_plane_normal * vehParent.m_vecGravityDir < -0.7f) { + return; + } + } + } + + /* apply gravity */ + velocity += vehParent.m_vecGravityDir * flMoveTime * serverkeyfloat("phy_gravity") * trace_fraction; + + tracebox(origin, mins * 4.0, maxs * 4.0, origin, MOVE_NORMAL, owner); + if (trace_ent && trace_ent != vehParent.m_eDriver) { + int iImpactDamage = vlen(velocity) / 10; + + if (iImpactDamage > 10) { + trace_ent.velocity = velocity * 2.0 + [0,0,500]; + velocity *= 0.25f; +#ifdef SERVER + if (trace_ent.takedamage) { + NSSurfacePropEntity foo = (NSSurfacePropEntity)trace_ent; + Damage_Apply(foo, vehParent.m_eDriver, iImpactDamage, 0, DMG_VEHICLE); + //print(sprintf("Delivering %i impact damage\n", iImpactDamage)); + } +#endif + } + } +} + +void +prop_vehicle_driveable_wheel::UpdateSuspension(float flTimeLength) +{ + float flDamp; + float flForce; + + if (fabs(m_flSuspension) > 0.001 || fabs(m_flSuspensionForce) > 0.001) { + m_flSuspension += m_flSuspensionForce * flTimeLength; + + flForce = bound(0, flTimeLength * 65, 2); + flDamp = 1 - (flTimeLength * 4); + if (flDamp < 0) { + flDamp = 0; + } + m_flSuspensionForce *= flDamp; + m_flSuspensionForce -= m_flSuspension * flForce; + m_flSuspension = bound(-15, m_flSuspension, 15); + } +} + +void +prop_vehicle_driveable_wheel::Physics(float turnrate, float flTimeLength) +{ + vector owner_pos; + + /* try to correct the wheel's position, in case it got stuck */ + owner_pos = owner.origin + (owner.mins + owner.maxs) * 0.5f; + tracebox(owner_pos, mins, maxs, origin, MOVE_NORMAL, owner); + setorigin(this, trace_endpos); + + /* see if we're in-air */ + other = world; + tracebox(origin, mins, maxs, origin - [0,0,1], MOVE_OTHERONLY, this); + if (!trace_startsolid) { + if ((trace_fraction < 1) && (trace_plane_normal[2] > 0.7)) { + flags |= FL_ONGROUND; + } else { + flags &= ~FL_ONGROUND; + m_flSuspensionForce += flTimeLength * 200.0; + } + } + + Accel(flTimeLength / 2, turnrate); + Move(flTimeLength); + Accel(flTimeLength / 2, turnrate); + UpdateSuspension(flTimeLength); + //print(sprintf("suspension: %d, force: %d\n", m_flSuspension, m_flSuspensionForce)); +} + +void +prop_vehicle_driveable_wheel::prop_vehicle_driveable_wheel(void) +{ + mins = [-8,-8,-35]; + maxs = [8,8,8]; + hitcontentsmaski = CONTENTBIT_BODY | CONTENTBITS_POINTSOLID | CONTENTBIT_VEHICLECLIP; +} + +#ifdef CLIENT +void +prop_vehicle_driveable::PredictPreFrame(void) +{ + SAVE_STATE(modelindex); + SAVE_STATE(origin); + SAVE_STATE(angles); + SAVE_STATE(velocity); + SAVE_STATE(m_flTurn); + SAVE_STATE(flags); + SAVE_STATE(driver_entnum); + + m_wlFL.PredictPreFrame(); + m_wlFR.PredictPreFrame(); + m_wlBL.PredictPreFrame(); + m_wlBR.PredictPreFrame(); +} + +void +prop_vehicle_driveable::PredictPostFrame(void) +{ + ROLL_BACK(modelindex); + ROLL_BACK(angles); + ROLL_BACK(origin); + ROLL_BACK(velocity); + ROLL_BACK(m_flTurn); + ROLL_BACK(flags); + ROLL_BACK(driver_entnum); + + m_wlFL.PredictPostFrame(); + m_wlFR.PredictPostFrame(); + m_wlBL.PredictPostFrame(); + m_wlBR.PredictPostFrame(); +} +#endif + +void +prop_vehicle_driveable::WeaponInput(void) +{ + +} + +void +prop_vehicle_driveable::PlayerInput(void) +{ + m_vecMoveValues = input_movevalues; + m_iMoveButtons = input_buttons; + m_flTimeLength = input_timelength; + + /* prediction frame... */ + RunVehiclePhysics(); + +#ifdef SERVER + /* allow us to exit */ + if (m_flUseTime < time) { + if (input_buttons & INPUT_BUTTON5) { + eActivator = m_eDriver; + OnPlayerUse(); + input_buttons &= ~INPUT_BUTTON5; + } + } +#endif + + WeaponInput(); + + /* only allow use key */ + input_buttons = (input_buttons & INPUT_BUTTON5); +} + +void +prop_vehicle_driveable::RunVehiclePhysics(void) +{ +#if SERVER + /* eject the dead */ + if (m_eDriver && m_eDriver.health <= 0) { + PlayerLeave((NSClientPlayer)m_eDriver); + } +#endif + + if (m_eDriver) { + float y; + + y = m_vecMoveValues[1]; + y = bound(-200, y, 200) / 200; + y *= m_flSteerFactor; + + if (y) { + if (y < 0 && m_flTurn < 0) { + m_flTurn = 0.0f; + } else if (y > 0 && m_flTurn > 0) { + m_flTurn = 0.0f; + } else { + m_flTurn = bound(-1, m_flTurn - y * m_flTimeLength, 1); + } + } else { + /* straighten wheels forward over time */ + if (m_flTurn < 0) { + m_flTurn = min(0, m_flTurn + m_flTimeLength * m_flStraightenFactor); + } else if (m_flTurn > 0) { + m_flTurn = max(0, m_flTurn - m_flTimeLength * m_flStraightenFactor); + } + } + + PlayerUpdateFlags(); + } + + if (spawnflags & VEHSF_NOFLIP) { angles[0] = bound (-45, angles[0], 45); angles[2] = bound (-45, angles[2], 45); - } - - flags &= ~VEH_SKIDDING; - - angles[0] = Math_FixDelta(angles[0]); - angles[1] = Math_FixDelta(angles[1]); - angles[2] = Math_FixDelta(angles[2]); - - velocity[0] = bound(-1000, velocity[0], 1000); - velocity[1] = bound(-1000, velocity[1], 1000); - velocity[2] = bound(-1000, velocity[2], 1000); - - makevectors(angles); - - setorigin( m_wlFL, origin ); - setorigin( m_wlBL, m_wlFL.origin - v_forward * 85 ); - setorigin( m_wlFL, m_wlFL.origin + v_forward * 85 ); - setorigin( m_wlFR, m_wlFL.origin + v_right * 40 ); - setorigin( m_wlFL, m_wlFL.origin - v_right * 40 ); - setorigin( m_wlBR, m_wlBL.origin + v_right * 40 ); - setorigin( m_wlBL, m_wlBL.origin - v_right * 40 ); - - m_wlFL.Physics( this.m_flTurn, m_flTimeLength); - m_wlFR.Physics( this.m_flTurn, m_flTimeLength); - m_wlBL.Physics( 0, m_flTimeLength); - m_wlBR.Physics( 0, m_flTimeLength); - - velocity = m_wlFL.velocity; - velocity += m_wlFR.velocity; - velocity += m_wlBL.velocity; - velocity += m_wlBR.velocity; - velocity *= 0.25f; - - v_right = (m_wlFR.origin - m_wlFL.origin); - v_right += (m_wlBR.origin - m_wlBL.origin); - v_forward = (m_wlFL.origin + m_wlFR.origin); - v_forward -= (m_wlBL.origin + m_wlBR.origin); - v_up = -crossproduct(v_forward, v_right); - angles = vectoangles( v_forward, v_up ); - - /* figure out the new chassis position */ - vector new_origin; - new_origin = m_wlFL.origin; - new_origin += m_wlFR.origin; - new_origin += m_wlBL.origin; - new_origin += m_wlBR.origin; - new_origin *= 0.25f; - setorigin(this, new_origin); - - makevectors(angles); - m_eCollBox1.SetOrigin(origin + (v_forward * 64)); - m_eCollBox2.SetOrigin(origin + (v_forward * -72)); - m_eCollBox1.SetSolid(SOLID_BBOX); - m_eCollBox2.SetSolid(SOLID_BBOX); - - PlayerAlign(); - - /* actiony stuff */ -} - -#ifdef SERVER -void -prop_vehicle_driveable::OnPlayerUse(void) -{ - if (m_flUseTime > time) - return; - - if (m_eDriver == eActivator) { - PlayerLeave((NSClientPlayer)eActivator); - setorigin(eActivator, GetExitPos()); - } else if (!m_eDriver) { - PlayerEnter((NSClientPlayer)eActivator); - m_vecPlayerPos = [0,0,0]; - } - m_flUseTime = time + 2.0f; -} - -void -prop_vehicle_driveable::Respawn(void) -{ - SetMovetype(MOVETYPE_NONE); - SetSolid(SOLID_BBOX); - SetOrigin(GetSpawnOrigin() + [0,0,32]); - SetAngles(GetSpawnAngles()); - SetModel(GetSpawnModel()); - - m_flBRWheelAxel = gettagindex( this, "RRWheelAxel" ); - m_flBLWheelAxel = gettagindex( this, "RLWheelAxel" ); - m_flFLWheelAxel = gettagindex( this, "FLWheelAxel" ); - m_flFRWheelAxel = gettagindex( this, "FRWheelAxel" ); - - m_wlFL.velocity = - m_wlFR.velocity = - m_wlBL.velocity = - m_wlBR.velocity = - velocity = [0,0,0]; - PlayerUse = OnPlayerUse; - setsize( this, [-50,-50,0], [50,50,64]); - - if (m_eDriver) - PlayerLeave((NSClientPlayer)m_eDriver); - - SendFlags = -1; -} -#endif - -#ifdef CLIENT -void -prop_vehicle_driveable::ReceiveEntity(float flSendFlags, float flNew) -{ - if (flSendFlags & VEHFL_DRIVER) { - driver_entnum = readentitynum(); - DriverRelink(); - } - - if (flSendFlags & VEHFL_MODELINDEX) { - modelindex = readshort(); - m_vecSeatOffest[0] = readfloat(); - m_vecSeatOffest[1] = readfloat(); - m_vecSeatOffest[2] = readfloat(); - setsize( this, [-50,-50,0], [50,50,64]); - } - - if (flSendFlags & VEHFL_ORIGIN) { - origin[0] = readcoord(); - origin[1] = readcoord(); - origin[2] = readcoord(); - setorigin(this, origin); - - makevectors(angles); - - setorigin( m_wlFL, origin ); - setorigin( m_wlBL, m_wlFL.origin - v_forward * 85 ); - setorigin( m_wlFL, m_wlFL.origin + v_forward * 85 ); - setorigin( m_wlFR, m_wlFL.origin + v_right * 40 ); - setorigin( m_wlFL, m_wlFL.origin - v_right * 40 ); - setorigin( m_wlBR, m_wlBL.origin + v_right * 40 ); - setorigin( m_wlBL, m_wlBL.origin - v_right * 40 ); - m_eCollBox1.SetOrigin(origin + (v_forward * 64)); - m_eCollBox2.SetOrigin(origin + (v_forward * -72)); - } - - if (flSendFlags & VEHFL_ANGLES) { - angles[0] = readfloat(); - angles[1] = readfloat(); - angles[2] = readfloat(); - } - - if (flSendFlags & VEHFL_VELOCITY) { - velocity[0] = readfloat(); - velocity[1] = readfloat(); - velocity[2] = readfloat(); - } - - if (flSendFlags & VEHFL_TURNING) - m_flTurn = readfloat(); - - if (flSendFlags & VEHFL_FLAGS) - flags = readfloat(); - - if (flNew) { - drawmask = MASK_ENGINE; - SetMovetype(MOVETYPE_NONE); - SetSolid(SOLID_BBOX); - - m_flBRWheelAxel = gettagindex( this, "RRWheelAxel" ); - m_flBLWheelAxel = gettagindex( this, "RLWheelAxel" ); - m_flFLWheelAxel = gettagindex( this, "FLWheelAxel" ); - m_flFRWheelAxel = gettagindex( this, "FRWheelAxel" ); - - m_wlFL.velocity = - m_wlFR.velocity = - m_wlBL.velocity = - m_wlBR.velocity = - velocity = [0,0,0]; - RunVehiclePhysics(); - customphysics = Physics; - } - - PredictPreFrame(); -} -#else -void -prop_vehicle_driveable::EvaluateEntity(void) -{ - /* while the engine is still handling physics for these, we can't - * predict when origin/angle might change */ - if (ATTR_CHANGED(origin)) - SetSendFlags(VEHFL_ORIGIN); - - if (ATTR_CHANGED(angles)) { - angles[0] = Math_FixDelta(angles[0]); - angles[1] = Math_FixDelta(angles[1]); - angles[2] = Math_FixDelta(angles[2]); - - SetSendFlags(VEHFL_ANGLES); - } - if (ATTR_CHANGED(modelindex)) - SetSendFlags(VEHFL_MODELINDEX); - if (ATTR_CHANGED(velocity)) - SetSendFlags(VEHFL_VELOCITY); - if (ATTR_CHANGED(m_flTurn)) - SetSendFlags(VEHFL_TURNING); - if (ATTR_CHANGED(m_eDriver)) - SetSendFlags(VEHFL_DRIVER); - if (ATTR_CHANGED(flags)) - SetSendFlags(VEHFL_FLAGS); - - SAVE_STATE(origin); - SAVE_STATE(angles); - SAVE_STATE(modelindex); - SAVE_STATE(velocity); - SAVE_STATE(m_flTurn); - SAVE_STATE(m_eDriver); - SAVE_STATE(flags); -} - -float -prop_vehicle_driveable::SendEntity(entity ePVSent, float flSendFlags) -{ - WriteByte(MSG_ENTITY, ENT_VEH_4WHEEL); - WriteFloat(MSG_ENTITY, flSendFlags); - - if (!modelindex) - return (false); - - if (flSendFlags & VEHFL_DRIVER) { - WriteEntity(MSG_ENTITY, m_eDriver); - } - - if (flSendFlags & VEHFL_MODELINDEX) { - WriteShort(MSG_ENTITY, modelindex); - WriteFloat(MSG_ENTITY, m_vecSeatOffest[0]); - WriteFloat(MSG_ENTITY, m_vecSeatOffest[1]); - WriteFloat(MSG_ENTITY, m_vecSeatOffest[2]); - } - - if (flSendFlags & VEHFL_ORIGIN) { - WriteCoord(MSG_ENTITY, origin[0]); - WriteCoord(MSG_ENTITY, origin[1]); - WriteCoord(MSG_ENTITY, origin[2]); - } - - if (flSendFlags & VEHFL_ANGLES) { - WriteFloat(MSG_ENTITY, angles[0]); - WriteFloat(MSG_ENTITY, angles[1]); - WriteFloat(MSG_ENTITY, angles[2]); - } - - if (flSendFlags & VEHFL_VELOCITY) { - WriteFloat(MSG_ENTITY, velocity[0]); - WriteFloat(MSG_ENTITY, velocity[1]); - WriteFloat(MSG_ENTITY, velocity[2]); - } - - if (flSendFlags & VEHFL_TURNING) - WriteFloat(MSG_ENTITY, m_flTurn); - - if (flSendFlags & VEHFL_FLAGS) - WriteFloat(MSG_ENTITY, flags); - - return true; -} -#endif - -void -prop_vehicle_driveable::Spawned(void) -{ - super::Spawned(); - -#ifdef SERVER - Sound_Precache("prop_vehicle_driveable.bounce"); -#endif -} - -void -prop_vehicle_driveable::prop_vehicle_driveable(void) -{ - m_eDriver = __NULL__; - m_flBounceFactor = 1.25f; - m_flAcceleration = 600.0f; - m_flSkidSpeed = 256.0f; - m_flTraction = 5.0f; - m_flBreakFactor = 2.0f; - m_flSteerFactor = 1.0f; - m_flStraightenFactor = 1.0f; - m_vecGravityDir = [0,0,-1]; - m_iVehicleFlags |= VHF_FROZEN; - hitcontentsmaski = CONTENTBIT_BODY | CONTENTBITS_POINTSOLID | CONTENTBIT_VEHICLECLIP; - - if (!m_eCollBox1) - m_eCollBox1 = spawn(NSEntity); - if (!m_eCollBox2) - m_eCollBox2 = spawn(NSEntity); - - { - m_eCollBox1.SetSize([-32,-32,0], [32,32,32]); - m_eCollBox2.SetSize([-32,-32,0], [32,32,32]); - } - - m_eCollBox1.hitcontentsmaski = hitcontentsmaski; - m_eCollBox2.hitcontentsmaski = hitcontentsmaski; - - if (!m_wlFL) - m_wlFL = spawn(prop_vehicle_driveable_wheel); - if (!m_wlFR) - m_wlFR = spawn(prop_vehicle_driveable_wheel); - if (!m_wlBL) - m_wlBL = spawn(prop_vehicle_driveable_wheel); - if (!m_wlBR) - m_wlBR = spawn(prop_vehicle_driveable_wheel); - - m_eCollBox1.owner = m_eCollBox2.owner = \ - m_wlFL.owner = m_wlFR.owner = \ - m_wlBL.owner = m_wlBR.owner = this; - - customphysics = Physics; -} - -#ifdef CLIENT -void -prop_vehicle_driveable_readentity(float isnew) -{ - prop_vehicle_driveable veh = (prop_vehicle_driveable)self; - float flags = readfloat(); - - if (isnew) - spawnfunc_prop_vehicle_driveable(); - - veh.ReceiveEntity(flags, isnew); -} -#endif + } + + flags &= ~VEH_SKIDDING; + + angles[0] = Math_FixDelta(angles[0]); + angles[1] = Math_FixDelta(angles[1]); + angles[2] = Math_FixDelta(angles[2]); + + velocity[0] = bound(-1000, velocity[0], 1000); + velocity[1] = bound(-1000, velocity[1], 1000); + velocity[2] = bound(-1000, velocity[2], 1000); + + makevectors(angles); + + setorigin( m_wlFL, origin ); + setorigin( m_wlBL, m_wlFL.origin - v_forward * 85 ); + setorigin( m_wlFL, m_wlFL.origin + v_forward * 85 ); + setorigin( m_wlFR, m_wlFL.origin + v_right * 40 ); + setorigin( m_wlFL, m_wlFL.origin - v_right * 40 ); + setorigin( m_wlBR, m_wlBL.origin + v_right * 40 ); + setorigin( m_wlBL, m_wlBL.origin - v_right * 40 ); + + m_wlFL.Physics( this.m_flTurn, m_flTimeLength); + m_wlFR.Physics( this.m_flTurn, m_flTimeLength); + m_wlBL.Physics( 0, m_flTimeLength); + m_wlBR.Physics( 0, m_flTimeLength); + + velocity = m_wlFL.velocity; + velocity += m_wlFR.velocity; + velocity += m_wlBL.velocity; + velocity += m_wlBR.velocity; + velocity *= 0.25f; + + v_right = (m_wlFR.origin - m_wlFL.origin); + v_right += (m_wlBR.origin - m_wlBL.origin); + v_forward = (m_wlFL.origin + m_wlFR.origin); + v_forward -= (m_wlBL.origin + m_wlBR.origin); + v_up = -crossproduct(v_forward, v_right); + angles = vectoangles( v_forward, v_up ); + + /* figure out the new chassis position */ + vector new_origin; + new_origin = m_wlFL.origin; + new_origin += m_wlFR.origin; + new_origin += m_wlBL.origin; + new_origin += m_wlBR.origin; + new_origin *= 0.25f; + setorigin(this, new_origin); + + makevectors(angles); + m_eCollBox1.SetOrigin(origin + (v_forward * 64)); + m_eCollBox2.SetOrigin(origin + (v_forward * -72)); + m_eCollBox1.SetSolid(SOLID_BBOX); + m_eCollBox2.SetSolid(SOLID_BBOX); + + PlayerAlign(); + + /* actiony stuff */ +} + +#ifdef SERVER +void +prop_vehicle_driveable::OnPlayerUse(void) +{ + if (m_flUseTime > time) + return; + + if (m_eDriver == eActivator) { + PlayerLeave((NSClientPlayer)eActivator); + setorigin(eActivator, GetExitPos()); + } else if (!m_eDriver) { + PlayerEnter((NSClientPlayer)eActivator); + m_vecPlayerPos = [0,0,0]; + } + m_flUseTime = time + 2.0f; +} + +void +prop_vehicle_driveable::Respawn(void) +{ + SetMovetype(MOVETYPE_NONE); + SetSolid(SOLID_BBOX); + SetOrigin(GetSpawnOrigin() + [0,0,32]); + SetAngles(GetSpawnAngles()); + SetModel(GetSpawnModel()); + + m_flBRWheelAxel = gettagindex( this, "RRWheelAxel" ); + m_flBLWheelAxel = gettagindex( this, "RLWheelAxel" ); + m_flFLWheelAxel = gettagindex( this, "FLWheelAxel" ); + m_flFRWheelAxel = gettagindex( this, "FRWheelAxel" ); + + m_wlFL.velocity = + m_wlFR.velocity = + m_wlBL.velocity = + m_wlBR.velocity = + velocity = [0,0,0]; + PlayerUse = OnPlayerUse; + setsize( this, [-50,-50,0], [50,50,64]); + + if (m_eDriver) + PlayerLeave((NSClientPlayer)m_eDriver); + + SendFlags = -1; +} +#endif + +#ifdef CLIENT +void +prop_vehicle_driveable::ReceiveEntity(float flSendFlags, float flNew) +{ + if (flSendFlags & VEHFL_DRIVER) { + driver_entnum = readentitynum(); + DriverRelink(); + } + + if (flSendFlags & VEHFL_MODELINDEX) { + modelindex = readshort(); + m_vecSeatOffest[0] = readfloat(); + m_vecSeatOffest[1] = readfloat(); + m_vecSeatOffest[2] = readfloat(); + setsize( this, [-50,-50,0], [50,50,64]); + } + + if (flSendFlags & VEHFL_ORIGIN) { + origin[0] = readcoord(); + origin[1] = readcoord(); + origin[2] = readcoord(); + setorigin(this, origin); + + makevectors(angles); + + setorigin( m_wlFL, origin ); + setorigin( m_wlBL, m_wlFL.origin - v_forward * 85 ); + setorigin( m_wlFL, m_wlFL.origin + v_forward * 85 ); + setorigin( m_wlFR, m_wlFL.origin + v_right * 40 ); + setorigin( m_wlFL, m_wlFL.origin - v_right * 40 ); + setorigin( m_wlBR, m_wlBL.origin + v_right * 40 ); + setorigin( m_wlBL, m_wlBL.origin - v_right * 40 ); + m_eCollBox1.SetOrigin(origin + (v_forward * 64)); + m_eCollBox2.SetOrigin(origin + (v_forward * -72)); + } + + if (flSendFlags & VEHFL_ANGLES) { + angles[0] = readfloat(); + angles[1] = readfloat(); + angles[2] = readfloat(); + } + + if (flSendFlags & VEHFL_VELOCITY) { + velocity[0] = readfloat(); + velocity[1] = readfloat(); + velocity[2] = readfloat(); + } + + if (flSendFlags & VEHFL_TURNING) + m_flTurn = readfloat(); + + if (flSendFlags & VEHFL_FLAGS) + flags = readfloat(); + + if (flNew) { + drawmask = MASK_ENGINE; + SetMovetype(MOVETYPE_NONE); + SetSolid(SOLID_BBOX); + + m_flBRWheelAxel = gettagindex( this, "RRWheelAxel" ); + m_flBLWheelAxel = gettagindex( this, "RLWheelAxel" ); + m_flFLWheelAxel = gettagindex( this, "FLWheelAxel" ); + m_flFRWheelAxel = gettagindex( this, "FRWheelAxel" ); + + m_wlFL.velocity = + m_wlFR.velocity = + m_wlBL.velocity = + m_wlBR.velocity = + velocity = [0,0,0]; + RunVehiclePhysics(); + customphysics = Physics; + } + + PredictPreFrame(); +} +#else +void +prop_vehicle_driveable::EvaluateEntity(void) +{ + /* while the engine is still handling physics for these, we can't + * predict when origin/angle might change */ + if (ATTR_CHANGED(origin)) + SetSendFlags(VEHFL_ORIGIN); + + if (ATTR_CHANGED(angles)) { + angles[0] = Math_FixDelta(angles[0]); + angles[1] = Math_FixDelta(angles[1]); + angles[2] = Math_FixDelta(angles[2]); + + SetSendFlags(VEHFL_ANGLES); + } + if (ATTR_CHANGED(modelindex)) + SetSendFlags(VEHFL_MODELINDEX); + if (ATTR_CHANGED(velocity)) + SetSendFlags(VEHFL_VELOCITY); + if (ATTR_CHANGED(m_flTurn)) + SetSendFlags(VEHFL_TURNING); + if (ATTR_CHANGED(m_eDriver)) + SetSendFlags(VEHFL_DRIVER); + if (ATTR_CHANGED(flags)) + SetSendFlags(VEHFL_FLAGS); + + SAVE_STATE(origin); + SAVE_STATE(angles); + SAVE_STATE(modelindex); + SAVE_STATE(velocity); + SAVE_STATE(m_flTurn); + SAVE_STATE(m_eDriver); + SAVE_STATE(flags); +} + +float +prop_vehicle_driveable::SendEntity(entity ePVSent, float flSendFlags) +{ + WriteByte(MSG_ENTITY, ENT_VEH_4WHEEL); + WriteFloat(MSG_ENTITY, flSendFlags); + + if (!modelindex) + return (false); + + if (flSendFlags & VEHFL_DRIVER) { + WriteEntity(MSG_ENTITY, m_eDriver); + } + + if (flSendFlags & VEHFL_MODELINDEX) { + WriteShort(MSG_ENTITY, modelindex); + WriteFloat(MSG_ENTITY, m_vecSeatOffest[0]); + WriteFloat(MSG_ENTITY, m_vecSeatOffest[1]); + WriteFloat(MSG_ENTITY, m_vecSeatOffest[2]); + } + + if (flSendFlags & VEHFL_ORIGIN) { + WriteCoord(MSG_ENTITY, origin[0]); + WriteCoord(MSG_ENTITY, origin[1]); + WriteCoord(MSG_ENTITY, origin[2]); + } + + if (flSendFlags & VEHFL_ANGLES) { + WriteFloat(MSG_ENTITY, angles[0]); + WriteFloat(MSG_ENTITY, angles[1]); + WriteFloat(MSG_ENTITY, angles[2]); + } + + if (flSendFlags & VEHFL_VELOCITY) { + WriteFloat(MSG_ENTITY, velocity[0]); + WriteFloat(MSG_ENTITY, velocity[1]); + WriteFloat(MSG_ENTITY, velocity[2]); + } + + if (flSendFlags & VEHFL_TURNING) + WriteFloat(MSG_ENTITY, m_flTurn); + + if (flSendFlags & VEHFL_FLAGS) + WriteFloat(MSG_ENTITY, flags); + + return true; +} +#endif + +void +prop_vehicle_driveable::Spawned(void) +{ + super::Spawned(); + +#ifdef SERVER + Sound_Precache("prop_vehicle_driveable.bounce"); +#endif +} + +void +prop_vehicle_driveable::prop_vehicle_driveable(void) +{ + m_eDriver = __NULL__; + m_flBounceFactor = 1.25f; + m_flAcceleration = 600.0f; + m_flSkidSpeed = 256.0f; + m_flTraction = 5.0f; + m_flBreakFactor = 2.0f; + m_flSteerFactor = 1.0f; + m_flStraightenFactor = 1.0f; + m_vecGravityDir = [0,0,-1]; + m_iVehicleFlags |= VHF_FROZEN; + hitcontentsmaski = CONTENTBIT_BODY | CONTENTBITS_POINTSOLID | CONTENTBIT_VEHICLECLIP; + + if (!m_eCollBox1) + m_eCollBox1 = spawn(NSEntity); + if (!m_eCollBox2) + m_eCollBox2 = spawn(NSEntity); + + { + m_eCollBox1.SetSize([-32,-32,0], [32,32,32]); + m_eCollBox2.SetSize([-32,-32,0], [32,32,32]); + } + + m_eCollBox1.hitcontentsmaski = hitcontentsmaski; + m_eCollBox2.hitcontentsmaski = hitcontentsmaski; + + if (!m_wlFL) + m_wlFL = spawn(prop_vehicle_driveable_wheel); + if (!m_wlFR) + m_wlFR = spawn(prop_vehicle_driveable_wheel); + if (!m_wlBL) + m_wlBL = spawn(prop_vehicle_driveable_wheel); + if (!m_wlBR) + m_wlBR = spawn(prop_vehicle_driveable_wheel); + + m_eCollBox1.owner = m_eCollBox2.owner = \ + m_wlFL.owner = m_wlFR.owner = \ + m_wlBL.owner = m_wlBR.owner = this; + + customphysics = Physics; +} + +#ifdef CLIENT +void +prop_vehicle_driveable_readentity(float isnew) +{ + prop_vehicle_driveable veh = (prop_vehicle_driveable)self; + float flags = readfloat(); + + if (isnew) + spawnfunc_prop_vehicle_driveable(); + + veh.ReceiveEntity(flags, isnew); +} +#endif diff --git a/src/gs-entbase/shared/spraylogo.qc b/src/gs-entbase/shared/spraylogo.qc index cf146781..0d6984d5 100644 --- a/src/gs-entbase/shared/spraylogo.qc +++ b/src/gs-entbase/shared/spraylogo.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifdef SERVER void diff --git a/src/gs-entbase/shared/trigger_camera.qc b/src/gs-entbase/shared/trigger_camera.qc index d426db04..99f06926 100644 --- a/src/gs-entbase/shared/trigger_camera.qc +++ b/src/gs-entbase/shared/trigger_camera.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_camera (1 0 0) (-8 -8 -8) (8 8 8) Forces a camera change when triggered. diff --git a/src/gs-entbase/shared/trigger_gravity.qc b/src/gs-entbase/shared/trigger_gravity.qc index f236ca5f..91e394e4 100644 --- a/src/gs-entbase/shared/trigger_gravity.qc +++ b/src/gs-entbase/shared/trigger_gravity.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED trigger_gravity (0 .5 .8) ? Volume that will, when an entity enters it, permanently alters how it diff --git a/src/gs-entbase/shared/worldspawn.qc b/src/gs-entbase/shared/worldspawn.qc index b749191d..dffd4e1c 100644 --- a/src/gs-entbase/shared/worldspawn.qc +++ b/src/gs-entbase/shared/worldspawn.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /*QUAKED worldspawn (0 0 0) ? Only used for the world. @@ -128,4 +128,4 @@ void worldspawn::worldspawn(void) { } -#endif \ No newline at end of file +#endif diff --git a/src/materials/Alien.qc b/src/materials/Alien.qc index f2c2851a..3799a7cf 100644 --- a/src/materials/Alien.qc +++ b/src/materials/Alien.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class Alien:NSMaterial { diff --git a/src/materials/Computer.qc b/src/materials/Computer.qc index 9debc35b..dcd99359 100644 --- a/src/materials/Computer.qc +++ b/src/materials/Computer.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class Computer:NSMaterial { diff --git a/src/materials/Concrete.qc b/src/materials/Concrete.qc index cab773ec..0cdd00d3 100644 --- a/src/materials/Concrete.qc +++ b/src/materials/Concrete.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class Concrete:NSMaterial { diff --git a/src/materials/Dirt.qc b/src/materials/Dirt.qc index eec2b78f..eb8bb4b5 100644 --- a/src/materials/Dirt.qc +++ b/src/materials/Dirt.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class Dirt:NSMaterial { diff --git a/src/materials/Flesh.qc b/src/materials/Flesh.qc index 9d5c2aa6..138775cb 100644 --- a/src/materials/Flesh.qc +++ b/src/materials/Flesh.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class Flesh:NSMaterial { diff --git a/src/materials/Foliage.qc b/src/materials/Foliage.qc index 805c16e2..9f4f8d34 100644 --- a/src/materials/Foliage.qc +++ b/src/materials/Foliage.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class Foliage:NSMaterial { diff --git a/src/materials/Glass.qc b/src/materials/Glass.qc index c1b38316..0bb8022b 100644 --- a/src/materials/Glass.qc +++ b/src/materials/Glass.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class Glass:NSMaterial { diff --git a/src/materials/Grate.qc b/src/materials/Grate.qc index 3d4f5721..f59d6ec2 100644 --- a/src/materials/Grate.qc +++ b/src/materials/Grate.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class Grate:NSMaterial { diff --git a/src/materials/Metal.qc b/src/materials/Metal.qc index ff96002e..ac1f5b10 100644 --- a/src/materials/Metal.qc +++ b/src/materials/Metal.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class Metal:NSMaterial { diff --git a/src/materials/Sand.qc b/src/materials/Sand.qc index 92b95a31..8f79578e 100644 --- a/src/materials/Sand.qc +++ b/src/materials/Sand.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class Sand:NSMaterial { diff --git a/src/materials/Slosh.qc b/src/materials/Slosh.qc index 7d4270dc..608d264c 100644 --- a/src/materials/Slosh.qc +++ b/src/materials/Slosh.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class Slosh:NSMaterial { diff --git a/src/materials/Snow.qc b/src/materials/Snow.qc index 3c8a404d..13286e36 100644 --- a/src/materials/Snow.qc +++ b/src/materials/Snow.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class Snow:NSMaterial { diff --git a/src/materials/Tile.qc b/src/materials/Tile.qc index b4c7f0fd..c2c72f71 100644 --- a/src/materials/Tile.qc +++ b/src/materials/Tile.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class Tile:NSMaterial { diff --git a/src/materials/Vent.qc b/src/materials/Vent.qc index 01e50c59..21290aeb 100644 --- a/src/materials/Vent.qc +++ b/src/materials/Vent.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class Vent:NSMaterial { diff --git a/src/materials/Wood.qc b/src/materials/Wood.qc index fda7122f..4586a511 100644 --- a/src/materials/Wood.qc +++ b/src/materials/Wood.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class Wood:NSMaterial { diff --git a/src/menu-fn/background.qc b/src/menu-fn/background.qc index 089b07fd..eadfa8e5 100644 --- a/src/menu-fn/background.qc +++ b/src/menu-fn/background.qc @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + void Background_WON(void) { diff --git a/src/menu-fn/bitmaps.h b/src/menu-fn/bitmaps.h index ccd28d59..9f2b8010 100644 --- a/src/menu-fn/bitmaps.h +++ b/src/menu-fn/bitmaps.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ string g_bmp[78] = { "gfx/shell/btns_main", diff --git a/src/menu-fn/colors.qc b/src/menu-fn/colors.qc index dc0a2ea4..e0214d53 100644 --- a/src/menu-fn/colors.qc +++ b/src/menu-fn/colors.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #include "../shared/colors.h" diff --git a/src/menu-fn/defs.h b/src/menu-fn/defs.h index 1f30ff2a..ad672b01 100644 --- a/src/menu-fn/defs.h +++ b/src/menu-fn/defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #include "../client/font.h" #include "../shared/global.h" diff --git a/src/menu-fn/entry.qc b/src/menu-fn/entry.qc index b144ab1a..22f79404 100644 --- a/src/menu-fn/entry.qc +++ b/src/menu-fn/entry.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var int g_initialized = FALSE; diff --git a/src/menu-fn/m_addserver.qc b/src/menu-fn/m_addserver.qc index e933e38d..b8b20952 100644 --- a/src/menu-fn/m_addserver.qc +++ b/src/menu-fn/m_addserver.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void menu_addserver_init(void) diff --git a/src/menu-fn/m_advancedcontrols.qc b/src/menu-fn/m_advancedcontrols.qc index 5ebcf7ef..3c50c76e 100644 --- a/src/menu-fn/m_advancedcontrols.qc +++ b/src/menu-fn/m_advancedcontrols.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CWidget fn_advcontrols; CCheckBox acn_cbCrosshair; diff --git a/src/menu-fn/m_advancedcustomize.qc b/src/menu-fn/m_advancedcustomize.qc index b7f0d933..e0f5eb4a 100644 --- a/src/menu-fn/m_advancedcustomize.qc +++ b/src/menu-fn/m_advancedcustomize.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CWidget fn_advcustomize; CMainButton ac_btnDone; diff --git a/src/menu-fn/m_advancedmpoptions.qc b/src/menu-fn/m_advancedmpoptions.qc index 48589d65..0536cb6c 100644 --- a/src/menu-fn/m_advancedmpoptions.qc +++ b/src/menu-fn/m_advancedmpoptions.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void menu_advancedmpoptions_init(void) diff --git a/src/menu-fn/m_audio.qc b/src/menu-fn/m_audio.qc index 3b057d29..e20e370e 100644 --- a/src/menu-fn/m_audio.qc +++ b/src/menu-fn/m_audio.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CWidget fn_audio; CMainButton au_btnDone; diff --git a/src/menu-fn/m_chatrooms.qc b/src/menu-fn/m_chatrooms.qc index cb2b3f0f..d1344c2b 100644 --- a/src/menu-fn/m_chatrooms.qc +++ b/src/menu-fn/m_chatrooms.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CFrame cr_frLog; CFrame cr_frUsers; diff --git a/src/menu-fn/m_chatroomslist.qc b/src/menu-fn/m_chatroomslist.qc index f258933e..97dd06e5 100644 --- a/src/menu-fn/m_chatroomslist.qc +++ b/src/menu-fn/m_chatroomslist.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CWidget fn_chatroomslist; CMainButton crl_btnJoin; diff --git a/src/menu-fn/m_configuration.qc b/src/menu-fn/m_configuration.qc index a46354bd..4003a868 100644 --- a/src/menu-fn/m_configuration.qc +++ b/src/menu-fn/m_configuration.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CWidget fn_configuration; CMainButton cf_btnControls; diff --git a/src/menu-fn/m_contentcontrol.qc b/src/menu-fn/m_contentcontrol.qc index 0468b0ee..0c90bbb0 100644 --- a/src/menu-fn/m_contentcontrol.qc +++ b/src/menu-fn/m_contentcontrol.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CWidget cc_gore; CMainButton cc_btnDone; diff --git a/src/menu-fn/m_controls.qc b/src/menu-fn/m_controls.qc index def83b51..1fc6aad5 100644 --- a/src/menu-fn/m_controls.qc +++ b/src/menu-fn/m_controls.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CWidget fn_controls; CMainButton ctrl_btnDefaults; diff --git a/src/menu-fn/m_creategame.qc b/src/menu-fn/m_creategame.qc index ae921074..e87bc713 100644 --- a/src/menu-fn/m_creategame.qc +++ b/src/menu-fn/m_creategame.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ string(searchhandle handle, float num) search_getpackagename = #0:search_getpackagename; diff --git a/src/menu-fn/m_creategame_inet.qc b/src/menu-fn/m_creategame_inet.qc index 53e997d5..9b55bf1f 100644 --- a/src/menu-fn/m_creategame_inet.qc +++ b/src/menu-fn/m_creategame_inet.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CWidget fn_createinet; CMainButton createinet_btnAdv; diff --git a/src/menu-fn/m_customgame.qc b/src/menu-fn/m_customgame.qc index f7cc8fb0..9a77cfbc 100644 --- a/src/menu-fn/m_customgame.qc +++ b/src/menu-fn/m_customgame.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* the menu specific variables */ #ifndef WEBMENU diff --git a/src/menu-fn/m_customize.qc b/src/menu-fn/m_customize.qc index 6307a5c0..0a9036d3 100644 --- a/src/menu-fn/m_customize.qc +++ b/src/menu-fn/m_customize.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CWidget fn_customize; CMainButton cz_btnDone; diff --git a/src/menu-fn/m_filter.qc b/src/menu-fn/m_filter.qc index 358838ca..ec67c467 100644 --- a/src/menu-fn/m_filter.qc +++ b/src/menu-fn/m_filter.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void menu_filter_init(void) diff --git a/src/menu-fn/m_internetgames.qc b/src/menu-fn/m_internetgames.qc index a2c1d1ca..6ec2df22 100644 --- a/src/menu-fn/m_internetgames.qc +++ b/src/menu-fn/m_internetgames.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var int g_inetrefresh = FALSE; diff --git a/src/menu-fn/m_intro.qc b/src/menu-fn/m_intro.qc index f29b7462..847f672a 100644 --- a/src/menu-fn/m_intro.qc +++ b/src/menu-fn/m_intro.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enum { diff --git a/src/menu-fn/m_langames.qc b/src/menu-fn/m_langames.qc index f2a86da8..c9f66946 100644 --- a/src/menu-fn/m_langames.qc +++ b/src/menu-fn/m_langames.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CWidget fn_lan; CMainButton lan_btnJoin; diff --git a/src/menu-fn/m_loadgame.qc b/src/menu-fn/m_loadgame.qc index be2888bd..edcf7d58 100644 --- a/src/menu-fn/m_loadgame.qc +++ b/src/menu-fn/m_loadgame.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ string *g_savegames; int g_savegame_count; diff --git a/src/menu-fn/m_main.qc b/src/menu-fn/m_main.qc index ffb5c7b9..e6872cff 100644 --- a/src/menu-fn/m_main.qc +++ b/src/menu-fn/m_main.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CWidget fn_main; CMainButton main_btnConsole; diff --git a/src/menu-fn/m_multiplayer.qc b/src/menu-fn/m_multiplayer.qc index f13db6ce..eebd0824 100644 --- a/src/menu-fn/m_multiplayer.qc +++ b/src/menu-fn/m_multiplayer.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CWidget fn_multiplayer; diff --git a/src/menu-fn/m_newgame.qc b/src/menu-fn/m_newgame.qc index d6405d31..7e572c5b 100644 --- a/src/menu-fn/m_newgame.qc +++ b/src/menu-fn/m_newgame.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CWidget fn_newgame; CMainButton ng_btnEasy; diff --git a/src/menu-fn/m_spectategames.qc b/src/menu-fn/m_spectategames.qc index 11b6d22f..2fbadf07 100644 --- a/src/menu-fn/m_spectategames.qc +++ b/src/menu-fn/m_spectategames.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void menu_spectategames_init(void) diff --git a/src/menu-fn/m_updates.qc b/src/menu-fn/m_updates.qc index 2691372c..8f4dcaed 100644 --- a/src/menu-fn/m_updates.qc +++ b/src/menu-fn/m_updates.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #define FN_UPDATE_IMGURL "http://www.frag-net.com/dl/img/%s.jpg" diff --git a/src/menu-fn/m_video.qc b/src/menu-fn/m_video.qc index b0a3ef4b..45217fe0 100644 --- a/src/menu-fn/m_video.qc +++ b/src/menu-fn/m_video.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CWidget fn_video; CMainButton vd_btnVidOptions; diff --git a/src/menu-fn/m_videomodes.qc b/src/menu-fn/m_videomodes.qc index 5c430d4a..dcf3abb3 100644 --- a/src/menu-fn/m_videomodes.qc +++ b/src/menu-fn/m_videomodes.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CWidget fn_vidmodes; CMainButton vm_btnOk; diff --git a/src/menu-fn/m_videooptions.qc b/src/menu-fn/m_videooptions.qc index e112784c..1a0cd220 100644 --- a/src/menu-fn/m_videooptions.qc +++ b/src/menu-fn/m_videooptions.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var float autocvar_vid_brightness = 0.0f; var float autocvar_vid_gamma = 1.0f; diff --git a/src/menu-fn/m_viewgameinfo.qc b/src/menu-fn/m_viewgameinfo.qc index fc71ac57..ce26ef2e 100644 --- a/src/menu-fn/m_viewgameinfo.qc +++ b/src/menu-fn/m_viewgameinfo.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void menu_viewgameinfo_init(void) diff --git a/src/menu-fn/m_viewreadme.qc b/src/menu-fn/m_viewreadme.qc index c1266278..3d06032c 100644 --- a/src/menu-fn/m_viewreadme.qc +++ b/src/menu-fn/m_viewreadme.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CWidget vr_readme; CMainButton vr_btnDone; diff --git a/src/menu-fn/menu.qc b/src/menu-fn/menu.qc index ef2585fc..8584927d 100644 --- a/src/menu-fn/menu.qc +++ b/src/menu-fn/menu.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ menupage_t g_mpage[] = { { menu_main_init, menu_main_draw, menu_main_input }, diff --git a/src/menu-fn/strings.h b/src/menu-fn/strings.h index 74e06e4e..a485dd27 100644 --- a/src/menu-fn/strings.h +++ b/src/menu-fn/strings.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ string m_reslbl[558]; diff --git a/src/menu-fn/strings.qc b/src/menu-fn/strings.qc index 3fbc4912..cc5fb12d 100644 --- a/src/menu-fn/strings.qc +++ b/src/menu-fn/strings.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Strings_Init(void) diff --git a/src/menu-fn/w_3dview.qc b/src/menu-fn/w_3dview.qc index 6eae2954..25cf0469 100644 --- a/src/menu-fn/w_3dview.qc +++ b/src/menu-fn/w_3dview.qc @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ noref .vector colormod; noref .vector angles; diff --git a/src/menu-fn/w_checkbox.qc b/src/menu-fn/w_checkbox.qc index 2867426a..8c75ce1f 100644 --- a/src/menu-fn/w_checkbox.qc +++ b/src/menu-fn/w_checkbox.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class CCheckBox:CWidget { diff --git a/src/menu-fn/w_combobox.qc b/src/menu-fn/w_combobox.qc index 8d2d5f26..e361b6b7 100644 --- a/src/menu-fn/w_combobox.qc +++ b/src/menu-fn/w_combobox.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class CComboBox:CWidget { diff --git a/src/menu-fn/w_dialog.qc b/src/menu-fn/w_dialog.qc index 3d2120c3..ba46902b 100644 --- a/src/menu-fn/w_dialog.qc +++ b/src/menu-fn/w_dialog.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class CDialog:CWidget { diff --git a/src/menu-fn/w_frame.qc b/src/menu-fn/w_frame.qc index 847a26ee..301eecee 100644 --- a/src/menu-fn/w_frame.qc +++ b/src/menu-fn/w_frame.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class CFrame:CWidget { diff --git a/src/menu-fn/w_header.qc b/src/menu-fn/w_header.qc index 931af2d1..febfbf92 100644 --- a/src/menu-fn/w_header.qc +++ b/src/menu-fn/w_header.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ string g_header_text[] = { "ADVANCED", diff --git a/src/menu-fn/w_label.qc b/src/menu-fn/w_label.qc index 373e0fdf..032daf6a 100644 --- a/src/menu-fn/w_label.qc +++ b/src/menu-fn/w_label.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class CLabel:CWidget { diff --git a/src/menu-fn/w_listbox.qc b/src/menu-fn/w_listbox.qc index 145077b3..288d44a4 100644 --- a/src/menu-fn/w_listbox.qc +++ b/src/menu-fn/w_listbox.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #define LB_MAX_ENTRIES 512 diff --git a/src/menu-fn/w_mainbutton.qc b/src/menu-fn/w_mainbutton.qc index 015267d5..268eb2c2 100644 --- a/src/menu-fn/w_mainbutton.qc +++ b/src/menu-fn/w_mainbutton.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enum { diff --git a/src/menu-fn/w_modlist.qc b/src/menu-fn/w_modlist.qc index f19bd888..4e371897 100644 --- a/src/menu-fn/w_modlist.qc +++ b/src/menu-fn/w_modlist.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* Those seem to be hardcoded? None of the default colors match */ #define ML_COL_1 [255,127,24] / 255 // Unselected Main diff --git a/src/menu-fn/w_pictureswitch.qc b/src/menu-fn/w_pictureswitch.qc index d01083fc..43da745a 100644 --- a/src/menu-fn/w_pictureswitch.qc +++ b/src/menu-fn/w_pictureswitch.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class CPictureSwitch:CWidget { diff --git a/src/menu-fn/w_scrollbar.qc b/src/menu-fn/w_scrollbar.qc index a011c6db..df5bba03 100644 --- a/src/menu-fn/w_scrollbar.qc +++ b/src/menu-fn/w_scrollbar.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class CScrollbar:CWidget { diff --git a/src/menu-fn/w_servers.qc b/src/menu-fn/w_servers.qc index 75251896..892a6d3d 100644 --- a/src/menu-fn/w_servers.qc +++ b/src/menu-fn/w_servers.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #define SL_MAX_ENTRIES 512 diff --git a/src/menu-fn/w_slider.qc b/src/menu-fn/w_slider.qc index 22829057..28313da8 100644 --- a/src/menu-fn/w_slider.qc +++ b/src/menu-fn/w_slider.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class CSlider:CWidget { diff --git a/src/menu-fn/w_textbox.qc b/src/menu-fn/w_textbox.qc index 501a1405..271cc3ac 100644 --- a/src/menu-fn/w_textbox.qc +++ b/src/menu-fn/w_textbox.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enumflags { diff --git a/src/menu-fn/w_textbuffer.qc b/src/menu-fn/w_textbuffer.qc index 4ff3ab7b..ad158283 100644 --- a/src/menu-fn/w_textbuffer.qc +++ b/src/menu-fn/w_textbuffer.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #define TB_MAX_ENTRIES 128 diff --git a/src/menu-fn/w_updatelist.qc b/src/menu-fn/w_updatelist.qc index 925faae2..6baf0e06 100644 --- a/src/menu-fn/w_updatelist.qc +++ b/src/menu-fn/w_updatelist.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* Those seem to be hardcoded? None of the default colors match */ #define ML_COL_1 [255,127,24] / 255 // Unselected Main diff --git a/src/menu-fn/widgets.qc b/src/menu-fn/widgets.qc index 85d25c7c..e4a7d508 100644 --- a/src/menu-fn/widgets.qc +++ b/src/menu-fn/widgets.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class CWidget { diff --git a/src/menu-vgui/background.qc b/src/menu-vgui/background.qc index 331aaf96..7d29221a 100755 --- a/src/menu-vgui/background.qc +++ b/src/menu-vgui/background.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,38 +12,23 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ -#ifdef GAME_TW - #define BACKGROUND_IMG "textures/gfx/background" -#elif GAME_CS - #define BACKGROUND_IMG "textures/gfx/background" -#else - #define BACKGROUND_IMG "gfx/conback" -#endif +#define BACKGROUND_IMG "gfx/background" -var int g_iBackgroundLoaded = FALSE; - -void Background_Init ( void ) +void +Background_Init(void) { - precache_pic( BACKGROUND_IMG ); - - if ( iscachedpic( BACKGROUND_IMG ) ) { - g_iBackgroundLoaded = TRUE; - } + precache_pic(BACKGROUND_IMG); } -void Background_Draw ( vector vecSize ) +void +Background_Draw(vector vecSize) { - if ( clientstate() == 2 ) { + if (clientstate() == 2) { if (!g_background) - drawfill( [ 0, 0 ], vecSize, [ 0, 0, 0 ], 0.5f ); - } else { - if ( g_iBackgroundLoaded == TRUE ) { - drawpic( [ 0, 0 ], BACKGROUND_IMG, vecSize, [ 1, 1, 1 ], 1.0f ); - } else { - drawfill( [ 0, 0 ], vecSize, [ 0, 0, 0 ], 1.0f ); - drawfill( [ 0, 0 ], vecSize, UI_MAINCOLOR, 0.5f ); - } - } + drawfill([ 0, 0 ], vecSize, [ 0, 0, 0 ], 0.5f); + } else + drawpic([ 0, 0 ], BACKGROUND_IMG, vecSize, [ 1, 1, 1 ], 1.0f); + } diff --git a/src/menu-vgui/defs.h b/src/menu-vgui/defs.h index 97c770c8..b0c221e3 100755 --- a/src/menu-vgui/defs.h +++ b/src/menu-vgui/defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int g_iMenuActive; vector video_res; diff --git a/src/menu-vgui/desktop.qc b/src/menu-vgui/desktop.qc index 5ca2923c..39adea4e 100755 --- a/src/menu-vgui/desktop.qc +++ b/src/menu-vgui/desktop.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Desktop_Init ( void ) { diff --git a/src/menu-vgui/loading.qc b/src/menu-vgui/loading.qc index 270e77c9..1c7d3752 100755 --- a/src/menu-vgui/loading.qc +++ b/src/menu-vgui/loading.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Loading_Draw ( vector vecSize ) { diff --git a/src/menu-vgui/main.h b/src/menu-vgui/main.h index 83456b6f..a3f40edc 100755 --- a/src/menu-vgui/main.h +++ b/src/menu-vgui/main.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,6 +12,6 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ CUIWidget g_uiDesktop; diff --git a/src/menu-vgui/main.qc b/src/menu-vgui/main.qc index a048135d..5f4c46bb 100644 --- a/src/menu-vgui/main.qc +++ b/src/menu-vgui/main.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,9 +12,10 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var int autocvar_r_autoscale = TRUE; + void Menu_AutoScale(void) { @@ -33,15 +34,16 @@ Menu_AutoScale(void) } } -void m_init ( void ) +void +m_init(void) { UISystem_Init(); Background_Init(); Desktop_Init(); - registercommand( "menu_quit" ); - registercommand( "menu_music" ); - registercommand( "map_background" ); + registercommand("menu_quit"); + registercommand("menu_music"); + registercommand("map_background"); Menu_AutoScale(); } @@ -52,12 +54,14 @@ Menu_RendererRestarted(string renderer) Menu_AutoScale(); } -void m_shutdown ( void ) +void +m_shutdown(void) { } -void m_draw ( vector vecScreensize ) +void +m_draw(vector vecScreensize) { if (vecScreensize != video_res) { Menu_AutoScale(); @@ -88,11 +92,12 @@ void m_draw ( vector vecScreensize ) lasttime = time; video_res = vecScreensize; - Background_Draw( vecScreensize ); + Background_Draw(vecScreensize); Desktop_Draw(); } -float Menu_InputEvent ( float evtype, float scanx, float chary, float devid ) +float +Menu_InputEvent (float evtype, float scanx, float chary, float devid) { switch (evtype) { case IE_KEYDOWN: @@ -105,8 +110,7 @@ float Menu_InputEvent ( float evtype, float scanx, float chary, float devid ) } g_vecMousePos = getmousepos(); - - g_uiDesktop.Input( evtype, scanx, chary, devid ); + g_uiDesktop.Input(evtype, scanx, chary, devid); return (float)g_iMenuActive; } @@ -141,19 +145,18 @@ m_toggle void m_toggle(float fMode) { - if (fMode == FALSE) { + if (fMode == FALSE) m_hide(); - } else { + else m_display(); - } } -float m_consolecommand ( string strCommand ) +float m_consolecommand(string strCommand) { - dprint( sprintf( "[MENU] m_consolecommand: %s\n", strCommand ) ); - tokenize( strCommand ); + dprint(sprintf("[MENU] m_consolecommand: %s\n", strCommand)); + tokenize(strCommand); - switch ( argv( 0 ) ) { + switch (argv(0)) { case "menu_quit": UI_QuitGame_Show(); break; diff --git a/src/menu-vgui/ui_console.qc b/src/menu-vgui/ui_console.qc index 8cfbc975..e6a1dc73 100755 --- a/src/menu-vgui/ui_console.qc +++ b/src/menu-vgui/ui_console.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int g_iConsoleInitialized; diff --git a/src/menu-vgui/ui_createserver.qc b/src/menu-vgui/ui_createserver.qc index 82ae1cd7..394f9e62 100755 --- a/src/menu-vgui/ui_createserver.qc +++ b/src/menu-vgui/ui_createserver.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int g_iCreateServerInitialized; diff --git a/src/menu-vgui/ui_fileopen.qc b/src/menu-vgui/ui_fileopen.qc index d0f755b1..bf76ef01 100755 --- a/src/menu-vgui/ui_fileopen.qc +++ b/src/menu-vgui/ui_fileopen.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int g_iFindServersInitialized; diff --git a/src/menu-vgui/ui_findservers.qc b/src/menu-vgui/ui_findservers.qc index 66fedee0..dcd6186f 100755 --- a/src/menu-vgui/ui_findservers.qc +++ b/src/menu-vgui/ui_findservers.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int g_iFindServersInitialized; diff --git a/src/menu-vgui/ui_modelviewer.qc b/src/menu-vgui/ui_modelviewer.qc index d590967d..6cd7b110 100644 --- a/src/menu-vgui/ui_modelviewer.qc +++ b/src/menu-vgui/ui_modelviewer.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int g_iModelViewerInitialized; diff --git a/src/menu-vgui/ui_musicplayer.qc b/src/menu-vgui/ui_musicplayer.qc index da012da4..73f7b9af 100755 --- a/src/menu-vgui/ui_musicplayer.qc +++ b/src/menu-vgui/ui_musicplayer.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int g_iMusicPlayerInitialized; diff --git a/src/menu-vgui/ui_newgame.qc b/src/menu-vgui/ui_newgame.qc index fa079fdc..d640e0e8 100755 --- a/src/menu-vgui/ui_newgame.qc +++ b/src/menu-vgui/ui_newgame.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int g_iNewGameInitialized; diff --git a/src/menu-vgui/ui_quitgame.qc b/src/menu-vgui/ui_quitgame.qc index 17978bcc..88b08b7f 100755 --- a/src/menu-vgui/ui_quitgame.qc +++ b/src/menu-vgui/ui_quitgame.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int g_iQuitGameInitialized; diff --git a/src/platform/achievements.h b/src/platform/achievements.h index 5766bca6..90d58f50 100644 --- a/src/platform/achievements.h +++ b/src/platform/achievements.h @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ typedef struct { diff --git a/src/platform/achievements.qc b/src/platform/achievements.qc index a0716a21..c63f68fd 100644 --- a/src/platform/achievements.qc +++ b/src/platform/achievements.qc @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + /* unlock an achievement */ void Achievement_Set(string strName) diff --git a/src/platform/defs.h b/src/platform/defs.h index 1b5c3289..89fc2702 100644 --- a/src/platform/defs.h +++ b/src/platform/defs.h @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + #include "achievements.h" #include "master.h" #include "modserver.h" diff --git a/src/platform/master.h b/src/platform/master.h index 2a3ac246..33d94ffd 100644 --- a/src/platform/master.h +++ b/src/platform/master.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,8 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - +*/ #define MASTER_DNS "master.frag-net.com" #define MASTER_PORT 27950 diff --git a/src/platform/master.qc b/src/platform/master.qc index c9b2d6f0..6aa2ee20 100644 --- a/src/platform/master.qc +++ b/src/platform/master.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ string Master_Resolve(void) diff --git a/src/platform/modserver.h b/src/platform/modserver.h index 2a23d8ba..2f396063 100644 --- a/src/platform/modserver.h +++ b/src/platform/modserver.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifndef WEBMENU #define MODSERVER_REQ_LIST 100 diff --git a/src/platform/modserver.qc b/src/platform/modserver.qc index 844a884d..1c9497c1 100644 --- a/src/platform/modserver.qc +++ b/src/platform/modserver.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifndef WEBMENU void* diff --git a/src/platform/music.h b/src/platform/music.h index 8c0a4ab1..c1cb0977 100644 --- a/src/platform/music.h +++ b/src/platform/music.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* we're forced to support a few different paths */ enum diff --git a/src/platform/music.qc b/src/platform/music.qc index 7973cdc2..f97d4bcf 100644 --- a/src/platform/music.qc +++ b/src/platform/music.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* some installs may have the music in media/, others may be in music/ */ string diff --git a/src/platform/richpresence.h b/src/platform/richpresence.h index 05005d19..9d913376 100644 --- a/src/platform/richpresence.h +++ b/src/platform/richpresence.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,10 +12,10 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void RichPresence_Set(string strKey, string strValue); void RichPresence_DumpInfo(void); void RichPresence_Clear(void); -bool RichPresence_WasSet(void); \ No newline at end of file +bool RichPresence_WasSet(void); diff --git a/src/platform/richpresence.qc b/src/platform/richpresence.qc index 58363a6d..97992641 100644 --- a/src/platform/richpresence.qc +++ b/src/platform/richpresence.qc @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + /* extremely primitive rich presence stuff that'll be extended later down the line or something */ #define RICHPRESENCE_KEYS 2 @@ -50,4 +66,4 @@ bool RichPresence_WasSet(void) { return g_richpresence_set; -} \ No newline at end of file +} diff --git a/src/platform/servers.h b/src/platform/servers.h index 95af58f6..bf9acb3b 100644 --- a/src/platform/servers.h +++ b/src/platform/servers.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* returns if a given address is external */ int Server_IsLan(string address); diff --git a/src/platform/servers.qc b/src/platform/servers.qc index 37c39646..c6e53cb3 100644 --- a/src/platform/servers.qc +++ b/src/platform/servers.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int Server_IsLan(string address) diff --git a/src/platform/tcp.h b/src/platform/tcp.h index 95957044..8cc5941c 100644 --- a/src/platform/tcp.h +++ b/src/platform/tcp.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #define TCP_BUFFER_LENGTH 32 diff --git a/src/platform/tcp.qc b/src/platform/tcp.qc index ba9c0450..b465da64 100644 --- a/src/platform/tcp.qc +++ b/src/platform/tcp.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int TCP_Connect(tcpinfo_t *in, string path) diff --git a/src/platform/util.h b/src/platform/util.h index 5ef84fa1..efc9c5c6 100644 --- a/src/platform/util.h +++ b/src/platform/util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int Util_CheckMouse(int x, int y, int sx, int sy); diff --git a/src/platform/util.qc b/src/platform/util.qc index d8346132..16b841b0 100644 --- a/src/platform/util.qc +++ b/src/platform/util.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ int Util_CheckMouse(int x, int y, int sx, int sy) diff --git a/src/plugins/banner.qc b/src/plugins/banner.qc index 6854067c..091821a0 100755 --- a/src/plugins/banner.qc +++ b/src/plugins/banner.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #include "../shared/events.h" diff --git a/src/plugins/chatfilter.qc b/src/plugins/chatfilter.qc index 29e2b89d..b29bae9a 100755 --- a/src/plugins/chatfilter.qc +++ b/src/plugins/chatfilter.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var int autocvar_chatplug_filter = 1; diff --git a/src/plugins/chatsounds.qc b/src/plugins/chatsounds.qc index 84e71e0d..84ba05a6 100644 --- a/src/plugins/chatsounds.qc +++ b/src/plugins/chatsounds.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* our sound boogeyman */ static entity emitter; diff --git a/src/plugins/connectsounds.qc b/src/plugins/connectsounds.qc index 90af6061..54ae38e2 100755 --- a/src/plugins/connectsounds.qc +++ b/src/plugins/connectsounds.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ entity g_cnspk; diff --git a/src/plugins/ircbridge.qc b/src/plugins/ircbridge.qc index 29a804b3..4e0c9a42 100644 --- a/src/plugins/ircbridge.qc +++ b/src/plugins/ircbridge.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #include "../platform/tcp.h" #include "../platform/tcp.qc" diff --git a/src/plugins/voxannouncer.qc b/src/plugins/voxannouncer.qc index c8deb832..08184d40 100644 --- a/src/plugins/voxannouncer.qc +++ b/src/plugins/voxannouncer.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #include "../shared/events.h" diff --git a/src/server/client.qc b/src/server/client.qc index ec9e73b1..38953e8c 100644 --- a/src/server/client.qc +++ b/src/server/client.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* ================= diff --git a/src/server/entry.qc b/src/server/entry.qc index 8cda9efa..ed54621b 100644 --- a/src/server/entry.qc +++ b/src/server/entry.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* ================= diff --git a/src/server/footsteps.qc b/src/server/footsteps.qc index 4aea42e6..8c09375a 100755 --- a/src/server/footsteps.qc +++ b/src/server/footsteps.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* ================= diff --git a/src/server/gamerules.qc b/src/server/gamerules.qc index 931f5a76..78d21df3 100644 --- a/src/server/gamerules.qc +++ b/src/server/gamerules.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var bool autocvar_sv_friendlyFire = false; diff --git a/src/server/hlmaterials.qc b/src/server/hlmaterials.qc index 7ec22b1a..69215e67 100644 --- a/src/server/hlmaterials.qc +++ b/src/server/hlmaterials.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* FIXME: world.... sigh, we should box this into a worldspawn class */ .string materials_file; diff --git a/src/server/logging.qc b/src/server/logging.qc index e616bc16..c27e0f98 100644 --- a/src/server/logging.qc +++ b/src/server/logging.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void Logging_Frag(entity a, entity v) diff --git a/src/server/mapcycle.qc b/src/server/mapcycle.qc index 76e95801..a4acc2d4 100644 --- a/src/server/mapcycle.qc +++ b/src/server/mapcycle.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var int autocvar_mapcycle_enabled = TRUE; var string autocvar_mapcycle_file = "mapcycle.txt"; diff --git a/src/server/modelevent.qc b/src/server/modelevent.qc index 38c36677..699bdcb5 100644 --- a/src/server/modelevent.qc +++ b/src/server/modelevent.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* ================= diff --git a/src/server/nodes.qc b/src/server/nodes.qc index 860ada32..f7676aff 100644 --- a/src/server/nodes.qc +++ b/src/server/nodes.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* write current nodes to disk */ void diff --git a/src/server/plugins.qc b/src/server/plugins.qc index e5a781b9..c6de6de3 100644 --- a/src/server/plugins.qc +++ b/src/server/plugins.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ typedef struct { diff --git a/src/server/sentences.qc b/src/server/sentences.qc index e39e6b62..8b852795 100644 --- a/src/server/sentences.qc +++ b/src/server/sentences.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* voice sentence samples for AI and other triggers that are supposed to talk. * the formatting is messy as hell and I feel dirty for even bothering with all diff --git a/src/server/skill.qc b/src/server/skill.qc index fc51ec1d..f892768c 100644 --- a/src/server/skill.qc +++ b/src/server/skill.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* ================= diff --git a/src/server/spawn.qc b/src/server/spawn.qc index 1f63fd8d..b5acc427 100644 --- a/src/server/spawn.qc +++ b/src/server/spawn.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* ================= diff --git a/src/server/traceattack.qc b/src/server/traceattack.qc index 296c8cae..5a91def7 100644 --- a/src/server/traceattack.qc +++ b/src/server/traceattack.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void NSTraceAttack::_ApplyDamage(void) diff --git a/src/server/vote.qc b/src/server/vote.qc index a03f3af9..17c38a6e 100644 --- a/src/server/vote.qc +++ b/src/server/vote.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ var string g_strVoteCmd; var float g_flVoteTime; diff --git a/src/server/weapons.qc b/src/server/weapons.qc index 46606e98..7026317a 100644 --- a/src/server/weapons.qc +++ b/src/server/weapons.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* force the drawing of the first weapon that's picked up */ var int autocvar_sv_forceweapondraw = TRUE; diff --git a/src/shared/NSClient.h b/src/shared/NSClient.h index f1e92461..4dac11ba 100644 --- a/src/shared/NSClient.h +++ b/src/shared/NSClient.h @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + /* both NSClientPlayer and base_NSClientSpectator are based off this class */ class NSClient:NSSurfacePropEntity diff --git a/src/shared/NSClient.qc b/src/shared/NSClient.qc index dc53cfd0..5ba2a0f3 100644 --- a/src/shared/NSClient.qc +++ b/src/shared/NSClient.qc @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + void NSClient::OnRemoveEntity(void) { diff --git a/src/shared/NSClientPlayer.h b/src/shared/NSClientPlayer.h index 3a9dd8ac..8ad2cd1b 100644 --- a/src/shared/NSClientPlayer.h +++ b/src/shared/NSClientPlayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class NSClientPlayer:NSClientSpectator diff --git a/src/shared/NSClientPlayer.qc b/src/shared/NSClientPlayer.qc index 67e762ad..261ecb14 100644 --- a/src/shared/NSClientPlayer.qc +++ b/src/shared/NSClientPlayer.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ bool NSClientPlayer::IsRealSpectator(void) diff --git a/src/shared/NSClientSpectator.h b/src/shared/NSClientSpectator.h index c9e8f64c..20c75212 100644 --- a/src/shared/NSClientSpectator.h +++ b/src/shared/NSClientSpectator.h @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + typedef enumflags { SPECFL_ORIGIN, diff --git a/src/shared/NSClientSpectator.qc b/src/shared/NSClientSpectator.qc index 9979d3b1..28f1e1da 100644 --- a/src/shared/NSClientSpectator.qc +++ b/src/shared/NSClientSpectator.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,8 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - +*/ bool NSClientSpectator::IsRealSpectator(void) diff --git a/src/shared/NSMaterial.h b/src/shared/NSMaterial.h index 1f067ed5..a134262d 100644 --- a/src/shared/NSMaterial.h +++ b/src/shared/NSMaterial.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class NSMaterial diff --git a/src/shared/NSMaterial.qc b/src/shared/NSMaterial.qc index 44ec99ba..440a9de7 100644 --- a/src/shared/NSMaterial.qc +++ b/src/shared/NSMaterial.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void NSMaterial::NSMaterial(void) @@ -21,6 +21,10 @@ NSMaterial::NSMaterial(void) m_bFootsteps = false; m_flFriction = 1.0f; m_strStepSound = "step.default"; + + /* no need to be around */ + think = Util_Destroy; + nextthink = time + 0.25f; } float @@ -104,6 +108,7 @@ Materials_LoadFromMat(string filename) if (command == "material") { hash_add(g_hashMaterials, materialname, parameters); print(sprintf("added Material %S type %S\n", materialname, parameters)); + break; } } } diff --git a/src/shared/colors.h b/src/shared/colors.h index 7f79cc02..683f9a78 100644 --- a/src/shared/colors.h +++ b/src/shared/colors.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ string Colors_RGB8_to_HEX(vector color) @@ -54,4 +54,4 @@ string Colors_RGB255_to_HEX(vector color) { return Colors_RGB8_to_HEX(color / 255); -} \ No newline at end of file +} diff --git a/src/shared/damage.h b/src/shared/damage.h index 5271ac80..d4bf6439 100644 --- a/src/shared/damage.h +++ b/src/shared/damage.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ typedef enumflags { @@ -20,7 +20,7 @@ typedef enumflags DMG_CRUSH, DMG_BULLET, DMG_SLASH, - DMG_FREEZE, + DMG_FREEZE, DMG_BURN, DMG_VEHICLE, DMG_FALL, @@ -43,5 +43,5 @@ typedef enumflags DMG_SKIP_ARMOR, DMG_SKIP_RAGDOLL } damageType_t; - -#define DMG_ACID DMG_CHEMICAL \ No newline at end of file + +#define DMG_ACID DMG_CHEMICAL diff --git a/src/shared/defs.h b/src/shared/defs.h index c2f10758..66ffe068 100644 --- a/src/shared/defs.h +++ b/src/shared/defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* networking helpers */ #define PREDICTED_INT(x) int x; int x ##_net @@ -186,6 +186,18 @@ precache_model(string m) return prior(m); } +__wrap string +precache_sound(string sample) +{ + if (sample != "") /* not empty */ + if not(whichpack(strcat("sound/", sample))) { /* not present on disk */ + print(strcat("^1sfx sample ", sample, " does not exist!\n")); + return "misc/missing.wav"; + } + + return prior(sample); +} + /* this could probably be a lot better, use this from now on so that it can be improved later */ noref float input_sequence; float diff --git a/src/shared/entities.h b/src/shared/entities.h index 64cba686..005ebfb7 100644 --- a/src/shared/entities.h +++ b/src/shared/entities.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* entity update identifiers */ enum diff --git a/src/shared/events.h b/src/shared/events.h index 61d290fa..abb358b1 100644 --- a/src/shared/events.h +++ b/src/shared/events.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* one-time network events */ enum diff --git a/src/shared/flags.h b/src/shared/flags.h index 6d96ecea..e7ef9947 100644 --- a/src/shared/flags.h +++ b/src/shared/flags.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* engine reserved */ #define FL_FLY (1<<0) diff --git a/src/shared/global.h b/src/shared/global.h index 99aab406..8b9bf9c4 100644 --- a/src/shared/global.h +++ b/src/shared/global.h @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + void _NSLog(string msg) { @@ -14,4 +30,4 @@ enumflags SEARCH_FORCESEARCH, SEARCH_MULTISEARCH, SEARCH_NAMESORT -}; \ No newline at end of file +}; diff --git a/src/shared/hitmesh.h b/src/shared/hitmesh.h index 385c486f..ca544c90 100644 --- a/src/shared/hitmesh.h +++ b/src/shared/hitmesh.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* global hitmesh definitions */ typedef enum diff --git a/src/shared/materials.h b/src/shared/materials.h index c4aa5be4..c5dd4034 100644 --- a/src/shared/materials.h +++ b/src/shared/materials.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ // Impact types typedef enum diff --git a/src/shared/math.h b/src/shared/math.h index fe6528f0..09a9c422 100644 --- a/src/shared/math.h +++ b/src/shared/math.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #define MATH_PI 3.1415926 diff --git a/src/shared/math.qc b/src/shared/math.qc index 7409a66b..cc5ae53f 100644 --- a/src/shared/math.qc +++ b/src/shared/math.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* lerping function that accounts for negative degrees */ float diff --git a/src/shared/memory.h b/src/shared/memory.h index fd576cfd..6e182ad8 100644 --- a/src/shared/memory.h +++ b/src/shared/memory.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void* memrealloc(__variant *oldptr, int elementsize, int oldelements, int newelements) diff --git a/src/shared/platform.h b/src/shared/platform.h index 3bd32baf..c2fa1e87 100644 --- a/src/shared/platform.h +++ b/src/shared/platform.h @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ typedef enum { diff --git a/src/shared/player_pmove.qc b/src/shared/player_pmove.qc index b030a5e9..798a70f4 100644 --- a/src/shared/player_pmove.qc +++ b/src/shared/player_pmove.qc @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2016-2022 Vera Visions LLC. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ vector saved_input_movevalues; int saved_input_buttons; diff --git a/src/shared/pmove.h b/src/shared/pmove.h index cc2d627b..5be8f395 100644 --- a/src/shared/pmove.h +++ b/src/shared/pmove.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ .float waterlevel; .float watertype; diff --git a/src/shared/pmove.qc b/src/shared/pmove.qc index a6dd2e55..6a6c12df 100644 --- a/src/shared/pmove.qc +++ b/src/shared/pmove.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #define CUSTOMPLAYERPHYSICS diff --git a/src/shared/pmove_custom.qc b/src/shared/pmove_custom.qc index 58eb5649..77acd107 100644 --- a/src/shared/pmove_custom.qc +++ b/src/shared/pmove_custom.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifdef CUSTOMPLAYERPHYSICS void diff --git a/src/shared/propdata.h b/src/shared/propdata.h index c589d603..eab1e2da 100644 --- a/src/shared/propdata.h +++ b/src/shared/propdata.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* Prop-Data specs diff --git a/src/shared/propdata.qc b/src/shared/propdata.qc index 2c786520..edbbc950 100644 --- a/src/shared/propdata.qc +++ b/src/shared/propdata.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* #define PROPDATA_DYNAMIC diff --git a/src/shared/sound.h b/src/shared/sound.h index 50064d52..ec54aa74 100644 --- a/src/shared/sound.h +++ b/src/shared/sound.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ .float maxspeed; .float flags; diff --git a/src/shared/sound.qc b/src/shared/sound.qc index 1f15882f..bbe765d1 100644 --- a/src/shared/sound.qc +++ b/src/shared/sound.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void(vector origin, string sample, float volume, float attenuation, float pitch) pointsound_proper = #483; @@ -289,6 +289,7 @@ Sound_Precache(string shader) #else if (g_sounds_count >= SOUNDSHADER_MAX) { error(sprintf("Sound_Precache: Reached SOUNDSHADER_MAX (%d)\n", SOUNDSHADER_MAX)); + return -1; } #endif @@ -345,11 +346,8 @@ Sound_Distance(entity target, string shader) sample = (int)hash_get(g_hashsounds, shader, -1); if (sample < 0) { -#ifdef SERVER - print(sprintf("^1Sound_Distance: shader %s is not precached (SERVER)\n", shader)); -#else - print(sprintf("^1Sound_Distance: shader %s is not precached (CLIENT)\n", shader)); -#endif + crossprint(sprintf("^1Sound_Distance: shader %s is not precached\n", shader)); + return; } /* pick a sample */ @@ -411,11 +409,8 @@ Sound_DistancePos(vector pos, string shader) sample = (int)hash_get(g_hashsounds, shader, -1); if (sample < 0) { -#ifdef SERVER - print(sprintf("^1Sound_DistancePos: shader %s is not precached (SERVER)\n", shader)); -#else - print(sprintf("^1Sound_DistancePos: shader %s is not precached (CLIENT)\n", shader)); -#endif + crossprint(sprintf("^1Sound_DistancePos: shader %s is not precached (SERVER)\n", shader)); + return; } /* pick a sample */ @@ -472,7 +467,6 @@ Sound_Play(entity target, int chan, string shader) if (sample < 0) { crossprint(sprintf("^1Sound_Play: shader %s is not precached\n", shader)); - sound(target, chan, "misc/missing.wav", 1.0f, ATTN_NORM); return; } @@ -588,7 +582,6 @@ Sound_PlayAt(vector pos, string shader) if (sample < 0) { crossprint(sprintf("^1Sound_PlayAt: shader %s is not precached\n", shader)); - pointsound(pos, "misc/missing.wav", 1.0f, ATTN_NORM); return; } @@ -645,7 +638,6 @@ Sound_PlayLocal(string shader) if (sample < 0) { crossprint(sprintf("^1Sound_PlayLocal: shader %s is not precached\n", shader)); - localsound("misc/missing.wav"); return; } @@ -722,11 +714,7 @@ Sound_Speak(entity target, string shader) sample = (int)hash_get(g_hashsounds, shader, -1); if (sample < 0) { -#ifdef SERVER - print(sprintf("^1Sound_Speak: shader %s is not precached (SERVER)\n", shader)); -#else - print(sprintf("^1Sound_Speak: shader %s is not precached (CLIENT)\n", shader)); -#endif + crossprint(sprintf("^1Sound_Speak: shader %s is not precached (SERVER)\n", shader)); return; } diff --git a/src/shared/surfaceproperties.h b/src/shared/surfaceproperties.h index 855ed0bc..516df7e1 100644 --- a/src/shared/surfaceproperties.h +++ b/src/shared/surfaceproperties.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* Surface Data Specs diff --git a/src/shared/surfaceproperties.qc b/src/shared/surfaceproperties.qc index 41bd8eee..e94690cf 100644 --- a/src/shared/surfaceproperties.qc +++ b/src/shared/surfaceproperties.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2021 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifdef SERVER float HLMaterials_Fetch(string); diff --git a/src/vgui/ui.qc b/src/vgui/ui.qc index e1cf4416..d74a195a 100644 --- a/src/vgui/ui.qc +++ b/src/vgui/ui.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ font_s g_fntDefault; var int g_vguiWidgetCount; diff --git a/src/vgui/ui_3dview.qc b/src/vgui/ui_3dview.qc index 97903b15..383a772d 100644 --- a/src/vgui/ui_3dview.qc +++ b/src/vgui/ui_3dview.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ noref .vector origin; noref .vector angles; diff --git a/src/vgui/ui_button.qc b/src/vgui/ui_button.qc index c267612a..9f84347d 100644 --- a/src/vgui/ui_button.qc +++ b/src/vgui/ui_button.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enumflags { diff --git a/src/vgui/ui_checkbox.qc b/src/vgui/ui_checkbox.qc index e1243c5a..83844bc5 100644 --- a/src/vgui/ui_checkbox.qc +++ b/src/vgui/ui_checkbox.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enumflags { diff --git a/src/vgui/ui_label.qc b/src/vgui/ui_label.qc index acfbb9f0..5143f3b8 100644 --- a/src/vgui/ui_label.qc +++ b/src/vgui/ui_label.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class CUILabel:CUIWidget { diff --git a/src/vgui/ui_list.qc b/src/vgui/ui_list.qc index 5b5cc146..e71f29a5 100644 --- a/src/vgui/ui_list.qc +++ b/src/vgui/ui_list.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class CUIList:CUIWidget { diff --git a/src/vgui/ui_listbox.qc b/src/vgui/ui_listbox.qc index 501e95bf..b450c286 100644 --- a/src/vgui/ui_listbox.qc +++ b/src/vgui/ui_listbox.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class CUIListBox:CUIWidget { diff --git a/src/vgui/ui_menubutton.qc b/src/vgui/ui_menubutton.qc index 84705c35..2ad077a5 100644 --- a/src/vgui/ui_menubutton.qc +++ b/src/vgui/ui_menubutton.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #ifdef MENU enumflags diff --git a/src/vgui/ui_pic.qc b/src/vgui/ui_pic.qc index e81b6c7d..2d50cdae 100644 --- a/src/vgui/ui_pic.qc +++ b/src/vgui/ui_pic.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enumflags { diff --git a/src/vgui/ui_radio.qc b/src/vgui/ui_radio.qc index 11a3c300..ec0cc954 100644 --- a/src/vgui/ui_radio.qc +++ b/src/vgui/ui_radio.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enumflags { diff --git a/src/vgui/ui_scrollbar.qc b/src/vgui/ui_scrollbar.qc index 3c2f9ff8..ef8aee54 100644 --- a/src/vgui/ui_scrollbar.qc +++ b/src/vgui/ui_scrollbar.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enumflags { diff --git a/src/vgui/ui_slider.qc b/src/vgui/ui_slider.qc index 761f488f..7643a84a 100644 --- a/src/vgui/ui_slider.qc +++ b/src/vgui/ui_slider.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enumflags { diff --git a/src/vgui/ui_tabview.qc b/src/vgui/ui_tabview.qc index 186731b8..88b2f856 100644 --- a/src/vgui/ui_tabview.qc +++ b/src/vgui/ui_tabview.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ class CUITabView:CUIWidget { diff --git a/src/vgui/ui_textbox.qc b/src/vgui/ui_textbox.qc index ce0f11c3..abed6542 100644 --- a/src/vgui/ui_textbox.qc +++ b/src/vgui/ui_textbox.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enumflags { diff --git a/src/vgui/ui_window.qc b/src/vgui/ui_window.qc index 6c6b913e..1eafb589 100644 --- a/src/vgui/ui_window.qc +++ b/src/vgui/ui_window.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ enumflags { diff --git a/src/xr/NSXRInput.h b/src/xr/NSXRInput.h index fef35b49..bdf41904 100644 --- a/src/xr/NSXRInput.h +++ b/src/xr/NSXRInput.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ typedef enum { @@ -56,4 +56,4 @@ NSXRInput virtual void(void) InputFrame; virtual void(void) PrintInfo; -}; \ No newline at end of file +}; diff --git a/src/xr/NSXRInput.qc b/src/xr/NSXRInput.qc index 93193210..50ab08a6 100644 --- a/src/xr/NSXRInput.qc +++ b/src/xr/NSXRInput.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ vector NSXRInput::GetOrigin(void) @@ -162,4 +162,4 @@ NSXRInput::PrintInfo(void) void NSXRInput::NSXRInput(void) { -} \ No newline at end of file +} diff --git a/src/xr/NSXRSpace.h b/src/xr/NSXRSpace.h index 2f177b49..8b63b582 100644 --- a/src/xr/NSXRSpace.h +++ b/src/xr/NSXRSpace.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* class handling the room to world translations for XR */ class @@ -34,4 +34,4 @@ NSXRSpace virtual vector(vector) RoomToWorldOrigin; virtual vector(vector) RoomToWorldAngles; -}; \ No newline at end of file +}; diff --git a/src/xr/NSXRSpace.qc b/src/xr/NSXRSpace.qc index a39c7254..010d18a2 100644 --- a/src/xr/NSXRSpace.qc +++ b/src/xr/NSXRSpace.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ vector NSXRSpace::GetForward(void) @@ -69,4 +69,4 @@ NSXRSpace::SetAngles(vector vecAngles) void NSXRSpace::NSXRSpace(void) { -} \ No newline at end of file +} diff --git a/src/xr/defs.h b/src/xr/defs.h index 9b9019ec..5c19fbd8 100644 --- a/src/xr/defs.h +++ b/src/xr/defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ #include "NSXRSpace.h" #include "NSXRInput.h" diff --git a/src/xr/xr.h b/src/xr/xr.h index 6e981761..54426d14 100644 --- a/src/xr/xr.h +++ b/src/xr/xr.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ void XR_Init(entity); void XR_Shutdown(entity); @@ -24,4 +24,4 @@ void XR_UpdateView(entity); #endif var float autocvar_xr_roomscale = 1.0f; -var float autocvar_xr_viewheight = -48.0f; \ No newline at end of file +var float autocvar_xr_viewheight = -48.0f; diff --git a/src/xr/xr.qc b/src/xr/xr.qc index c8e69cd5..86b77be2 100644 --- a/src/xr/xr.qc +++ b/src/xr/xr.qc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Marco Cawthorne + * Copyright (c) 2016-2022 Vera Visions LLC. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +*/ /* The engine provides us with 3 devices right now, each giving us