whitespace cleanup
This commit is contained in:
parent
3e3065f67c
commit
7f4424b4a0
|
@ -897,12 +897,12 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics)
|
||||||
|
|
||||||
turnright = PLAYER1INPUTDOWN(gc_turnright);
|
turnright = PLAYER1INPUTDOWN(gc_turnright);
|
||||||
turnleft = PLAYER1INPUTDOWN(gc_turnleft);
|
turnleft = PLAYER1INPUTDOWN(gc_turnleft);
|
||||||
|
|
||||||
straferkey = PLAYER1INPUTDOWN(gc_straferight);
|
straferkey = PLAYER1INPUTDOWN(gc_straferight);
|
||||||
strafelkey = PLAYER1INPUTDOWN(gc_strafeleft);
|
strafelkey = PLAYER1INPUTDOWN(gc_strafeleft);
|
||||||
movefkey = PLAYER1INPUTDOWN(gc_forward);
|
movefkey = PLAYER1INPUTDOWN(gc_forward);
|
||||||
movebkey = PLAYER1INPUTDOWN(gc_backward);
|
movebkey = PLAYER1INPUTDOWN(gc_backward);
|
||||||
|
|
||||||
mouseaiming = (PLAYER1INPUTDOWN(gc_mouseaiming)) ^ cv_alwaysfreelook.value;
|
mouseaiming = (PLAYER1INPUTDOWN(gc_mouseaiming)) ^ cv_alwaysfreelook.value;
|
||||||
analogjoystickmove = cv_usejoystick.value && !Joystick.bGamepadStyle;
|
analogjoystickmove = cv_usejoystick.value && !Joystick.bGamepadStyle;
|
||||||
gamepadjoystickmove = cv_usejoystick.value && Joystick.bGamepadStyle;
|
gamepadjoystickmove = cv_usejoystick.value && Joystick.bGamepadStyle;
|
||||||
|
|
|
@ -994,12 +994,12 @@ static void HU_DrawCEcho(void)
|
||||||
static void HU_drawGametype(void)
|
static void HU_drawGametype(void)
|
||||||
{
|
{
|
||||||
const char *strvalue = NULL;
|
const char *strvalue = NULL;
|
||||||
|
|
||||||
if (gametype < 0 || gametype >= NUMGAMETYPES)
|
if (gametype < 0 || gametype >= NUMGAMETYPES)
|
||||||
return; // not a valid gametype???
|
return; // not a valid gametype???
|
||||||
|
|
||||||
strvalue = Gametype_Names[gametype];
|
strvalue = Gametype_Names[gametype];
|
||||||
|
|
||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
V_DrawString(4, 184, 0, strvalue);
|
V_DrawString(4, 184, 0, strvalue);
|
||||||
else
|
else
|
||||||
|
|
|
@ -10557,36 +10557,36 @@ void A_Boss5Jump(mobj_t *actor)
|
||||||
angle_t theta; // Angle of attack
|
angle_t theta; // Angle of attack
|
||||||
// INT32 locvar1 = var1;
|
// INT32 locvar1 = var1;
|
||||||
// INT32 locvar2 = var2;
|
// INT32 locvar2 = var2;
|
||||||
|
|
||||||
#ifdef HAVE_BLUA
|
#ifdef HAVE_BLUA
|
||||||
if (LUA_CallAction("A_Boss5Jump", actor))
|
if (LUA_CallAction("A_Boss5Jump", actor))
|
||||||
return;
|
return;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!actor->tracer)
|
if (!actor->tracer)
|
||||||
return; // Don't even bother if we've got nothing to aim at.
|
return; // Don't even bother if we've got nothing to aim at.
|
||||||
|
|
||||||
// Look up actor's current gravity situation
|
// Look up actor's current gravity situation
|
||||||
if (actor->subsector->sector->gravity)
|
if (actor->subsector->sector->gravity)
|
||||||
g = FixedMul(gravity,(FixedDiv(*actor->subsector->sector->gravity>>FRACBITS, 1000)));
|
g = FixedMul(gravity,(FixedDiv(*actor->subsector->sector->gravity>>FRACBITS, 1000)));
|
||||||
else
|
else
|
||||||
g = gravity;
|
g = gravity;
|
||||||
|
|
||||||
// Look up distance between actor and its tracer
|
// Look up distance between actor and its tracer
|
||||||
x = P_AproxDistance(actor->tracer->x - actor->x, actor->tracer->y - actor->y);
|
x = P_AproxDistance(actor->tracer->x - actor->x, actor->tracer->y - actor->y);
|
||||||
// Look up height difference between actor and its tracer
|
// Look up height difference between actor and its tracer
|
||||||
y = actor->tracer->z - actor->z;
|
y = actor->tracer->z - actor->z;
|
||||||
|
|
||||||
// Get x^2 + y^2. Have to do it in a roundabout manner, because this overflows fixed_t way too easily otherwise.
|
// Get x^2 + y^2. Have to do it in a roundabout manner, because this overflows fixed_t way too easily otherwise.
|
||||||
x_int = x>>FRACBITS;
|
x_int = x>>FRACBITS;
|
||||||
y_int = y>>FRACBITS;
|
y_int = y>>FRACBITS;
|
||||||
intHypotenuse = (x_int*x_int) + (y_int*y_int);
|
intHypotenuse = (x_int*x_int) + (y_int*y_int);
|
||||||
fixedHypotenuse = FixedSqrt(intHypotenuse) *256;
|
fixedHypotenuse = FixedSqrt(intHypotenuse) *256;
|
||||||
|
|
||||||
// a = g(y+/-sqrt(x^2+y^2)). a1 can be +, a2 can be -.
|
// a = g(y+/-sqrt(x^2+y^2)). a1 can be +, a2 can be -.
|
||||||
a1 = FixedMul(g,y+fixedHypotenuse);
|
a1 = FixedMul(g,y+fixedHypotenuse);
|
||||||
a2 = FixedMul(g,y-fixedHypotenuse);
|
a2 = FixedMul(g,y-fixedHypotenuse);
|
||||||
|
|
||||||
// Determine which one isn't actually an imaginary number (or the smaller of the two, if both are real), and use that for v.
|
// Determine which one isn't actually an imaginary number (or the smaller of the two, if both are real), and use that for v.
|
||||||
if (a1 < 0 || a2 < 0)
|
if (a1 < 0 || a2 < 0)
|
||||||
{
|
{
|
||||||
|
@ -10608,7 +10608,7 @@ void A_Boss5Jump(mobj_t *actor)
|
||||||
// We can cut the "+/- sqrt" part out entirely, since v was calculated specifically for it to equal zero. So:
|
// We can cut the "+/- sqrt" part out entirely, since v was calculated specifically for it to equal zero. So:
|
||||||
//theta = tantoangle[FixedDiv(aToUse,FixedMul(g,x)) >> DBITS];
|
//theta = tantoangle[FixedDiv(aToUse,FixedMul(g,x)) >> DBITS];
|
||||||
theta = tantoangle[SlopeDiv(aToUse,FixedMul(g,x))];
|
theta = tantoangle[SlopeDiv(aToUse,FixedMul(g,x))];
|
||||||
|
|
||||||
// Okay, complicated math done. Let's make this object jump already.
|
// Okay, complicated math done. Let's make this object jump already.
|
||||||
A_FaceTracer(actor);
|
A_FaceTracer(actor);
|
||||||
|
|
||||||
|
|
|
@ -145,7 +145,7 @@ void P_InitPicAnims(void)
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
I_Assert(animdefs == NULL);
|
I_Assert(animdefs == NULL);
|
||||||
|
|
||||||
maxanims = 0;
|
maxanims = 0;
|
||||||
|
|
||||||
for (w = numwadfiles-1; w >= 0; w--)
|
for (w = numwadfiles-1; w >= 0; w--)
|
||||||
|
@ -161,7 +161,7 @@ void P_InitPicAnims(void)
|
||||||
animdefsLumpNum = W_CheckNumForNamePwad("ANIMDEFS", (UINT16)w, animdefsLumpNum + 1);
|
animdefsLumpNum = W_CheckNumForNamePwad("ANIMDEFS", (UINT16)w, animdefsLumpNum + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Define the last one
|
// Define the last one
|
||||||
animdefs[maxanims].istexture = -1;
|
animdefs[maxanims].istexture = -1;
|
||||||
strncpy(animdefs[maxanims].endname, "", 9);
|
strncpy(animdefs[maxanims].endname, "", 9);
|
||||||
|
|
|
@ -1196,7 +1196,7 @@ lumpnum_t R_GetFlatNumForName(const char *name)
|
||||||
// Scan wad files backwards so patched flats take preference.
|
// Scan wad files backwards so patched flats take preference.
|
||||||
for (i = numwadfiles - 1; i >= 0; i--)
|
for (i = numwadfiles - 1; i >= 0; i--)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (wadfiles[i]->type == RET_PK3)
|
if (wadfiles[i]->type == RET_PK3)
|
||||||
{
|
{
|
||||||
start = W_CheckNumForFolderStartPK3("Flats/", i, 0);
|
start = W_CheckNumForFolderStartPK3("Flats/", i, 0);
|
||||||
|
|
|
@ -1311,7 +1311,7 @@ void R_RegisterEngineStuff(void)
|
||||||
CV_RegisterVar(&cv_translucenthud);
|
CV_RegisterVar(&cv_translucenthud);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_maxportals);
|
CV_RegisterVar(&cv_maxportals);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_movebob);
|
CV_RegisterVar(&cv_movebob);
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
|
|
|
@ -617,7 +617,7 @@ UINT16 W_InitFile(const char *filename)
|
||||||
lumpinfo_t *lump_p;
|
lumpinfo_t *lump_p;
|
||||||
filelump_t *fileinfo;
|
filelump_t *fileinfo;
|
||||||
void *fileinfov;
|
void *fileinfov;
|
||||||
|
|
||||||
type = RET_WAD;
|
type = RET_WAD;
|
||||||
|
|
||||||
// read the header
|
// read the header
|
||||||
|
|
|
@ -43,11 +43,11 @@ typedef struct
|
||||||
} ATTRPACK filelump_t;
|
} ATTRPACK filelump_t;
|
||||||
|
|
||||||
// Available compression methods for lumps.
|
// Available compression methods for lumps.
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
CM_NOCOMPRESSION,
|
CM_NOCOMPRESSION,
|
||||||
CM_DEFLATE,
|
CM_DEFLATE,
|
||||||
CM_LZF,
|
CM_LZF,
|
||||||
CM_UNSUPPORTED
|
CM_UNSUPPORTED
|
||||||
} compmethod;
|
} compmethod;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue