stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 04:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adapt linedef type 463 to UDMF

Browse source
This commit is contained in:
MascaraSnake 2021-09-21 07:44:55 +02:00
parent b898a773ab
commit 17bd20a15e
3 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
extras/conf/udb/Includes/SRB222_linedefs.cfg
View file

@ -952,6 +952,11 @@ doom
title = "Stop Timer/Exit Stage in Record Attack"; title = "Stop Timer/Exit Stage in Record Attack";
prefix = "(462)"; prefix = "(462)";
} }
463
{
title = "Dye Object";
prefix = "(463)";
}
466 466
{ {
title = "Set Level Failure State"; title = "Set Level Failure State";
@ -3028,6 +3033,17 @@ udmf
prefix = "(462)"; prefix = "(462)";
} }
463
{
title = "Dye Object";
prefix = "(463)";
stringarg0
{
title = "Skin color";
type = 2;
}
}
466 466
{ {
title = "Set Level Failure State"; title = "Set Level Failure State";

9
src/p_setup.c
View file

@ -1294,7 +1294,6 @@ static void P_LoadSidedefs(UINT8 *data)
case 336: // Trigger linedef executor: Object dye - Once case 336: // Trigger linedef executor: Object dye - Once
case 434: // Custom Power case 434: // Custom Power
case 461: // Spawns an object on the map based on texture offsets case 461: // Spawns an object on the map based on texture offsets
case 463: // Colorizes an object
{ {
char process[8*3+1]; char process[8*3+1];
memset(process,0,8*3+1); memset(process,0,8*3+1);
@ -1318,6 +1317,7 @@ static void P_LoadSidedefs(UINT8 *data)
case 442: // Calls P_SetMobjState on mobjs of a given type in the tagged sectors case 442: // Calls P_SetMobjState on mobjs of a given type in the tagged sectors
case 443: // Calls a named Lua function case 443: // Calls a named Lua function
case 459: // Control text prompt (named tag) case 459: // Control text prompt (named tag)
case 463: // Colorizes an object
{ {
char process[8*3+1]; char process[8*3+1];
memset(process,0,8*3+1); memset(process,0,8*3+1);
@ -3948,6 +3948,13 @@ static void P_ConvertBinaryMap(void)
lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS;
break; break;
case 463: //Dye object
if (sides[lines[i].sidenum[0]].text)
{
lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL);
M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1);
}
break;
case 466: //Set level failure state case 466: //Set level failure state
lines[i].args[0] = !!(lines[i].flags & ML_NOCLIMB); lines[i].args[0] = !!(lines[i].flags & ML_NOCLIMB);
break; break;

4
src/p_spec.c
View file

@ -3565,10 +3565,10 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
case 463: // Dye object case 463: // Dye object
{ {
INT32 color = sides[line->sidenum[0]].toptexture;
if (mo) if (mo)
{ {
INT32 color = line->stringargs[0] ? get_number(line->stringargs[0]) : SKINCOLOR_NONE;
if (color < 0 || color >= numskincolors) if (color < 0 || color >= numskincolors)
return; return;