diff --git a/src/Makefile.d/detect.mk b/src/Makefile.d/detect.mk index 4719d6593..ab6268757 100644 --- a/src/Makefile.d/detect.mk +++ b/src/Makefile.d/detect.mk @@ -57,8 +57,8 @@ endif # This must have high to low order. gcc_versions:=\ 132 131\ - 123 122 121\ - 114 113 112 111\ + 123 122 121\ + 114 113 112 111\ 105 104 103 102 101\ 95 94 93 92 91\ 85 84 83 82 81\ diff --git a/src/p_map.c b/src/p_map.c index 80135db74..a9d2cf45d 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -3732,6 +3732,8 @@ void P_SlideMove(mobj_t *mo) vertex_t v1, v2; // fake vertexes line_t junk; // fake linedef + memset(&junk, 1, sizeof(junk)); + if (tmhitthing && mo->z + mo->height > tmhitthing->z && mo->z < tmhitthing->z + tmhitthing->height) { // Don't mess with your momentum if it's a pushable object. Pushables do their own crazy things already.