incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'blankart-dev' into timelimit_alarms

Browse source
This commit is contained in:
minenice55 2025-09-30 04:22:58 +02:00
commit 9e88716d39
4 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/hardware/hw_main.c
View file

@ -4920,11 +4920,11 @@ static void HWR_ProjectSprite(mobj_t *thing)
if (thing->renderflags & RF_ABSOLUTEOFFSETS)
{
spr_offset = interp.spritexoffset;
spr_offset = FixedDiv(interp.spritexoffset,highresscale);
#ifdef ROTSPRITE
spr_topoffset = (interp.spriteyoffset + FixedDiv((visoffs.y * visoffymul), mapobjectscale) + (rotoffset.y * visoffymul));
spr_topoffset = (FixedDiv(interp.spriteyoffset,highresscale) + FixedDiv((visoffs.y * visoffymul), mapobjectscale) + (rotoffset.y * visoffymul));
#else
spr_topoffset = interp.spriteyoffset;
spr_topoffset = FixedDiv(interp.spriteyoffset,highresscale);
#endif
}
else

8
src/k_collide.c
View file

@ -63,7 +63,7 @@ boolean K_OrbinautJawzCollide(mobj_t *t1, mobj_t *t2)
if (t2->player->hyudorotimer)
return true; // no interaction
if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KITEM_FLAMESHIELD))
if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KSHIELD_FLAME))
{
// Melt item
S_StartSound(t2, sfx_s3k43);
@ -159,7 +159,7 @@ boolean K_BananaBallhogCollide(mobj_t *t1, mobj_t *t2)
damageitem = true;
if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KITEM_FLAMESHIELD))
if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KSHIELD_FLAME))
{
// Melt item
S_StartSound(t2, sfx_s3k43);
@ -249,7 +249,7 @@ boolean K_EggItemCollide(mobj_t *t1, mobj_t *t2)
t2->player->roulettetype = KROULETTETYPE_EGGMAN;
}
if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KITEM_FLAMESHIELD))
if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KSHIELD_FLAME))
{
// Melt item
S_StartSound(t2, sfx_s3k43);
@ -381,7 +381,7 @@ boolean K_LandMineCollide(mobj_t *t1, mobj_t *t2)
if (t1->health > 1)
S_StartSound(t2, sfx_bsnipe);
if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KITEM_FLAMESHIELD))
if (t2->player->flamestore && (K_GetShieldFromPlayer(t2->player) == KSHIELD_FLAME))
{
// Melt item
S_StartSound(t2, sfx_s3k43);

5
src/p_enemy.c
View file

@ -10632,7 +10632,8 @@ void A_ItemPop(mobj_t *actor)
remains->skin = NULL;
remains->spawnpoint = actor->spawnpoint;
P_SetTarget(&g_tm.thing, remains);
// a pointless modification of global state causing bizarre collision problems... who could've thought?
//P_SetTarget(&g_tm.thing, remains);
//if (actor->info->deathsound)
//S_StartSound(remains, actor->info->deathsound);
@ -11187,7 +11188,7 @@ void A_SSMineExplode(mobj_t *actor)
INT32 locvar1 = var1;
mobjtype_t type;
skincolornum_t color = SKINCOLOR_KETCHUP;
explodedist = FixedMul((3*actor->info->painchance)/2, actor->scale);
explodedist = FixedMul((3*actor->info->painchance)/2, mapobjectscale);
if (LUA_CallAction(A_SSMINEEXPLODE, actor))
return;

8
src/r_things.cpp
View file

@ -1968,11 +1968,11 @@ static void R_ProjectSprite(mobj_t *thing)
if (thing->renderflags & RF_ABSOLUTEOFFSETS)
{
spr_offset = interp.spritexoffset;
spr_offset = FixedDiv(interp.spritexoffset, highresscale);
#ifdef ROTSPRITE
spr_topoffset = (interp.spriteyoffset + FixedDiv((visoffs.y * visoffymul), mapobjectscale) + (rotoffset.y * visoffymul));
spr_topoffset = (FixedDiv(interp.spriteyoffset, highresscale) + FixedDiv((visoffs.y * visoffymul), mapobjectscale) + (rotoffset.y * visoffymul));
#else
spr_topoffset = interp.spriteyoffset;
spr_topoffset = FixedDiv(interp.spriteyoffset, highresscale);
#endif
}
else
@ -1984,7 +1984,7 @@ static void R_ProjectSprite(mobj_t *thing)
spr_offset += FixedDiv(interp.spritexoffset, highresscale) * flipoffset;
#ifdef ROTSPRITE
spr_topoffset += (FixedDiv(interp.spritexoffset, highresscale) + FixedDiv((visoffs.y * visoffymul), mapobjectscale) + (rotoffset.y * visoffymul)) * flipoffset;
spr_topoffset += (FixedDiv(interp.spriteyoffset, highresscale) + FixedDiv((visoffs.y * visoffymul), mapobjectscale) + (rotoffset.y * visoffymul)) * flipoffset;
#else
spr_topoffset += FixedDiv(interp.spriteyoffset, highresscale) * flipoffset;
#endif