yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-01-31 13:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

game: Add key_yellow_key item definition

Browse source 
Based on:
 * https://github.com/id-Software/quake2-rerelease-dll/blob/main/rerelease/g_items.cpp
This commit is contained in:
Denis Pauk 2024-11-01 00:27:12 +02:00
parent 1f147f2fa8
commit dce9415411
2 changed files with 78 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/g_ctf.c
View file

@ -1198,7 +1198,7 @@ CTFFlagSetup(edict_t *ent)
if (tr.startsolid) if (tr.startsolid)
{ {
gi.dprintf("CTFFlagSetup: %s startsolid at %s\n", ent->classname, gi.dprintf("%s: %s startsolid at %s\n", __func__, ent->classname,
vtos(ent->s.origin)); vtos(ent->s.origin));
G_FreeEdict(ent); G_FreeEdict(ent);
return; return;

78
src/game/g_items.c
View file

@ -1975,7 +1975,8 @@ droptofloor(edict_t *ent)
} }
else else
{ {
gi.dprintf("droptofloor: %s startsolid at %s\n", gi.dprintf("%s: %s startsolid at %s\n",
__func__,
ent->classname, ent->classname,
vtos(ent->s.origin)); vtos(ent->s.origin));
G_FreeEdict(ent); G_FreeEdict(ent);
@ -3761,6 +3762,81 @@ static const gitem_t gameitemlist[] = {
"" ""
}, },
/*
* QUAKED key_explosive_charges (0 .5 .8) (-16 -16 -16) (16 16 16) TRIGGER_SPAWN NO_TOUCH
* warehouse circuits, key for N64
*/
{
"key_explosive_charges",
Pickup_Key,
NULL,
Drop_General,
NULL,
"items/pkup.wav",
"models/items/n64/charge/tris.md2", EF_ROTATE,
NULL,
"n64/i_charges",
"Explosive Charges",
2,
0,
NULL,
IT_STAY_COOP | IT_KEY,
0,
NULL,
0,
""
},
/*
* QUAKED key_yellow_key (0 .5 .8) (-16 -16 -16) (16 16 16)
* normal door key - yellow, key for N64
*/
{
"key_yellow_key",
Pickup_Key,
NULL,
Drop_General,
NULL,
"items/pkup.wav",
"models/items/n64/yellow_key/tris.md2", EF_ROTATE,
NULL,
"n64/i_yellow_key",
"Yellow Key",
2,
0,
NULL,
IT_STAY_COOP | IT_KEY,
0,
NULL,
0,
""
},
/*
* QUAKED key_power_core (0 .5 .8) (-16 -16 -16) (16 16 16)
* key for N64
*/
{
"key_power_core",
Pickup_Key,
NULL,
Drop_General,
NULL,
"items/pkup.wav",
"models/items/n64/power_core/tris.md2", EF_ROTATE,
NULL,
"k_pyramid",
"Power Core",
2,
0,
NULL,
IT_STAY_COOP | IT_KEY,
0,
NULL,
0,
""
},
/* /*
* QUAKED key_pyramid (0 .5 .8) (-16 -16 -16) (16 16 16) TRIGGER_SPAWN * QUAKED key_pyramid (0 .5 .8) (-16 -16 -16) (16 16 16) TRIGGER_SPAWN
* key for the entrance of jail3 * key for the entrance of jail3