tech
/
nuclide
2
0
Fork 0
Code Issues 33 Releases Activity

Move entity-update/event definitions for game-specific cases out of root 

src/shared.
This commit is contained in:
Marco Cawthorne 2020-10-24 13:11:02 +02:00
parent cce2429308
commit 4962f82f89
11 changed files with 75 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/cstrike/progs.src
View File

@ -10,8 +10,8 @@
#includelist
../../shared/fteextensions.qc
../../shared/cstrike/defs.h
../../shared/defs.h
../../shared/cstrike/defs.h
../cstrike/defs.h
../defs.h

2
src/shared/cstrike/defs.h
View File

@ -18,6 +18,8 @@
#include "radio.h"
#include "weapons.h"
#include "items.h"
#include "entities.h"
#include "events.h"
#define TEAM_T 1
#define TEAM_CT 2

20
src/shared/cstrike/entities.h Normal file
View File

@ -0,0 +1,20 @@
/*
* Copyright (c) 2016-2020 Marco Hladik <marco@icculus.org>
*
* 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
{
ENT_C4BOMB = ENT_SEPARATOR,
};

23
src/shared/cstrike/events.h Normal file
View File

@ -0,0 +1,23 @@
/*
* Copyright (c) 2016-2020 Marco Hladik <marco@icculus.org>
*
* 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
{
EV_RADIOMSG = EV_SEPARATOR,
EV_RADIOMSG2,
EV_SMOKE,
EV_FLASH
};

11
src/shared/entities.h
View File

@ -14,7 +14,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* TODO: Split game-specific ones into one of the shared folders... */
/* entity update identifiers */
enum
{
ENT_ENTITY = 1,
@ -24,13 +24,8 @@ enum
ENT_ENVLASER,
ENT_SPRITE,
ENT_SPRAY,
#ifdef VALVE
ENT_TRIPMINE,
#endif
#ifdef CSTRIKE
ENT_C4BOMB,
#endif
ENT_DECAL
ENT_DECAL,
ENT_SEPARATOR
};
/* entity update flags */

11
src/shared/events.h
View File

@ -14,7 +14,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
// Network Events
/* one-time network events */
enum
{
EV_INTERMISSION,
@ -46,13 +46,6 @@ enum
EV_CHAT,
EV_CHAT_TEAM,
EV_CHAT_VOX,
#ifdef VALVE
EV_VIEWMODEL,
#endif
#ifdef CSTRIKE
EV_RADIOMSG,
EV_RADIOMSG2,
EV_SMOKE,
EV_FLASH,
#endif
EV_SEPARATOR
};

1
src/shared/gearbox/include.src
View File

@ -1,4 +1,5 @@
#includelist
../../shared/valve/entities.h
../../shared/valve/flags.h
../../shared/sound.c
../../shared/gearbox/player.cpp

1
src/shared/hunger/include.src
View File

@ -1,4 +1,5 @@
#includelist
../../shared/valve/entities.h
../../shared/valve/flags.h
../../shared/sound.c
../../shared/hunger/player.cpp

1
src/shared/scihunt/include.src
View File

@ -1,4 +1,5 @@
#includelist
../../shared/valve/entities.h
../../shared/valve/flags.h
../../shared/sound.c
../../shared/scihunt/player.cpp

20
src/shared/valve/entities.h Normal file
View File

@ -0,0 +1,20 @@
/*
* Copyright (c) 2016-2020 Marco Hladik <marco@icculus.org>
*
* 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
{
ENT_TRIPMINE = ENT_SEPARATOR
};

1
src/shared/valve/include.src
View File

@ -1,4 +1,5 @@
#includelist
../../shared/valve/entities.h
../../shared/valve/flags.h
../../shared/sound.c
../../shared/valve/player.cpp