yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-17 01:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

game: Sync CDTRACK code with ReRelease code

Browse source 
Look to: https://github.com/yquake2/yquake2remaster/issues/18
This commit is contained in:
Denis Pauk 2024-04-05 00:48:39 +03:00
parent 7a0d1d737e
commit 4cafc778ef
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/game/g_spawn.c
View file

@ -251,7 +251,7 @@ ED_ParseField(const char *key, const char *value, edict_t *ent)
} }
} }
gi.dprintf("%s is not a field. (value is %s)\n", key, value); gi.dprintf("%s is not a field. Value is %s\n", key, value);
} }
/* /*
@ -884,7 +884,14 @@ SP_worldspawn(edict_t *ent)
gi.configstring(CS_SKYAXIS, va("%f %f %f", gi.configstring(CS_SKYAXIS, va("%f %f %f",
st.skyaxis[0], st.skyaxis[1], st.skyaxis[2])); st.skyaxis[0], st.skyaxis[1], st.skyaxis[2]));
gi.configstring(CS_CDTRACK, va("%i", ent->sounds)); if (st.music && st.music[0])
{
gi.configstring(CS_CDTRACK, st.music);
}
else
{
gi.configstring(CS_CDTRACK, va("%i", ent->sounds));
}
gi.configstring(CS_MAXCLIENTS, va("%i", (int)(maxclients->value))); gi.configstring(CS_MAXCLIENTS, va("%i", (int)(maxclients->value)));

1
src/game/header/local.h
View file

@ -396,6 +396,7 @@ typedef struct
int skyautorotate; int skyautorotate;
vec3_t skyaxis; vec3_t skyaxis;
char *nextmap; char *nextmap;
char *music;
int lip; int lip;
int distance; int distance;

1
src/game/savegame/tables/fields.h
View file

@ -74,6 +74,7 @@
{"maxyaw", STOFS(maxyaw), F_FLOAT, FFL_SPAWNTEMP}, {"maxyaw", STOFS(maxyaw), F_FLOAT, FFL_SPAWNTEMP},
{"melee", FOFS(monsterinfo.melee), F_FUNCTION, FFL_NOSPAWN}, {"melee", FOFS(monsterinfo.melee), F_FUNCTION, FFL_NOSPAWN},
{"message", FOFS(message), F_LSTRING}, {"message", FOFS(message), F_LSTRING},
{"music", STOFS(music), F_LSTRING, FFL_SPAWNTEMP},
{"minpitch", STOFS(minpitch), F_FLOAT, FFL_SPAWNTEMP}, {"minpitch", STOFS(minpitch), F_FLOAT, FFL_SPAWNTEMP},
{"minyaw", STOFS(minyaw), F_FLOAT, FFL_SPAWNTEMP}, {"minyaw", STOFS(minyaw), F_FLOAT, FFL_SPAWNTEMP},
{"model", FOFS(model), F_LSTRING}, {"model", FOFS(model), F_LSTRING},