Update 1 changes

This commit is contained in:
Mike Rubits
2023-10-03 14:43:06 -04:00
parent 60f29560f3
commit 8dc1fc9794
67 changed files with 1806 additions and 1479 deletions

View File

@@ -1144,6 +1144,11 @@ parsing textual entity definitions out of an ent file.
*/
void SpawnEntities(const char *mapname, const char *entities, const char *spawnpoint)
{
// clear cached indices
cached_soundindex::clear_all();
cached_modelindex::clear_all();
cached_imageindex::clear_all();
edict_t *ent;
int inhibit;
const char *com_token;
@@ -1509,7 +1514,7 @@ void SP_worldspawn(edict_t *ent)
gi.configstring(CS_MAXCLIENTS, G_Fmt("{}", game.maxclients).data());
if (level.is_n64)
if (level.is_n64 && !deathmatch->integer)
{
gi.configstring(CONFIG_N64_PHYSICS, "1");
pm_config.n64_physics = true;
@@ -1544,7 +1549,7 @@ void SP_worldspawn(edict_t *ent)
gi.cvar_set("sv_gravity", st.gravity);
}
snd_fry = gi.soundindex("player/fry.wav"); // standing in lava / slime
snd_fry.assign("player/fry.wav"); // standing in lava / slime
PrecacheItem(GetItemByIndex(IT_ITEM_COMPASS));
PrecacheItem(GetItemByIndex(IT_WEAPON_BLASTER));
@@ -1583,6 +1588,7 @@ void SP_worldspawn(edict_t *ent)
gi.soundindex("*pain75_2.wav");
gi.soundindex("*pain100_1.wav");
gi.soundindex("*pain100_2.wav");
gi.soundindex("*drown1.wav"); // [Paril-KEX]
// sexed models
for (auto &item : itemlist)
@@ -1624,6 +1630,10 @@ void SP_worldspawn(edict_t *ent)
gi.soundindex("player/u_breath1.wav");
gi.soundindex("player/u_breath2.wav");
gi.soundindex("player/wade1.wav");
gi.soundindex("player/wade2.wav");
gi.soundindex("player/wade3.wav");
gi.soundindex("items/pkup.wav"); // bonus item pickup
gi.soundindex("world/land.wav"); // landing thud
gi.soundindex("misc/h2ohit1.wav"); // landing splash
@@ -1637,7 +1647,7 @@ void SP_worldspawn(edict_t *ent)
gi.soundindex("infantry/inflies1.wav");
sm_meat_index = gi.modelindex("models/objects/gibs/sm_meat/tris.md2");
sm_meat_index.assign("models/objects/gibs/sm_meat/tris.md2");
gi.modelindex("models/objects/gibs/arm/tris.md2");
gi.modelindex("models/objects/gibs/bone/tris.md2");
gi.modelindex("models/objects/gibs/bone2/tris.md2");
@@ -1646,7 +1656,7 @@ void SP_worldspawn(edict_t *ent)
gi.modelindex("models/objects/gibs/head2/tris.md2");
gi.modelindex("models/objects/gibs/sm_metal/tris.md2");
gi.imageindex("loc_ping");
level.pic_ping = gi.imageindex("loc_ping");
//
// Setup light animation tables. 'a' is total darkness, 'z' is doublebright.