thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'udmf-convert-waypoint-risers' into 'master'

Browse source 
-writetextmap: convert Waypoints and Dash Rings

See merge request KartKrew/Kart!1320
This commit is contained in:
Oni 2023-07-01 20:18:34 +00:00
commit 09ca91be90
2 changed files with 119 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/k_waypoint.cpp
View file

@ -2315,7 +2315,6 @@ static boolean K_RaiseWaypoint(
fixed_t sort; fixed_t sort;
fixed_t z; fixed_t z;
fixed_t delta;
if ( if (
!( riser->spawnpoint->options & MTF_OBJECTSPECIAL ) || !( riser->spawnpoint->options & MTF_OBJECTSPECIAL ) ||
@ -2360,16 +2359,14 @@ static boolean K_RaiseWaypoint(
} }
} }
// Keep changes for -writetextmap
if (descending)
delta = sort - waypointmobj->z;
else
delta = waypointmobj->z - sort;
waypointmobj->spawnpoint->z += delta;
waypointmobj->z = sort; waypointmobj->z = sort;
} }
// Keep changes for -writetextmap
waypointmobj->spawnpoint->z = ((waypointmobj->spawnpoint->options & MTF_OBJECTFLIP)
? waypointmobj->ceilingz - waypointmobj->z
: waypointmobj->z - waypointmobj->floorz) / FRACUNIT;
return true; return true;
} }
else else
@ -2402,7 +2399,7 @@ static boolean K_AnchorWaypointRadius(
anchor->x, anchor->y); anchor->x, anchor->y);
// Keep changes for -writetextmap // Keep changes for -writetextmap
waypointmobj->spawnpoint->args[0] = waypointmobj->radius >> FRACBITS; waypointmobj->spawnpoint->args[1] = waypointmobj->radius >> FRACBITS;
return true; return true;
} }
else else

174
src/p_setup.c
View file

@ -2016,11 +2016,80 @@ typedef struct
mapthing_t *angleanchor; mapthing_t *angleanchor;
} sectorspecialthings_t; } sectorspecialthings_t;
static void P_WriteTextmap(void) static FILE *P_OpenTextmap(const char *mode, const char *error)
{ {
size_t i, j;
FILE *f; FILE *f;
char *filepath = va(pandf, srb2home, "TEXTMAP"); char *filepath = va(pandf, srb2home, "TEXTMAP");
f = fopen(filepath, mode);
if (!f)
{
CONS_Alert(CONS_ERROR, M_GetText("%s %s\n"), error, filepath);
}
return f;
}
static void P_WriteTextmapThing(FILE *f, mapthing_t *wmapthings, size_t i, size_t k)
{
size_t j;
fprintf(f, "thing // %s\n", sizeu1(k));
fprintf(f, "{\n");
if (wmapthings[i].tid != 0)
fprintf(f, "id = %d;\n", wmapthings[i].tid);
fprintf(f, "x = %d;\n", wmapthings[i].x);
fprintf(f, "y = %d;\n", wmapthings[i].y);
if (wmapthings[i].z != 0)
fprintf(f, "height = %d;\n", wmapthings[i].z);
fprintf(f, "angle = %d;\n", wmapthings[i].angle);
if (wmapthings[i].pitch != 0)
fprintf(f, "pitch = %d;\n", wmapthings[i].pitch);
if (wmapthings[i].roll != 0)
fprintf(f, "roll = %d;\n", wmapthings[i].roll);
if (wmapthings[i].type != 0)
fprintf(f, "type = %d;\n", wmapthings[i].type);
if (wmapthings[i].scale != FRACUNIT)
fprintf(f, "scale = %f;\n", FIXED_TO_FLOAT(wmapthings[i].scale));
if (wmapthings[i].options & MTF_OBJECTFLIP)
fprintf(f, "flip = true;\n");
if (wmapthings[i].special != 0)
fprintf(f, "special = %d;\n", wmapthings[i].special);
for (j = 0; j < NUMMAPTHINGARGS; j++)
if (wmapthings[i].args[j] != 0)
fprintf(f, "arg%s = %d;\n", sizeu1(j), wmapthings[i].args[j]);
for (j = 0; j < NUMMAPTHINGSTRINGARGS; j++)
if (mapthings[i].stringargs[j])
fprintf(f, "stringarg%s = \"%s\";\n", sizeu1(j), mapthings[i].stringargs[j]);
if (wmapthings[i].user.length > 0)
{
for (j = 0; j < wmapthings[i].user.length; j++)
{
mapUserProperty_t *const prop = &wmapthings[i].user.properties[j];
switch (prop->type)
{
case USER_PROP_BOOL:
fprintf(f, "user_%s = %s;\n", prop->key, (prop->valueBool == true) ? "true" : "false");
break;
case USER_PROP_INT:
fprintf(f, "user_%s = %d;\n", prop->key, prop->valueInt);
break;
case USER_PROP_FIXED:
fprintf(f, "user_%s = %f;\n", prop->key, FIXED_TO_FLOAT(prop->valueFixed));
break;
case USER_PROP_STR:
fprintf(f, "user_%s = \"%s\";\n", prop->key, prop->valueStr);
break;
}
}
}
fprintf(f, "}\n");
fprintf(f, "\n");
}
static void P_WriteTextmap(void)
{
size_t i, j, k;
FILE *f;
mtag_t firsttag; mtag_t firsttag;
mapthing_t *wmapthings; mapthing_t *wmapthings;
vertex_t *wvertexes; vertex_t *wvertexes;
@ -2031,10 +2100,9 @@ static void P_WriteTextmap(void)
sectorspecialthings_t *specialthings; sectorspecialthings_t *specialthings;
boolean *wusedvertexes; boolean *wusedvertexes;
f = fopen(filepath, "w"); f = P_OpenTextmap("w", "Couldn't save map file");
if (!f) if (!f)
{ {
CONS_Alert(CONS_ERROR, M_GetText("Couldn't save map file %s\n"), filepath);
return; return;
} }
@ -2121,13 +2189,6 @@ static void P_WriteTextmap(void)
subsector_t *ss; subsector_t *ss;
INT32 s; INT32 s;
if (wmapthings[i].type == mobjinfo[MT_WAYPOINT].doomednum
|| wmapthings[i].type == mobjinfo[MT_WAYPOINT_ANCHOR].doomednum
|| wmapthings[i].type == mobjinfo[MT_WAYPOINT_RISER].doomednum)
{
CONS_Alert(CONS_WARNING, M_GetText("Thing %s is a waypoint or waypoint parameter, which cannot be converted fully.\n"), sizeu1(i));
}
if (wmapthings[i].type != 751 && wmapthings[i].type != 752 && wmapthings[i].type != 758) if (wmapthings[i].type != 751 && wmapthings[i].type != 752 && wmapthings[i].type != 758)
continue; continue;
@ -2354,59 +2415,20 @@ static void P_WriteTextmap(void)
} }
fprintf(f, "namespace = \"srb2\";\n"); fprintf(f, "namespace = \"srb2\";\n");
for (i = 0; i < nummapthings; i++) for (i = k = 0; i < nummapthings; i++)
{ {
fprintf(f, "thing // %s\n", sizeu1(i)); if (wmapthings[i].type == mobjinfo[MT_WAYPOINT].doomednum
fprintf(f, "{\n"); || wmapthings[i].type == mobjinfo[MT_WAYPOINT_ANCHOR].doomednum
if (wmapthings[i].tid != 0) || wmapthings[i].type == mobjinfo[MT_WAYPOINT_RISER].doomednum)
fprintf(f, "id = %d;\n", wmapthings[i].tid);
fprintf(f, "x = %d;\n", wmapthings[i].x);
fprintf(f, "y = %d;\n", wmapthings[i].y);
if (wmapthings[i].z != 0)
fprintf(f, "height = %d;\n", wmapthings[i].z);
fprintf(f, "angle = %d;\n", wmapthings[i].angle);
if (wmapthings[i].pitch != 0)
fprintf(f, "pitch = %d;\n", wmapthings[i].pitch);
if (wmapthings[i].roll != 0)
fprintf(f, "roll = %d;\n", wmapthings[i].roll);
if (wmapthings[i].type != 0)
fprintf(f, "type = %d;\n", wmapthings[i].type);
if (wmapthings[i].scale != FRACUNIT)
fprintf(f, "scale = %f;\n", FIXED_TO_FLOAT(wmapthings[i].scale));
if (wmapthings[i].options & MTF_OBJECTFLIP)
fprintf(f, "flip = true;\n");
if (wmapthings[i].special != 0)
fprintf(f, "special = %d;\n", wmapthings[i].special);
for (j = 0; j < NUMMAPTHINGARGS; j++)
if (wmapthings[i].args[j] != 0)
fprintf(f, "arg%s = %d;\n", sizeu1(j), wmapthings[i].args[j]);
for (j = 0; j < NUMMAPTHINGSTRINGARGS; j++)
if (mapthings[i].stringargs[j])
fprintf(f, "stringarg%s = \"%s\";\n", sizeu1(j), mapthings[i].stringargs[j]);
if (wmapthings[i].user.length > 0)
{ {
for (j = 0; j < wmapthings[i].user.length; j++) // Skip waypoints. Because the multi-thing setup was merged into a
{ // single thing type in UDMF, these must be converted later.
mapUserProperty_t *const prop = &wmapthings[i].user.properties[j]; continue;
switch (prop->type)
{
case USER_PROP_BOOL:
fprintf(f, "user_%s = %s;\n", prop->key, (prop->valueBool == true) ? "true" : "false");
break;
case USER_PROP_INT:
fprintf(f, "user_%s = %d;\n", prop->key, prop->valueInt);
break;
case USER_PROP_FIXED:
fprintf(f, "user_%s = %f;\n", prop->key, FIXED_TO_FLOAT(prop->valueFixed));
break;
case USER_PROP_STR:
fprintf(f, "user_%s = \"%s\";\n", prop->key, prop->valueStr);
break;
}
}
} }
fprintf(f, "}\n");
fprintf(f, "\n"); P_WriteTextmapThing(f, wmapthings, i, k);
k++;
} }
j = 0; j = 0;
@ -2846,6 +2868,29 @@ static void P_WriteTextmap(void)
Z_Free(wusedvertexes); Z_Free(wusedvertexes);
} }
static void P_WriteTextmapWaypoints(void)
{
FILE *f;
mobj_t *waypointmobj;
// Append to output from P_WriteTextmap prior
f = P_OpenTextmap("a", "Couldn't save map file (waypoints)");
if (!f)
{
return;
}
for (
waypointmobj = waypointcap;
waypointmobj;
waypointmobj = waypointmobj->tracer
){
P_WriteTextmapThing(f, waypointmobj->spawnpoint, 0, waypointmobj->spawnpoint - mapthings);
}
fclose(f);
}
/** Loads the textmap data, after obtaining the elements count and allocating their respective space. /** Loads the textmap data, after obtaining the elements count and allocating their respective space.
*/ */
static void P_LoadTextmap(void) static void P_LoadTextmap(void)
@ -7148,6 +7193,10 @@ static void P_ConvertBinaryThingTypes(void)
case 3786: // MT_BATTLEUFO_SPAWNER case 3786: // MT_BATTLEUFO_SPAWNER
mapthings[i].args[0] = mapthings[i].angle; mapthings[i].args[0] = mapthings[i].angle;
break; break;
case 3441: // MT_DASHRING (TODO: not yet hardcoded)
mapthings[i].args[0] = mapthings[i].options & 13;
mapthings[i].args[1] = mapthings[i].extrainfo;
break;
case FLOOR_SLOPE_THING: case FLOOR_SLOPE_THING:
case CEILING_SLOPE_THING: case CEILING_SLOPE_THING:
mapthings[i].args[0] = mapthings[i].extrainfo; mapthings[i].args[0] = mapthings[i].extrainfo;
@ -8230,6 +8279,9 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
{ {
// Backwards compatibility for non-UDMF maps // Backwards compatibility for non-UDMF maps
K_AdjustWaypointsParameters(); K_AdjustWaypointsParameters();
if (M_CheckParm("-writetextmap"))
P_WriteTextmapWaypoints();
} }
if (!fromnetsave) // ugly hack for P_NetUnArchiveMisc (and P_LoadNetGame) if (!fromnetsave) // ugly hack for P_NetUnArchiveMisc (and P_LoadNetGame)