mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-17 18:36:43 +02:00
Code Issues Releases Wiki Activity

#41 fix

Browse Source
This commit is contained in:
XProger
2017-05-13 23:37:53 +03:00
parent cd29100d6a
commit 44e924bda7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/collision.h
View File

@@ -6,7 +6,7 @@
#include "format.h" #include "format.h"
struct Collision { struct Collision {
enum Side { NONE, LEFT, RIGHT, FRONT, TOP, BOTTOM } side; enum Side { NONE, LEFT, RIGHT, FRONT, BACK, TOP, BOTTOM } side;
struct Info { struct Info {
int room, roomAbove, roomBelow, floor, ceiling; int room, roomAbove, roomBelow, floor, ceiling;
@@ -67,7 +67,7 @@ struct Collision {
} else } else
return; return;
pos += vec3(d.x, 0.0f, d.y); pos += vec3(d.x, -velocity.y, d.y);
} }
inline bool checkHeight(TR::Level *level, int roomIndex, const vec3 &pos, const vec2 &offset, int height, int maxAscent, int maxDescent, Side side) { inline bool checkHeight(TR::Level *level, int roomIndex, const vec3 &pos, const vec2 &offset, int height, int maxAscent, int maxDescent, Side side) {