diff --git a/src/server/cstrike/defs.h b/src/server/cstrike/defs.h index 70c36f02..e6026794 100644 --- a/src/server/cstrike/defs.h +++ b/src/server/cstrike/defs.h @@ -16,6 +16,7 @@ #include "gamerules.h" #include "money.h" +#include "../valve/items.h" var int g_cstrike_buying = 0; var float g_cstrike_bombradius = 500; diff --git a/src/server/gearbox/defs.h b/src/server/gearbox/defs.h index dfe95f88..12aeb124 100644 --- a/src/server/gearbox/defs.h +++ b/src/server/gearbox/defs.h @@ -16,3 +16,4 @@ #include "../valve/gamerules.h" #include "gamerules_ctf.h" +#include "../valve/items.h" diff --git a/src/server/scihunt/defs.h b/src/server/scihunt/defs.h index c6c2f0ab..05e9d724 100644 --- a/src/server/scihunt/defs.h +++ b/src/server/scihunt/defs.h @@ -15,3 +15,4 @@ */ #include "gamerules.h" +#include "../valve/items.h" diff --git a/src/server/tfc/defs.h b/src/server/tfc/defs.h index c6c2f0ab..05e9d724 100644 --- a/src/server/tfc/defs.h +++ b/src/server/tfc/defs.h @@ -15,3 +15,4 @@ */ #include "gamerules.h" +#include "../valve/items.h" diff --git a/src/server/valve/defs.h b/src/server/valve/defs.h index c6c2f0ab..88c34489 100644 --- a/src/server/valve/defs.h +++ b/src/server/valve/defs.h @@ -15,3 +15,4 @@ */ #include "gamerules.h" +#include "items.h" diff --git a/src/server/valve/items.cpp b/src/server/valve/items.cpp index 7abcc77b..050366d9 100644 --- a/src/server/valve/items.cpp +++ b/src/server/valve/items.cpp @@ -14,21 +14,6 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* PICKUP ITEMS */ -class item_pickup:CBaseTrigger -{ - int m_bFloating; - int m_iClip; - int m_iWasDropped; - int id; - void(void) item_pickup; - - virtual void(void) touch; - virtual void(int i) setitem; - virtual void(void) Respawn; - virtual void(int) SetFloating; -}; - void item_pickup::touch(void) { if (other.classname != "player") { diff --git a/src/server/valve/items.h b/src/server/valve/items.h new file mode 100644 index 00000000..77e5dddc --- /dev/null +++ b/src/server/valve/items.h @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2016-2020 Marco Hladik + * + * 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. + */ + +/* PICKUP ITEMS */ +class item_pickup:CBaseTrigger +{ + int m_bFloating; + int m_iClip; + int m_iWasDropped; + int id; + void(void) item_pickup; + + virtual void(void) touch; + virtual void(int i) setitem; + virtual void(void) Respawn; + virtual void(int) SetFloating; +};