thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SOC: DefaultWaypointRadius in the level header picardy

Browse source
This commit is contained in:
James R 2020-05-04 17:39:11 -07:00
parent aa80132976
commit e2d4ddcec2
5 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dehacked.c
View file

@ -1305,6 +1305,8 @@ static void readlevelheader(MYFILE *f, INT32 num)
}*/ }*/
else if (fastcmp(word, "MOBJSCALE")) else if (fastcmp(word, "MOBJSCALE"))
mapheaderinfo[num-1]->mobj_scale = get_number(word2); mapheaderinfo[num-1]->mobj_scale = get_number(word2);
else if (fastcmp(word, "DEFAULTWAYPOINTRADIUS"))
mapheaderinfo[num-1]->default_waypoint_radius = get_number(word2);
// Individual triggers for level flags, for ease of use (and 2.0 compatibility) // Individual triggers for level flags, for ease of use (and 2.0 compatibility)
else if (fastcmp(word, "SCRIPTISFILE")) else if (fastcmp(word, "SCRIPTISFILE"))

1
src/doomstat.h
View file

@ -290,6 +290,7 @@ typedef struct
// SRB2kart // SRB2kart
//boolean automap; ///< Displays a level's white map outline in modified games //boolean automap; ///< Displays a level's white map outline in modified games
fixed_t mobj_scale; ///< Replacement for TOL_ERZ3 fixed_t mobj_scale; ///< Replacement for TOL_ERZ3
fixed_t default_waypoint_radius;
// Music stuff. // Music stuff.
UINT32 musinterfadeout; ///< Fade out level music on intermission screen in milliseconds UINT32 musinterfadeout; ///< Fade out level music on intermission screen in milliseconds

2
src/k_waypoint.h
View file

@ -18,6 +18,8 @@
#include "p_mobj.h" #include "p_mobj.h"
#include "k_pathfind.h" #include "k_pathfind.h"
#define DEFAULT_WAYPOINT_RADIUS (384*FRACUNIT)
typedef struct waypoint_s typedef struct waypoint_s
{ {
mobj_t *mobj; mobj_t *mobj;

2
src/p_mobj.c
View file

@ -12667,7 +12667,7 @@ ML_NOCLIMB : Direction not controllable
{ {
// Just like MT_SPINMACEPOINT, this now works here too! // Just like MT_SPINMACEPOINT, this now works here too!
INT32 line = P_FindSpecialLineFromTag(2000, mthing->angle, -1); INT32 line = P_FindSpecialLineFromTag(2000, mthing->angle, -1);
mobj->radius = 384*FRACUNIT; mobj->radius = mapheaderinfo[gamemap-1]->default_waypoint_radius;
// Set the radius, mobj z, and mthing z to match what the parameters want // Set the radius, mobj z, and mthing z to match what the parameters want
if (line != -1) if (line != -1)
{ {

2
src/p_setup.c
View file

@ -258,6 +258,8 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
//mapheaderinfo[num]->automap = false; //mapheaderinfo[num]->automap = false;
DEH_WriteUndoline("MOBJSCALE", va("%d", mapheaderinfo[num]->mobj_scale), UNDO_NONE); DEH_WriteUndoline("MOBJSCALE", va("%d", mapheaderinfo[num]->mobj_scale), UNDO_NONE);
mapheaderinfo[num]->mobj_scale = FRACUNIT; mapheaderinfo[num]->mobj_scale = FRACUNIT;
DEH_WriteUndoline("DEFAULTWAYPOINTRADIUS", va("%d", mapheaderinfo[num]->default_waypoint_radius), UNDO_NONE);
mapheaderinfo[num]->default_waypoint_radius = DEFAULT_WAYPOINT_RADIUS;
// an even further impossibility, delfile custom opts support // an even further impossibility, delfile custom opts support
mapheaderinfo[num]->customopts = NULL; mapheaderinfo[num]->customopts = NULL;
mapheaderinfo[num]->numCustomOptions = 0; mapheaderinfo[num]->numCustomOptions = 0;