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

Merge branch 'mace-place' into 'master'

Browse source 
Make maces normally placeable in maps.

See merge request STJr/SRB2Internal!390
This commit is contained in:
toaster 2019-10-22 13:29:06 -04:00
commit 386ac78600
3 changed files with 59 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
extras/conf/SRB2-22.cfg
View file

@ -2175,7 +2175,7 @@ linedeftypes
title = "Award Rings";
prefix = "(460)";
}
461
{
title = "Spawn Object";
@ -4141,6 +4141,34 @@ thingtypes
angletext = "Retraction interval";
parametertext = "Initial delay";
}
1130
{
title = "Small Mace";
sprite = "SMCEA0";
width = 17;
height = 34;
}
1131
{
title = "Big Mace";
sprite = "BMCEA0";
width = 34;
height = 68;
}
1136
{
title = "Small Fireball";
sprite = "SFBRA0";
width = 17;
height = 34;
}
1137
{
title = "Large Fireball";
sprite = "BFBRA0";
width = 34;
height = 68;
}
}
springs
@ -4257,6 +4285,20 @@ thingtypes
width = 16;
height = 32;
}
1134
{
title = "Yellow Spring Ball";
sprite = "YSPBA0";
width = 17;
height = 34;
}
1135
{
title = "Red Spring Ball";
sprite = "RSPBA0";
width = 17;
height = 34;
}
}
patterns
@ -4837,7 +4879,7 @@ thingtypes
}
1104
{
title = "Mace";
title = "Mace Spawnpoint";
sprite = "SMCEA0";
width = 17;
height = 34;
@ -4847,7 +4889,7 @@ thingtypes
}
1105
{
title = "Chain & Maces";
title = "Chain with Maces Spawnpoint";
sprite = "SMCEA0";
width = 17;
height = 34;
@ -4857,7 +4899,7 @@ thingtypes
}
1106
{
title = "Chained Spring";
title = "Chained Spring Spawnpoint";
sprite = "YSPBA0";
width = 17;
height = 34;
@ -4867,7 +4909,7 @@ thingtypes
}
1107
{
title = "Chain";
title = "Chain Spawnpoint";
sprite = "BMCHA0";
width = 17;
height = 34;
@ -4877,7 +4919,7 @@ thingtypes
1108
{
arrow = 1;
title = "Chain (Hidden)";
title = "Hidden Chain Spawnpoint";
sprite = "internal:chain3";
width = 17;
height = 34;
@ -4885,7 +4927,7 @@ thingtypes
}
1109
{
title = "Firebar";
title = "Firebar Spawnpoint";
sprite = "BFBRA0";
width = 17;
height = 34;
@ -4895,7 +4937,7 @@ thingtypes
}
1110
{
title = "Custom Mace";
title = "Custom Mace Spawnpoint";
sprite = "SMCEA0";
width = 17;
height = 34;
@ -6425,4 +6467,4 @@ thingsfilters
}
}
}
}

14
src/info.c
View file

@ -11104,7 +11104,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
},
{ // MT_SMALLMACE
-1, // doomednum
1130, // doomednum
S_SMALLMACE, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
@ -11131,7 +11131,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
},
{ // MT_BIGMACE
-1, // doomednum
1131, // doomednum
S_BIGMACE, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
@ -11186,7 +11186,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
{ // MT_BIGGRABCHAIN
-1, // doomednum
S_BIGGRABCHAIN, // spawnstate
S_BIGGRABCHAIN, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@ -11212,7 +11212,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
},
{ // MT_YELLOWSPRINGBALL
-1, // doomednum
1134, // doomednum
S_YELLOWSPRINGBALL, // spawnstate
1000, // spawnhealth
S_YELLOWSPRINGBALL2, // seestate
@ -11239,7 +11239,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
},
{ // MT_REDSPRINGBALL
-1, // doomednum
1135, // doomednum
S_REDSPRINGBALL, // spawnstate
1000, // spawnhealth
S_REDSPRINGBALL2, // seestate
@ -11266,7 +11266,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
},
{ // MT_SMALLFIREBAR
-1, // doomednum
1136, // doomednum
S_SMALLFIREBAR1, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
@ -11293,7 +11293,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
},
{ // MT_BIGFIREBAR
-1, // doomednum
1137, // doomednum
S_BIGFIREBAR1, // spawnstate
1000, // spawnhealth
S_NULL, // seestate

3
src/p_user.c
View file

@ -4345,7 +4345,6 @@ void P_DoJump(player_t *player, boolean soundandstate)
{
player->mo->momz = 9*FRACUNIT;
player->powers[pw_carry] = CR_NONE;
player->mo->tracer->flags |= MF_PUSHABLE;
P_SetTarget(&player->mo->tracer->target, NULL);
P_SetTarget(&player->mo->tracer, NULL);
}
@ -12057,7 +12056,7 @@ void P_PlayerAfterThink(player_t *player)
mo->momx = rock->momx;
mo->momy = rock->momy;
mo->momz = 0;
if (player->panim == PA_IDLE && (mo->momx || mo->momy))
{
P_SetPlayerMobjState(player->mo, S_PLAY_WALK);