Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Breaking glass influenced by Blood menu #593

Merged
merged 1 commit into from
Oct 23, 2023
Merged

Fix: Breaking glass influenced by Blood menu #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions source_files/edge/p_local.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ bool P_SetMobjState(mobj_t * mobj, statenum_t state);
bool P_SetMobjStateDeferred(mobj_t * mobj, statenum_t state, int tic_skip);
void P_SetMobjDirAndSpeed(mobj_t * mobj, angle_t angle, float slope, float speed);
void P_RunMobjThinkers(bool extra_tic);
void P_SpawnDebris(float x, float y, float z, float damage, angle_t angle, const mobjtype_c * debris);
void P_SpawnSplash(float x, float y, float z, const mobjtype_c * splash, angle_t angle);
void P_SpawnPuff(float x, float y, float z, const mobjtype_c * puff, angle_t angle);
void P_SpawnBlood(float x, float y, float z, float damage, angle_t angle, const mobjtype_c * blood);
Expand Down
4 changes: 2 additions & 2 deletions source_files/edge/p_map.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2168,8 +2168,8 @@ static bool PTR_ShootTraverse(intercept_t * in, void *dataptr)

if (info && tempspecial->type == line_shootable)
{
//P_SpawnPuff(x, y, z, info, shoot_I.angle + ANG180);
P_SpawnBlood(x, y, z, 0, shoot_I.angle + ANG180, info);
//P_SpawnBlood(x, y, z, 0, shoot_I.angle + ANG180, info);
P_SpawnDebris(x, y, z, 0, shoot_I.angle + ANG180, info);
}
P_UnblockLineEffectDebris(ld, tempspecial);
}
Expand Down
34 changes: 33 additions & 1 deletion source_files/edge/p_mobj.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,7 +915,8 @@ static void P_XYMovement(mobj_t * mo, const region_properties_t *props, bool ext
if (tempspecial->effectobject)
{
DebrisThing = tempspecial->effectobject;
P_SpawnBlood(mo->x, mo->y, mo->z, 0, mo->angle + ANG180, DebrisThing);
//P_SpawnBlood(mo->x, mo->y, mo->z, 0, mo->angle + ANG180, DebrisThing);
P_SpawnDebris(mo->x, mo->y, mo->z, 0, mo->angle + ANG180, DebrisThing);
}
}
}
Expand Down Expand Up @@ -1916,6 +1917,37 @@ void P_RunMobjThinkers(bool extra_tic)
// GAME SPAWN FUNCTIONS
//

//
// P_SpawnDebris
//
void P_SpawnDebris(float x, float y, float z, float damage,
angle_t angle, const mobjtype_c * debris)
{
mobj_t *th;

//angle += ANG180;
angle += (angle_t) (P_RandomNegPos() * (int)(ANG1 / 2));

z += (float)(P_RandomNegPos() / 64.0f);

th = P_MobjCreateObject(x, y, z, debris);

P_SetMobjDirAndSpeed(th, angle, 2.0f, 0.25f);

th->tics -= P_Random() & 3;

if (th->tics < 1)
th->tics = 1;
/*
if (damage <= 12 && th->state && th->next_state)
P_SetMobjState(th, th->next_state - states);

if (damage <= 8 && th->state && th->next_state)
P_SetMobjState(th, th->next_state - states);
*/
}


//
// P_SpawnSplash
//
Expand Down
9 changes: 5 additions & 4 deletions source_files/edge/p_spec.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,18 +611,19 @@ static void P_SpawnLineEffectDebris(line_t *TheLine, const linetype_c *special)
//move slightly forward to spawn the debris
midx += dx + info->radius;
midy += dy + info->radius;
//P_MobjCreateObject(midx, midy, midz, info);

P_SpawnBlood(midx, midy, midz, 0, 0 + ANG180, info);
//P_SpawnBlood(midx, midy, midz, 0, 0 + ANG180, info);
P_SpawnDebris(midx, midy, midz, 0, 0 + ANG180, info);

midx = (TheLine->v1->x + TheLine->v2->x) / 2;
midy = (TheLine->v1->y + TheLine->v2->y) / 2;

//move slightly backward to spawn the debris
midx -= dx + info->radius;
midy -= dy + info->radius;
//P_MobjCreateObject(midx, midy, midz, info);
P_SpawnBlood(midx, midy, midz, 0, 0 + ANG180, info);

//P_SpawnBlood(midx, midy, midz, 0, 0 + ANG180, info);
P_SpawnDebris(midx, midy, midz, 0, 0 + ANG180, info);
}

//
Expand Down