diff --git a/src/gs-entbase/server/defs.h b/src/gs-entbase/server/defs.h index e0127e19..6443e33d 100644 --- a/src/gs-entbase/server/defs.h +++ b/src/gs-entbase/server/defs.h @@ -14,7 +14,5 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "../shared/baseentity.h" - void FX_Spark(vector, vector); void FX_BreakModel(int, vector, vector, vector, float); diff --git a/src/gs-entbase/shared/baseentity.h b/src/gs-entbase/shared/baseentity.h deleted file mode 100644 index 5a6cae8b..00000000 --- a/src/gs-entbase/shared/baseentity.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2016-2022 Vera Visions 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. -*/ - -#ifndef BASEENTITY -#define BASEENTITY - -#include "env_sprite.h" -#endif diff --git a/src/gs-entbase/shared/env_sprite.h b/src/gs-entbase/shared/env_sprite.h deleted file mode 100644 index 6472c35b..00000000 --- a/src/gs-entbase/shared/env_sprite.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2016-2022 Vera Visions 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 index 525073a0..e55e5c45 100644 --- a/src/gs-entbase/shared/env_sprite.qc +++ b/src/gs-entbase/shared/env_sprite.qc @@ -40,6 +40,19 @@ Only used with an external sprite format, like SPR, SPRHL and SPR32. This entity was introduced in Half-Life (1998). */ +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, +}; + enumflags { ENVS_STARTON, diff --git a/src/shared/defs.h b/src/shared/defs.h index d6e3b56e..5f124d49 100644 --- a/src/shared/defs.h +++ b/src/shared/defs.h @@ -45,8 +45,6 @@ string __fullspawndata; #include "../gs-entbase/server/defs.h" #endif -#include "../gs-entbase/shared/baseentity.h" - #include "NSIO.h" #include "NSTrigger.h" #include "NSEntity.h"