From: <ent...@ma...> - 2009-05-17 17:20:27
|
Author: entryway Date: Sun May 17 19:20:23 2009 New Revision: 3177 Modified: branches/prboom-plus-24/prboom2/src/e6y.c branches/prboom-plus-24/prboom2/src/e6y.h branches/prboom-plus-24/prboom2/src/p_map.c branches/prboom-plus-24/prboom2/src/r_things.c Log: Some additional #ifdef GL_DOOM checks Modified: branches/prboom-plus-24/prboom2/src/e6y.c ============================================================================== --- branches/prboom-plus-24/prboom2/src/e6y.c (original) +++ branches/prboom-plus-24/prboom2/src/e6y.c Sun May 17 19:20:23 2009 @@ -550,10 +550,12 @@ interlaced_scanning_requires_clearing = 1; } +#ifdef GL_DOOM dboolean GetMouseLook(void) { return movement_mouselook; } +#endif void CheckPitch(signed int *pitch) { Modified: branches/prboom-plus-24/prboom2/src/e6y.h ============================================================================== --- branches/prboom-plus-24/prboom2/src/e6y.h (original) +++ branches/prboom-plus-24/prboom2/src/e6y.h Sun May 17 19:20:23 2009 @@ -231,7 +231,12 @@ void M_ChangeCompTranslucency(void); void CheckPitch(signed int *pitch); void I_Init2(void); + +#ifdef GL_DOOM dboolean GetMouseLook(void); +#else +#define GetMouseLook() (0) +#endif extern float viewPitch; extern dboolean transparentpresent; Modified: branches/prboom-plus-24/prboom2/src/p_map.c ============================================================================== --- branches/prboom-plus-24/prboom2/src/p_map.c (original) +++ branches/prboom-plus-24/prboom2/src/p_map.c Sun May 17 19:20:23 2009 @@ -650,11 +650,11 @@ // RjY // comperr_hangsolid, an attempt to handle blocking hanging bodies // A solid hanging body will allow sufficiently small things underneath it. - if (!((~thing->flags) & (MF_SOLID | MF_SPAWNCEILING)) // solid and hanging + if (compbad_get(&comperr_hangsolid) && + !((~thing->flags) & (MF_SOLID | MF_SPAWNCEILING)) // solid and hanging // invert everything, then both bits should be clear - && tmthing->z + tmthing->height <= thing->z // head height <= base + && tmthing->z + tmthing->height <= thing->z) // head height <= base // top of thing trying to move under the body <= bottom of body - && compbad_get(&comperr_hangsolid)) { tmceilingz = thing->z; // pretend ceiling height is at body's base return true; Modified: branches/prboom-plus-24/prboom2/src/r_things.c ============================================================================== --- branches/prboom-plus-24/prboom2/src/r_things.c (original) +++ branches/prboom-plus-24/prboom2/src/r_things.c Sun May 17 19:20:23 2009 @@ -512,7 +512,9 @@ fixed_t gxt, gyt; fixed_t tz; int width; +#ifdef GL_DOOM dboolean mlook = GetMouseLook() || (render_fov > FOV90); +#endif if (movement_smooth) { @@ -545,11 +547,13 @@ tx = -(gyt+gxt); //e6y +#ifdef GL_DOOM if (V_GetMode() == VID_MODEGL && !render_paperitems && mlook) { if (tz >= MINZ && (D_abs(tx)>>5) > tz) return; } else +#endif // too far off the side? if (D_abs(tx)>(tz<<2)) @@ -613,13 +617,16 @@ } // off the side? +#ifdef GL_DOOM if(!mlook)//e6y +#endif if (x1 > viewwidth || x2 < 0) return; // killough 4/9/98: clip things which are out of view due to height +#ifdef GL_DOOM if(!GetMouseLook() && render_fov <= FOV90)//e6y - +#endif // e6y: fix of hanging decoration disappearing in Batman Doom MAP02 // centeryfrac -> viewheightfrac if (fz > viewz + FixedDiv(viewheightfrac, xscale) || |