aboutsummaryrefslogtreecommitdiffstats
path: root/code/game
diff options
context:
space:
mode:
Diffstat (limited to 'code/game')
-rw-r--r--code/game/bg_misc.c104
-rw-r--r--code/game/g_client.c4
-rw-r--r--code/game/g_items.c2
-rw-r--r--code/game/g_misc.c2
-rw-r--r--code/game/g_spawn.c2
-rw-r--r--code/game/g_trigger.c2
-rw-r--r--code/game/g_utils.c2
7 files changed, 59 insertions, 59 deletions
diff --git a/code/game/bg_misc.c b/code/game/bg_misc.c
index 1e5a27e..2ff7770 100644
--- a/code/game/bg_misc.c
+++ b/code/game/bg_misc.c
@@ -48,7 +48,7 @@ gitem_t bg_itemlist[] =
NULL,
{ NULL,
NULL,
- 0, 0} ,
+ NULL, NULL} ,
/* icon */ NULL,
/* pickup */ NULL,
0,
@@ -69,7 +69,7 @@ gitem_t bg_itemlist[] =
"sound/misc/ar1_pkup.wav",
{ "models/powerups/armor/shard.md3",
"models/powerups/armor/shard_sphere.md3",
- 0, 0} ,
+ NULL, NULL} ,
/* icon */ "icons/iconr_shard",
/* pickup */ "Armor Shard",
5,
@@ -85,7 +85,7 @@ gitem_t bg_itemlist[] =
"item_armor_combat",
"sound/misc/ar2_pkup.wav",
{ "models/powerups/armor/armor_yel.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/iconr_yellow",
/* pickup */ "Armor",
50,
@@ -101,7 +101,7 @@ gitem_t bg_itemlist[] =
"item_armor_body",
"sound/misc/ar2_pkup.wav",
{ "models/powerups/armor/armor_red.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/iconr_red",
/* pickup */ "Heavy Armor",
100,
@@ -121,7 +121,7 @@ gitem_t bg_itemlist[] =
"sound/items/s_health.wav",
{ "models/powerups/health/small_cross.md3",
"models/powerups/health/small_sphere.md3",
- 0, 0 },
+ NULL, NULL },
/* icon */ "icons/iconh_green",
/* pickup */ "5 Health",
5,
@@ -138,7 +138,7 @@ gitem_t bg_itemlist[] =
"sound/items/n_health.wav",
{ "models/powerups/health/medium_cross.md3",
"models/powerups/health/medium_sphere.md3",
- 0, 0 },
+ NULL, NULL },
/* icon */ "icons/iconh_yellow",
/* pickup */ "25 Health",
25,
@@ -155,7 +155,7 @@ gitem_t bg_itemlist[] =
"sound/items/l_health.wav",
{ "models/powerups/health/large_cross.md3",
"models/powerups/health/large_sphere.md3",
- 0, 0 },
+ NULL, NULL },
/* icon */ "icons/iconh_red",
/* pickup */ "50 Health",
50,
@@ -172,7 +172,7 @@ gitem_t bg_itemlist[] =
"sound/items/m_health.wav",
{ "models/powerups/health/mega_cross.md3",
"models/powerups/health/mega_sphere.md3",
- 0, 0 },
+ NULL, NULL },
/* icon */ "icons/iconh_mega",
/* pickup */ "Mega Health",
100,
@@ -193,7 +193,7 @@ gitem_t bg_itemlist[] =
"weapon_gauntlet",
"sound/misc/w_pkup.wav",
{ "models/weapons2/gauntlet/gauntlet.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/iconw_gauntlet",
/* pickup */ "Gauntlet",
0,
@@ -209,7 +209,7 @@ gitem_t bg_itemlist[] =
"weapon_shotgun",
"sound/misc/w_pkup.wav",
{ "models/weapons2/shotgun/shotgun.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/iconw_shotgun",
/* pickup */ "Shotgun",
10,
@@ -225,7 +225,7 @@ gitem_t bg_itemlist[] =
"weapon_machinegun",
"sound/misc/w_pkup.wav",
{ "models/weapons2/machinegun/machinegun.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/iconw_machinegun",
/* pickup */ "Machinegun",
40,
@@ -241,7 +241,7 @@ gitem_t bg_itemlist[] =
"weapon_grenadelauncher",
"sound/misc/w_pkup.wav",
{ "models/weapons2/grenadel/grenadel.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/iconw_grenade",
/* pickup */ "Grenade Launcher",
10,
@@ -257,7 +257,7 @@ gitem_t bg_itemlist[] =
"weapon_rocketlauncher",
"sound/misc/w_pkup.wav",
{ "models/weapons2/rocketl/rocketl.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/iconw_rocket",
/* pickup */ "Rocket Launcher",
10,
@@ -273,7 +273,7 @@ gitem_t bg_itemlist[] =
"weapon_lightning",
"sound/misc/w_pkup.wav",
{ "models/weapons2/lightning/lightning.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/iconw_lightning",
/* pickup */ "Lightning Gun",
100,
@@ -289,7 +289,7 @@ gitem_t bg_itemlist[] =
"weapon_railgun",
"sound/misc/w_pkup.wav",
{ "models/weapons2/railgun/railgun.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/iconw_railgun",
/* pickup */ "Railgun",
10,
@@ -305,7 +305,7 @@ gitem_t bg_itemlist[] =
"weapon_plasmagun",
"sound/misc/w_pkup.wav",
{ "models/weapons2/plasma/plasma.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/iconw_plasma",
/* pickup */ "Plasma Gun",
50,
@@ -321,7 +321,7 @@ gitem_t bg_itemlist[] =
"weapon_bfg",
"sound/misc/w_pkup.wav",
{ "models/weapons2/bfg/bfg.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/iconw_bfg",
/* pickup */ "BFG10K",
20,
@@ -337,7 +337,7 @@ gitem_t bg_itemlist[] =
"weapon_grapplinghook",
"sound/misc/w_pkup.wav",
{ "models/weapons2/grapple/grapple.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/iconw_grapple",
/* pickup */ "Grappling Hook",
0,
@@ -357,7 +357,7 @@ gitem_t bg_itemlist[] =
"ammo_shells",
"sound/misc/am_pkup.wav",
{ "models/powerups/ammo/shotgunam.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/icona_shotgun",
/* pickup */ "Shells",
10,
@@ -373,7 +373,7 @@ gitem_t bg_itemlist[] =
"ammo_bullets",
"sound/misc/am_pkup.wav",
{ "models/powerups/ammo/machinegunam.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/icona_machinegun",
/* pickup */ "Bullets",
50,
@@ -389,7 +389,7 @@ gitem_t bg_itemlist[] =
"ammo_grenades",
"sound/misc/am_pkup.wav",
{ "models/powerups/ammo/grenadeam.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/icona_grenade",
/* pickup */ "Grenades",
5,
@@ -405,7 +405,7 @@ gitem_t bg_itemlist[] =
"ammo_cells",
"sound/misc/am_pkup.wav",
{ "models/powerups/ammo/plasmaam.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/icona_plasma",
/* pickup */ "Cells",
30,
@@ -421,7 +421,7 @@ gitem_t bg_itemlist[] =
"ammo_lightning",
"sound/misc/am_pkup.wav",
{ "models/powerups/ammo/lightningam.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/icona_lightning",
/* pickup */ "Lightning",
60,
@@ -437,7 +437,7 @@ gitem_t bg_itemlist[] =
"ammo_rockets",
"sound/misc/am_pkup.wav",
{ "models/powerups/ammo/rocketam.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/icona_rocket",
/* pickup */ "Rockets",
5,
@@ -453,7 +453,7 @@ gitem_t bg_itemlist[] =
"ammo_slugs",
"sound/misc/am_pkup.wav",
{ "models/powerups/ammo/railgunam.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/icona_railgun",
/* pickup */ "Slugs",
10,
@@ -469,7 +469,7 @@ gitem_t bg_itemlist[] =
"ammo_bfg",
"sound/misc/am_pkup.wav",
{ "models/powerups/ammo/bfgam.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/icona_bfg",
/* pickup */ "Bfg Ammo",
15,
@@ -488,7 +488,7 @@ gitem_t bg_itemlist[] =
"holdable_teleporter",
"sound/items/holdable.wav",
{ "models/powerups/holdable/teleporter.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/teleporter",
/* pickup */ "Personal Teleporter",
60,
@@ -505,7 +505,7 @@ gitem_t bg_itemlist[] =
{
"models/powerups/holdable/medkit.md3",
"models/powerups/holdable/medkit_sphere.md3",
- 0, 0},
+ NULL, NULL},
/* icon */ "icons/medkit",
/* pickup */ "Medkit",
60,
@@ -525,7 +525,7 @@ gitem_t bg_itemlist[] =
"sound/items/quaddamage.wav",
{ "models/powerups/instant/quad.md3",
"models/powerups/instant/quad_ring.md3",
- 0, 0 },
+ NULL, NULL },
/* icon */ "icons/quad",
/* pickup */ "Quad Damage",
30,
@@ -542,7 +542,7 @@ gitem_t bg_itemlist[] =
"sound/items/protect.wav",
{ "models/powerups/instant/enviro.md3",
"models/powerups/instant/enviro_ring.md3",
- 0, 0 },
+ NULL, NULL },
/* icon */ "icons/envirosuit",
/* pickup */ "Battle Suit",
30,
@@ -559,7 +559,7 @@ gitem_t bg_itemlist[] =
"sound/items/haste.wav",
{ "models/powerups/instant/haste.md3",
"models/powerups/instant/haste_ring.md3",
- 0, 0 },
+ NULL, NULL },
/* icon */ "icons/haste",
/* pickup */ "Speed",
30,
@@ -576,7 +576,7 @@ gitem_t bg_itemlist[] =
"sound/items/invisibility.wav",
{ "models/powerups/instant/invis.md3",
"models/powerups/instant/invis_ring.md3",
- 0, 0 },
+ NULL, NULL },
/* icon */ "icons/invis",
/* pickup */ "Invisibility",
30,
@@ -593,7 +593,7 @@ gitem_t bg_itemlist[] =
"sound/items/regeneration.wav",
{ "models/powerups/instant/regen.md3",
"models/powerups/instant/regen_ring.md3",
- 0, 0 },
+ NULL, NULL },
/* icon */ "icons/regen",
/* pickup */ "Regeneration",
30,
@@ -610,7 +610,7 @@ gitem_t bg_itemlist[] =
"sound/items/flight.wav",
{ "models/powerups/instant/flight.md3",
"models/powerups/instant/flight_ring.md3",
- 0, 0 },
+ NULL, NULL },
/* icon */ "icons/flight",
/* pickup */ "Flight",
60,
@@ -627,7 +627,7 @@ Only in CTF games
"team_CTF_redflag",
NULL,
{ "models/flags/r_flag.md3",
- 0, 0, 0 },
+ NULL, NULL, NULL },
/* icon */ "icons/iconf_red1",
/* pickup */ "Red Flag",
0,
@@ -644,7 +644,7 @@ Only in CTF games
"team_CTF_blueflag",
NULL,
{ "models/flags/b_flag.md3",
- 0, 0, 0 },
+ NULL, NULL, NULL },
/* icon */ "icons/iconf_blu1",
/* pickup */ "Blue Flag",
0,
@@ -661,7 +661,7 @@ Only in CTF games
"holdable_kamikaze",
"sound/items/holdable.wav",
{ "models/powerups/kamikazi.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/kamikaze",
/* pickup */ "Kamikaze",
60,
@@ -677,7 +677,7 @@ Only in CTF games
"holdable_portal",
"sound/items/holdable.wav",
{ "models/powerups/holdable/porter.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/portal",
/* pickup */ "Portal",
60,
@@ -693,7 +693,7 @@ Only in CTF games
"holdable_invulnerability",
"sound/items/holdable.wav",
{ "models/powerups/holdable/invulnerability.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/invulnerability",
/* pickup */ "Invulnerability",
60,
@@ -709,7 +709,7 @@ Only in CTF games
"ammo_nails",
"sound/misc/am_pkup.wav",
{ "models/powerups/ammo/nailgunam.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/icona_nailgun",
/* pickup */ "Nails",
20,
@@ -725,7 +725,7 @@ Only in CTF games
"ammo_mines",
"sound/misc/am_pkup.wav",
{ "models/powerups/ammo/proxmineam.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/icona_proxlauncher",
/* pickup */ "Proximity Mines",
10,
@@ -741,7 +741,7 @@ Only in CTF games
"ammo_belt",
"sound/misc/am_pkup.wav",
{ "models/powerups/ammo/chaingunam.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/icona_chaingun",
/* pickup */ "Chaingun Belt",
100,
@@ -760,7 +760,7 @@ Only in CTF games
"item_scout",
"sound/items/scout.wav",
{ "models/powerups/scout.md3",
- 0, 0, 0 },
+ NULL, NULL, NULL },
/* icon */ "icons/scout",
/* pickup */ "Scout",
30,
@@ -776,7 +776,7 @@ Only in CTF games
"item_guard",
"sound/items/guard.wav",
{ "models/powerups/guard.md3",
- 0, 0, 0 },
+ NULL, NULL, NULL },
/* icon */ "icons/guard",
/* pickup */ "Guard",
30,
@@ -792,7 +792,7 @@ Only in CTF games
"item_doubler",
"sound/items/doubler.wav",
{ "models/powerups/doubler.md3",
- 0, 0, 0 },
+ NULL, NULL, NULL },
/* icon */ "icons/doubler",
/* pickup */ "Doubler",
30,
@@ -808,7 +808,7 @@ Only in CTF games
"item_ammoregen",
"sound/items/ammoregen.wav",
{ "models/powerups/ammo.md3",
- 0, 0, 0 },
+ NULL, NULL, NULL },
/* icon */ "icons/ammo_regen",
/* pickup */ "Ammo Regen",
30,
@@ -825,7 +825,7 @@ Only in One Flag CTF games
"team_CTF_neutralflag",
NULL,
{ "models/flags/n_flag.md3",
- 0, 0, 0 },
+ NULL, NULL, NULL },
/* icon */ "icons/iconf_neutral1",
/* pickup */ "Neutral Flag",
0,
@@ -839,7 +839,7 @@ Only in One Flag CTF games
"item_redcube",
"sound/misc/am_pkup.wav",
{ "models/powerups/orb/r_orb.md3",
- 0, 0, 0 },
+ NULL, NULL, NULL },
/* icon */ "icons/iconh_rorb",
/* pickup */ "Red Cube",
0,
@@ -853,7 +853,7 @@ Only in One Flag CTF games
"item_bluecube",
"sound/misc/am_pkup.wav",
{ "models/powerups/orb/b_orb.md3",
- 0, 0, 0 },
+ NULL, NULL, NULL },
/* icon */ "icons/iconh_borb",
/* pickup */ "Blue Cube",
0,
@@ -868,7 +868,7 @@ Only in One Flag CTF games
"weapon_nailgun",
"sound/misc/w_pkup.wav",
{ "models/weapons/nailgun/nailgun.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/iconw_nailgun",
/* pickup */ "Nailgun",
10,
@@ -884,7 +884,7 @@ Only in One Flag CTF games
"weapon_prox_launcher",
"sound/misc/w_pkup.wav",
{ "models/weapons/proxmine/proxmine.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/iconw_proxlauncher",
/* pickup */ "Prox Launcher",
5,
@@ -905,7 +905,7 @@ Only in One Flag CTF games
"weapon_chaingun",
"sound/misc/w_pkup.wav",
{ "models/weapons/vulcan/vulcan.md3",
- 0, 0, 0},
+ NULL, NULL, NULL},
/* icon */ "icons/iconw_chaingun",
/* pickup */ "Chaingun",
80,
diff --git a/code/game/g_client.c b/code/game/g_client.c
index 355077b..fe15b11 100644
--- a/code/game/g_client.c
+++ b/code/game/g_client.c
@@ -1004,8 +1004,8 @@ void ClientBegin( int clientNum ) {
trap_UnlinkEntity( ent );
}
G_InitGentity( ent );
- ent->touch = 0;
- ent->pain = 0;
+ ent->touch = NULL;
+ ent->pain = NULL;
ent->client = client;
client->pers.connected = CON_CONNECTED;
diff --git a/code/game/g_items.c b/code/game/g_items.c
index 1222fbd..fd75412 100644
--- a/code/game/g_items.c
+++ b/code/game/g_items.c
@@ -542,7 +542,7 @@ void Touch_Item (gentity_t *ent, gentity_t *other, trace_t *trace) {
// events such as ctf flags
if ( respawn <= 0 ) {
ent->nextthink = 0;
- ent->think = 0;
+ ent->think = NULL;
} else {
ent->nextthink = level.time + respawn * 1000;
ent->think = RespawnItem;
diff --git a/code/game/g_misc.c b/code/game/g_misc.c
index ee75cde..f631a8d 100644
--- a/code/game/g_misc.c
+++ b/code/game/g_misc.c
@@ -288,7 +288,7 @@ void Use_Shooter( gentity_t *ent, gentity_t *other, gentity_t *activator ) {
static void InitShooter_Finish( gentity_t *ent ) {
ent->enemy = G_PickTarget( ent->target );
- ent->think = 0;
+ ent->think = NULL;
ent->nextthink = 0;
}
diff --git a/code/game/g_spawn.c b/code/game/g_spawn.c
index 0739e4e..f21e13b 100644
--- a/code/game/g_spawn.c
+++ b/code/game/g_spawn.c
@@ -266,7 +266,7 @@ spawn_t spawns[] = {
#endif
{"item_botroam", SP_item_botroam},
- {0, 0}
+ {NULL, NULL}
};
/*
diff --git a/code/game/g_trigger.c b/code/game/g_trigger.c
index 9db2304..16c1fc9 100644
--- a/code/game/g_trigger.c
+++ b/code/game/g_trigger.c
@@ -67,7 +67,7 @@ void multi_trigger( gentity_t *ent, gentity_t *activator ) {
} else {
// we can't just remove (self) here, because this is a touch function
// called while looping through area links...
- ent->touch = 0;
+ ent->touch = NULL;
ent->nextthink = level.time + FRAMETIME;
ent->think = G_FreeEntity;
}
diff --git a/code/game/g_utils.c b/code/game/g_utils.c
index 8c6f35b..71bcc15 100644
--- a/code/game/g_utils.c
+++ b/code/game/g_utils.c
@@ -54,7 +54,7 @@ void AddRemap(const char *oldShader, const char *newShader, float timeOffset) {
}
}
-const char *BuildShaderStateConfig() {
+const char *BuildShaderStateConfig(void) {
static char buff[MAX_STRING_CHARS*4];
char out[(MAX_QPATH * 2) + 5];
int i;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 12:16:49 +0000