stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-15 01:01:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up stuff I did while debugging

Browse source
This commit is contained in:
fickleheart 2018-12-26 14:51:06 -06:00
parent 74f13c0889
commit 6954689b96
3 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/doomdef.h
View file

@ -140,7 +140,7 @@
extern FILE *logstream;
#endif
#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
//#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
#ifdef DEVELOP
#define VERSION 0 // Game version
#define SUBVERSION 0 // more precise version number

4
src/g_game.c
View file

@ -4942,11 +4942,11 @@ void G_ConsGhostTic(void)
CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced!\n"));
demosynced = false;
/*P_UnsetThingPosition(testmo);
P_UnsetThingPosition(testmo);
testmo->x = oldghost.x;
testmo->y = oldghost.y;
P_SetThingPosition(testmo);
testmo->z = oldghost.z;*/
testmo->z = oldghost.z;
}
if (*demo_p == DEMOMARKER)

11
src/p_map.c
View file

@ -1423,7 +1423,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
// Make sure they aren't able to damage you ANYWHERE along the Z axis, you have to be TOUCHING the person.
&& !(thing->z + thing->height < tmthing->z || thing->z > tmthing->z + tmthing->height))
{
if (tmthing->scale > thing->scale + (FRACUNIT/8)) // SRB2kart - Handle squishes first!
K_SquishPlayer(thing->player, tmthing);
else if (thing->scale > tmthing->scale + (FRACUNIT/8))
@ -3181,8 +3181,6 @@ static void P_HitBounceLine(line_t *ld)
angle_t lineangle, moveangle, deltaangle;
fixed_t movelen;
CONS_Printf("hit bounce line %d\n", leveltime);
if (ld->slopetype == ST_HORIZONTAL)
{
tmymove = -tmymove;
@ -3849,7 +3847,6 @@ void P_BouncePlayerMove(mobj_t *mo)
if ((mo->eflags & MFE_JUSTBOUNCEDWALL) || (mo->player->spectator))
{
CONS_Printf("just bounced %d\n", leveltime);
P_SlideMove(mo, true);
return;
}
@ -3903,8 +3900,6 @@ void P_BouncePlayerMove(mobj_t *mo)
// First calculate remainder.
bestslidefrac = FRACUNIT - bestslidefrac;
CONS_Printf("best bounce frac %1.6f %d\n", FIXED_TO_FLOAT(bestslidefrac), leveltime);
if (bestslidefrac > FRACUNIT)
bestslidefrac = FRACUNIT;
@ -3934,8 +3929,6 @@ void P_BouncePlayerMove(mobj_t *mo)
mo->player->cmomx = tmxmove;
mo->player->cmomy = tmymove;
//CONS_Printf("trymove attempt %s w/ %2.6f %2.6f %d\n", P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove, true) ? "yes" : "no ", FIXED_TO_FLOAT(tmxmove), FIXED_TO_FLOAT(tmymove), leveltime);
if (!P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove, true)) {
CONS_Printf("trymove attempt failed w/ %2.6f %2.6f %d\n", FIXED_TO_FLOAT(tmxmove), FIXED_TO_FLOAT(tmymove), leveltime);
P_TryMove(mo, mo->x - oldmomx, mo->y - oldmomy, true);
@ -3963,7 +3956,6 @@ void P_BounceMove(mobj_t *mo)
if (mo->player)
{
CONS_Printf("bounce player %d\n", leveltime);
P_BouncePlayerMove(mo);
return;
}
@ -4014,7 +4006,6 @@ retry:
bounceback:
if (P_TryMove(mo, mo->x - mmomx, mo->y - mmomy, true))
{
CONS_Printf("bounceback %d\n", leveltime);
mo->momx *= -1;
mo->momy *= -1;
mo->momx = FixedMul(mo->momx, (FRACUNIT - (FRACUNIT>>2) - (FRACUNIT>>3)));