zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-04 19:20:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Updated to ZDoom r2391:

Browse source 
- Remove fakedblocker, since it was unused.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@828 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
gez 2010-06-27 21:09:25 +00:00
parent d2fb3eea45
commit f7e60ec995
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/p_map.cpp
View file

@ -1212,7 +1212,6 @@ bool P_CheckPosition (AActor *thing, fixed_t x, fixed_t y, FCheckPosition &tm)
{ {
sector_t *newsec; sector_t *newsec;
AActor *thingblocker; AActor *thingblocker;
AActor *fakedblocker;
fixed_t realheight = thing->height; fixed_t realheight = thing->height;
tm.thing = thing; tm.thing = thing;
@ -1279,7 +1278,6 @@ bool P_CheckPosition (AActor *thing, fixed_t x, fixed_t y, FCheckPosition &tm)
// Check things first, possibly picking things up. // Check things first, possibly picking things up.
thing->BlockingMobj = NULL; thing->BlockingMobj = NULL;
thingblocker = NULL; thingblocker = NULL;
fakedblocker = NULL;
if (thing->player) if (thing->player)
{ // [RH] Fake taller height to catch stepping up into things. { // [RH] Fake taller height to catch stepping up into things.
thing->height = realheight + thing->MaxStepHeight; thing->height = realheight + thing->MaxStepHeight;
@ -1326,7 +1324,6 @@ bool P_CheckPosition (AActor *thing, fixed_t x, fixed_t y, FCheckPosition &tm)
} }
// Nothing is blocking us, but this actor potentially could // Nothing is blocking us, but this actor potentially could
// if there is something else to step on. // if there is something else to step on.
fakedblocker = BlockingMobj;
thing->BlockingMobj = NULL; thing->BlockingMobj = NULL;
} }
else else

4
src/svnrevision.h
View file

@ -3,5 +3,5 @@
// This file was automatically generated by the // This file was automatically generated by the
// updaterevision tool. Do not edit by hand. // updaterevision tool. Do not edit by hand.
#define ZD_SVN_REVISION_STRING "2389" #define ZD_SVN_REVISION_STRING "2391"
#define ZD_SVN_REVISION_NUMBER 2389 #define ZD_SVN_REVISION_NUMBER 2391