mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-15 01:24:35 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/XProger/master'

Browse Source
This commit is contained in:
Gh0stBlade
2017-05-14 23:36:16 +01:00
parent 9c95d6fc3a 95b1b3ce8d
commit c4505bfa39
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/collision.h
View File

@@ -67,7 +67,7 @@ struct Collision {
} else
return;
pos += vec3(d.x, -velocity.y, d.y);
pos += vec3(d.x, 0.0f, d.y);
}
inline bool checkHeight(TR::Level *level, int roomIndex, const vec3 &pos, const vec2 &offset, int height, int maxAscent, int maxDescent, Side side) {

31
src/trigger.h
View File

@@ -155,12 +155,37 @@ struct Block : Controller {
bool doMove(bool push) {
// check floor height of next floor
vec3 dir = getDir() * (push ? 1024.0f : -2048.0f);
vec3 dir = getDir() * (push ? 1024.0f : -1024.0f);
TR::Entity &e = getEntity();
TR::Level::FloorInfo info;
level->getFloorInfo(e.room, e.x + (int)dir.x, e.y, e.z + (int)dir.z, info);
if ((info.slantX | info.slantZ) || info.floor != e.y)
int px = e.x + (int)dir.x;
int pz = e.z + (int)dir.z;
level->getFloorInfo(e.room, px, e.y, pz, info);
if ((info.slantX | info.slantZ) || info.floor != e.y || info.floor - info.ceiling < 1024)
return false;
// check for trapdoor
px /= 1024;
pz /= 1024;
for (int i = 0; i < info.trigCmdCount; i++)
if (info.trigCmd[i].action == TR::Action::ACTIVATE) {
TR::Entity &obj = level->entities[info.trigCmd[i].args];
if ((obj.type == TR::Entity::TRAP_DOOR_1 || obj.type == TR::Entity::TRAP_DOOR_2) && px == obj.x / 1024 && pz == obj.z / 1024)
return false;
}
// check Laras destination position
if (!push) {
dir = getDir() * (-2048.0f);
px = e.x + (int)dir.x;
pz = e.z + (int)dir.z;
level->getFloorInfo(e.room, px, e.y, pz, info);
if ((info.slantX | info.slantZ) || info.floor != e.y || info.floor - info.ceiling < 1024)
return false;
}
if (!animation.setState(push ? STATE_PUSH : STATE_PULL))
return false;
updateFloor(false);