lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build: fixups

This commit is contained in:
Alam Ed Arias 2017-09-28 11:01:52 -04:00
parent f1a347e55f
commit 5986720789
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hardware/hw_md2.c
View File

@ -428,7 +428,7 @@ static md2_model_t *md2_readModel(const char *filename)
spr2 |= FF_SPR2SUPER; spr2 |= FF_SPR2SUPER;
if (model->spr2frames[spr2*2 + 1]++ == 0) // numspr2frames if (model->spr2frames[spr2*2 + 1]++ == 0) // numspr2frames
model->spr2frames[spr2*2] = i; // starting frame model->spr2frames[spr2*2] = i; // starting frame
CONS_Debug(DBG_RENDER, "frame %s, sprite2 %s - starting frame %d, number of frames %d\n", frame->name, spr2names[spr2 & ~FF_SPR2SUPER], model->spr2frames[spr2*2], model->spr2frames[spr2*2 + 1]); CONS_Debug(DBG_RENDER, "frame %s, sprite2 %s - starting frame %s, number of frames %s\n", frame->name, spr2names[spr2 & ~FF_SPR2SUPER], sizeu1(model->spr2frames[spr2*2]), sizeu2(model->spr2frames[spr2*2 + 1]));
} }
} }
} }

12
src/lua_infolib.c
View File

@ -165,10 +165,12 @@ static int lib_setSpr2default(lua_State *L)
{ {
const char *name = lua_tostring(L, 1); const char *name = lua_tostring(L, 1);
for (i = 0; i < free_spr2; i++) for (i = 0; i < free_spr2; i++)
{
if (fastcmp(name, spr2names[i])) if (fastcmp(name, spr2names[i]))
break; break;
if (i == free_spr2) }
return luaL_error(L, "spr2defaults[] invalid index"); if (i == free_spr2)
return luaL_error(L, "spr2defaults[] invalid index");
} }
else else
return luaL_error(L, "spr2defaults[] invalid index"); return luaL_error(L, "spr2defaults[] invalid index");
@ -182,10 +184,12 @@ static int lib_setSpr2default(lua_State *L)
{ {
const char *name = lua_tostring(L, 2); const char *name = lua_tostring(L, 2);
for (j = 0; j < free_spr2; j++) for (j = 0; j < free_spr2; j++)
{
if (fastcmp(name, spr2names[j])) if (fastcmp(name, spr2names[j]))
break; break;
if (j == free_spr2) }
return luaL_error(L, "spr2defaults[] invalid index"); if (j == free_spr2)
return luaL_error(L, "spr2defaults[] invalid index");
} }
if (j >= free_spr2) if (j >= free_spr2)

1
src/m_menu.c
View File

@ -8719,6 +8719,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
COM_BufAddText (va("%s %s\n",setupm_cvdefaultname->name,setupm_name)); COM_BufAddText (va("%s %s\n",setupm_cvdefaultname->name,setupm_name));
break; break;
} }
/* FALLTHRU */
case KEY_RIGHTARROW: case KEY_RIGHTARROW:
if (itemOn == 1) //player skin if (itemOn == 1) //player skin
{ {

6
src/p_mobj.c
View File

@ -6781,6 +6781,7 @@ void P_MobjThinker(mobj_t *mobj)
whoosh->momz = mobj->target->momz; // Stay reasonably centered for a few frames whoosh->momz = mobj->target->momz; // Stay reasonably centered for a few frames
mobj->target->player->pflags &= ~PF_SHIELDABILITY; // prevent eternal whoosh mobj->target->player->pflags &= ~PF_SHIELDABILITY; // prevent eternal whoosh
} }
/* FALLTHRU */
case MT_FLAMEAURA_ORB: case MT_FLAMEAURA_ORB:
if (!(mobj->flags2 & MF2_SHIELD)) if (!(mobj->flags2 & MF2_SHIELD))
return; return;
@ -7268,7 +7269,7 @@ void P_MobjThinker(mobj_t *mobj)
break; break;
case MT_AQUABUZZ: case MT_AQUABUZZ:
P_MobjCheckWater(mobj); // solely for MFE_UNDERWATER for A_FlickySpawn P_MobjCheckWater(mobj); // solely for MFE_UNDERWATER for A_FlickySpawn
// no break here on purpose /* FALLTHRU */
case MT_BIGAIRMINE: case MT_BIGAIRMINE:
{ {
if (mobj->tracer && mobj->tracer->player && mobj->tracer->health > 0 if (mobj->tracer && mobj->tracer->player && mobj->tracer->health > 0
@ -7752,6 +7753,7 @@ void P_MobjThinker(mobj_t *mobj)
else else
mobj->z = mobj->floorz; mobj->z = mobj->floorz;
} }
/* FALLTHRU */
default: default:
// check mobj against possible water content, before movement code // check mobj against possible water content, before movement code
P_MobjCheckWater(mobj); P_MobjCheckWater(mobj);
@ -11311,4 +11313,4 @@ mobj_t *P_SpawnMobjFromMobj(mobj_t *mobj, fixed_t xofs, fixed_t yofs, fixed_t zo
newmobj->destscale = mobj->destscale; newmobj->destscale = mobj->destscale;
P_SetScale(newmobj, mobj->scale); P_SetScale(newmobj, mobj->scale);
return newmobj; return newmobj;
} }

1
src/p_user.c
View File

@ -9773,6 +9773,7 @@ void P_PlayerThink(player_t *player)
player->drawangle = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy); player->drawangle = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
break; break;
} }
/* FALLTHRU */
default: default:
player->drawangle = player->mo->angle; player->drawangle = player->mo->angle;
break; break;