lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Allow map-wide gravity to be set via level header

Browse source
This commit is contained in:
MascaraSnake 2020-05-03 18:33:18 +02:00
parent 4b87bee759
commit 700b340827
5 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dehacked.c
View file

@ -1867,6 +1867,8 @@ static void readlevelheader(MYFILE *f, INT32 num)
mapheaderinfo[num-1]->sstimer = i; mapheaderinfo[num-1]->sstimer = i;
else if (fastcmp(word, "SPECIALSTAGESPHERES")) else if (fastcmp(word, "SPECIALSTAGESPHERES"))
mapheaderinfo[num-1]->ssspheres = i; mapheaderinfo[num-1]->ssspheres = i;
else if (fastcmp(word, "GRAVITY"))
mapheaderinfo[num-1]->gravity = FLOAT_TO_FIXED(atof(word2));
else else
deh_warning("Level header %d: unknown word '%s'", num, word); deh_warning("Level header %d: unknown word '%s'", num, word);
} }

3
src/doomstat.h
View file

@ -320,7 +320,8 @@ typedef struct
char selectheading[22]; ///< Level select heading. Allows for controllable grouping. char selectheading[22]; ///< Level select heading. Allows for controllable grouping.
UINT16 startrings; ///< Number of rings players start with. UINT16 startrings; ///< Number of rings players start with.
INT32 sstimer; ///< Timer for special stages. INT32 sstimer; ///< Timer for special stages.
UINT32 ssspheres; ///< Sphere requirement in special stages. UINT32 ssspheres; ///< Sphere requirement in special stages.
fixed_t gravity; ///< Map-wide gravity.
// Title card. // Title card.
char ltzzpatch[8]; ///< Zig zag patch. char ltzzpatch[8]; ///< Zig zag patch.

2
src/lua_maplib.c
View file

@ -2086,6 +2086,8 @@ static int mapheaderinfo_get(lua_State *L)
lua_pushinteger(L, header->sstimer); lua_pushinteger(L, header->sstimer);
else if (fastcmp(field, "ssspheres")) else if (fastcmp(field, "ssspheres"))
lua_pushinteger(L, header->ssspheres); lua_pushinteger(L, header->ssspheres);
else if (fastcmp(field, "gravity"))
lua_pushfixed(L, header->gravity);
// TODO add support for reading numGradedMares and grades // TODO add support for reading numGradedMares and grades
else { else {
// Read custom vars now // Read custom vars now

1
src/p_setup.c
View file

@ -220,6 +220,7 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
mapheaderinfo[num]->startrings = 0; mapheaderinfo[num]->startrings = 0;
mapheaderinfo[num]->sstimer = 90; mapheaderinfo[num]->sstimer = 90;
mapheaderinfo[num]->ssspheres = 1; mapheaderinfo[num]->ssspheres = 1;
mapheaderinfo[num]->gravity = FRACUNIT/2;
mapheaderinfo[num]->keywords[0] = '\0'; mapheaderinfo[num]->keywords[0] = '\0';
snprintf(mapheaderinfo[num]->musname, 7, "%sM", G_BuildMapName(i)); snprintf(mapheaderinfo[num]->musname, 7, "%sM", G_BuildMapName(i));
mapheaderinfo[num]->musname[6] = 0; mapheaderinfo[num]->musname[6] = 0;

2
src/p_spec.c
View file

@ -6246,7 +6246,7 @@ static void P_RunLevelLoadExecutors(void)
void P_InitSpecials(void) void P_InitSpecials(void)
{ {
// Set the default gravity. Custom gravity overrides this setting. // Set the default gravity. Custom gravity overrides this setting.
gravity = FRACUNIT/2; gravity = mapheaderinfo[gamemap-1]->gravity;
// Defaults in case levels don't have them set. // Defaults in case levels don't have them set.
sstimer = mapheaderinfo[gamemap-1]->sstimer*TICRATE + 6; sstimer = mapheaderinfo[gamemap-1]->sstimer*TICRATE + 6;