summaryrefslogtreecommitdiff
path: root/src/heretic
diff options
context:
space:
mode:
Diffstat (limited to 'src/heretic')
-rw-r--r--src/heretic/am_data.h12
-rw-r--r--src/heretic/am_map.c2
-rw-r--r--src/heretic/p_enemy.c8
-rw-r--r--src/heretic/p_mobj.c6
-rw-r--r--src/heretic/p_pspr.c12
-rw-r--r--src/heretic/r_data.c20
6 files changed, 35 insertions, 25 deletions
diff --git a/src/heretic/am_data.h b/src/heretic/am_data.h
index 1f83d876..342f06a9 100644
--- a/src/heretic/am_data.h
+++ b/src/heretic/am_data.h
@@ -92,18 +92,18 @@ mline_t cheat_player_arrow[] = {
#define R (FRACUNIT)
mline_t triangle_guy[] = {
- { { -.867*R, -.5*R }, { .867*R, -.5*R } },
- { { .867*R, -.5*R } , { 0, R } },
- { { 0, R }, { -.867*R, -.5*R } }
+ { { (fixed_t)(-.867*R), (fixed_t)(-.5*R) }, { (fixed_t)(.867*R ), (fixed_t)(-.5*R) } },
+ { { (fixed_t)(.867*R ), (fixed_t)(-.5*R) }, { (fixed_t)(0 ), (fixed_t)(R ) } },
+ { { (fixed_t)(0 ), (fixed_t)(R ) }, { (fixed_t)(-.867*R), (fixed_t)(-.5*R) } }
};
#undef R
#define NUMTRIANGLEGUYLINES (sizeof(triangle_guy)/sizeof(mline_t))
#define R (FRACUNIT)
mline_t thintriangle_guy[] = {
- { { -.5*R, -.7*R }, { R, 0 } },
- { { R, 0 }, { -.5*R, .7*R } },
- { { -.5*R, .7*R }, { -.5*R, -.7*R } }
+ { { (fixed_t)(-.5*R), (fixed_t)(-.7*R) }, { (fixed_t)(R ), (fixed_t)(0 ) } },
+ { { (fixed_t)(R ), (fixed_t)(0 ) }, { (fixed_t)(-.5*R), (fixed_t)(.7*R ) } },
+ { { (fixed_t)(-.5*R), (fixed_t)(.7*R ) }, { (fixed_t)(-.5*R), (fixed_t)(-.7*R) } }
};
#undef R
#define NUMTHINTRIANGLEGUYLINES (sizeof(thintriangle_guy)/sizeof(mline_t))
diff --git a/src/heretic/am_map.c b/src/heretic/am_map.c
index aa1b273b..99a8e206 100644
--- a/src/heretic/am_map.c
+++ b/src/heretic/am_map.c
@@ -131,7 +131,7 @@ static fixed_t old_m_x, old_m_y;
static mpoint_t f_oldloc;
// used by MTOF to scale from map-to-frame-buffer coords
-static fixed_t scale_mtof = INITSCALEMTOF;
+static fixed_t scale_mtof = (fixed_t)INITSCALEMTOF;
// used by FTOM to scale from frame-buffer-to-map coords (=1/scale_mtof)
static fixed_t scale_ftom;
diff --git a/src/heretic/p_enemy.c b/src/heretic/p_enemy.c
index 05566a07..6ad8cff0 100644
--- a/src/heretic/p_enemy.c
+++ b/src/heretic/p_enemy.c
@@ -1917,7 +1917,7 @@ void A_HeadIceImpact(mobj_t * ice)
angle >>= ANGLETOFINESHIFT;
shard->momx = FixedMul(shard->info->speed, finecosine[angle]);
shard->momy = FixedMul(shard->info->speed, finesine[angle]);
- shard->momz = -.6 * FRACUNIT;
+ shard->momz = (fixed_t)(-.6 * FRACUNIT);
P_CheckMissileSpawn(shard);
}
}
@@ -2507,7 +2507,7 @@ void A_VolcanoBlast(mobj_t * volcano)
angle >>= ANGLETOFINESHIFT;
blast->momx = FixedMul(1 * FRACUNIT, finecosine[angle]);
blast->momy = FixedMul(1 * FRACUNIT, finesine[angle]);
- blast->momz = (2.5 * FRACUNIT) + (P_Random() << 10);
+ blast->momz = (fixed_t)(2.5 * FRACUNIT) + (P_Random() << 10);
S_StartSound(blast, sfx_volsht);
P_CheckMissileSpawn(blast);
}
@@ -2540,8 +2540,8 @@ void A_VolcBallImpact(mobj_t * ball)
angle = i * ANG90;
tiny->angle = angle;
angle >>= ANGLETOFINESHIFT;
- tiny->momx = FixedMul(FRACUNIT * .7, finecosine[angle]);
- tiny->momy = FixedMul(FRACUNIT * .7, finesine[angle]);
+ tiny->momx = FixedMul((fixed_t)(FRACUNIT * .7), finecosine[angle]);
+ tiny->momy = FixedMul((fixed_t)(FRACUNIT * .7), finesine[angle]);
tiny->momz = FRACUNIT + (P_Random() << 9);
P_CheckMissileSpawn(tiny);
}
diff --git a/src/heretic/p_mobj.c b/src/heretic/p_mobj.c
index b5366501..e07ecf45 100644
--- a/src/heretic/p_mobj.c
+++ b/src/heretic/p_mobj.c
@@ -70,7 +70,7 @@ boolean P_SetMobjState(mobj_t * mobj, statenum_t state)
if (state == S_NULL)
{ // Remove mobj
- mobj->state = S_NULL;
+ mobj->state = (state_t *) S_NULL;
P_RemoveMobj(mobj);
return (false);
}
@@ -100,7 +100,7 @@ boolean P_SetMobjStateNF(mobj_t * mobj, statenum_t state)
if (state == S_NULL)
{ // Remove mobj
- mobj->state = S_NULL;
+ mobj->state = (state_t *) S_NULL;
P_RemoveMobj(mobj);
return (false);
}
@@ -1214,7 +1214,7 @@ void P_SpawnPuff(fixed_t x, fixed_t y, fixed_t z)
break;
case MT_GAUNTLETPUFF1:
case MT_GAUNTLETPUFF2:
- puff->momz = .8 * FRACUNIT;
+ puff->momz = (fixed_t)(.8 * FRACUNIT);
default:
break;
}
diff --git a/src/heretic/p_pspr.c b/src/heretic/p_pspr.c
index 07a04ac7..7f9660ac 100644
--- a/src/heretic/p_pspr.c
+++ b/src/heretic/p_pspr.c
@@ -1639,14 +1639,14 @@ void A_PhoenixPuff(mobj_t * actor)
puff = P_SpawnMobj(actor->x, actor->y, actor->z, MT_PHOENIXPUFF);
angle = actor->angle + ANG90;
angle >>= ANGLETOFINESHIFT;
- puff->momx = FixedMul(FRACUNIT * 1.3, finecosine[angle]);
- puff->momy = FixedMul(FRACUNIT * 1.3, finesine[angle]);
+ puff->momx = FixedMul((fixed_t)(FRACUNIT * 1.3), finecosine[angle]);
+ puff->momy = FixedMul((fixed_t)(FRACUNIT * 1.3), finesine[angle]);
puff->momz = 0;
puff = P_SpawnMobj(actor->x, actor->y, actor->z, MT_PHOENIXPUFF);
angle = actor->angle - ANG90;
angle >>= ANGLETOFINESHIFT;
- puff->momx = FixedMul(FRACUNIT * 1.3, finecosine[angle]);
- puff->momy = FixedMul(FRACUNIT * 1.3, finesine[angle]);
+ puff->momx = FixedMul((fixed_t)(FRACUNIT * 1.3), finecosine[angle]);
+ puff->momy = FixedMul((fixed_t)(FRACUNIT * 1.3), finesine[angle]);
puff->momz = 0;
}
@@ -1727,7 +1727,7 @@ void A_ShutdownPhoenixPL2(player_t * player, pspdef_t * psp)
void A_FlameEnd(mobj_t * actor)
{
- actor->momz += 1.5 * FRACUNIT;
+ actor->momz += (fixed_t)(1.5 * FRACUNIT);
}
//----------------------------------------------------------------------------
@@ -1738,7 +1738,7 @@ void A_FlameEnd(mobj_t * actor)
void A_FloatPuff(mobj_t * puff)
{
- puff->momz += 1.8 * FRACUNIT;
+ puff->momz += (fixed_t)(1.8 * FRACUNIT);
}
//---------------------------------------------------------------------------
diff --git a/src/heretic/r_data.c b/src/heretic/r_data.c
index 9846196a..ee005248 100644
--- a/src/heretic/r_data.c
+++ b/src/heretic/r_data.c
@@ -221,7 +221,7 @@ void R_GenerateLookup(int texnum)
// fill in the lump / offset, so columns with only a single patch are
// all done
//
- patchcount = (byte *) alloca(texture->width);
+ patchcount = (byte *) Z_Malloc(texture->width, PU_STATIC, &patchcount);
memset(patchcount, 0, texture->width);
patch = texture->patches;
@@ -263,6 +263,8 @@ void R_GenerateLookup(int texnum)
texturecompositesize[texnum] += texture->height;
}
}
+
+ Z_Free(patchcount);
}
@@ -322,7 +324,7 @@ void R_InitTextures(void)
names = W_CacheLumpName("PNAMES", PU_STATIC);
nummappatches = LONG(*((int *) names));
name_p = names + 4;
- patchlookup = alloca(nummappatches * sizeof(*patchlookup));
+ patchlookup = Z_Malloc(nummappatches * sizeof(*patchlookup), PU_STATIC, NULL);
for (i = 0; i < nummappatches; i++)
{
strncpy(name, name_p + i * 8, 8);
@@ -423,6 +425,8 @@ void R_InitTextures(void)
totalwidth += texture->width;
}
+ Z_Free(patchlookup);
+
W_ReleaseLumpName("TEXTURE1");
if (maptex2)
{
@@ -654,7 +658,7 @@ void R_PrecacheLevel(void)
//
// precache flats
//
- flatpresent = alloca(numflats);
+ flatpresent = Z_Malloc(numflats, PU_STATIC, NULL);
memset(flatpresent, 0, numflats);
for (i = 0; i < numsectors; i++)
{
@@ -671,10 +675,12 @@ void R_PrecacheLevel(void)
W_CacheLumpNum(lump, PU_CACHE);
}
+ Z_Free(flatpresent);
+
//
// precache textures
//
- texturepresent = alloca(numtextures);
+ texturepresent = Z_Malloc(numtextures, PU_STATIC, NULL);
memset(texturepresent, 0, numtextures);
for (i = 0; i < numsides; i++)
@@ -700,10 +706,12 @@ void R_PrecacheLevel(void)
}
}
+ Z_Free(texturepresent);
+
//
// precache sprites
//
- spritepresent = alloca(numsprites);
+ spritepresent = Z_Malloc(numsprites, PU_STATIC, NULL);
memset(spritepresent, 0, numsprites);
for (th = thinkercap.next; th != &thinkercap; th = th->next)
@@ -728,4 +736,6 @@ void R_PrecacheLevel(void)
}
}
}
+
+ Z_Free(spritepresent);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 04:41:05 +0000