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

fixed #117

Browse Source
This commit is contained in:
XProger
2018-05-22 05:05:27 +03:00
parent 2e35760309
commit 6b084c8236
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/camera.h
View File

@@ -205,7 +205,7 @@ struct Camera : ICamera {
uint16 cameraBoxIndex = level->getSector(to.room, to.pos)->boxIndex; uint16 cameraBoxIndex = level->getSector(to.room, to.pos)->boxIndex;
if (ownerBoxIndex == TR::NO_BOX) { if (ownerBoxIndex == TR::NO_BOX) {
ASSERT(false); ASSERT(false); // TODO: collide death AABB with walls
return; return;
} }

3
src/format.h
View File

@@ -2286,7 +2286,7 @@ namespace TR {
uint16 *meshData; uint16 *meshData;
int32 meshOffsetsCount; int32 meshOffsetsCount;
uint32 *meshOffsets; int32 *meshOffsets;
int32 animsCount; int32 animsCount;
Animation *anims; Animation *anims;
@@ -4155,7 +4155,6 @@ namespace TR {
//#ifndef _DEBUG //#ifndef _DEBUG
if ((type >= Entity::AI_GUARD && type <= Entity::AI_CHECK) || if ((type >= Entity::AI_GUARD && type <= Entity::AI_CHECK) ||
(type >= Entity::GLOW_2 && type <= Entity::ENEMY_BAT_SWARM) || (type >= Entity::GLOW_2 && type <= Entity::ENEMY_BAT_SWARM) ||
(type == Entity::TRAP_FLAME_EMITTER || type == Entity::MIDAS_HAND) ||
type == Entity::WATERFALL || type == Entity::KILL_ALL_TRIGGERS || type == Entity::VIEW_TARGET || type == Entity::SOUND_DOOR_BELL || type == Entity::SOUND_ALARM_BELL || type == Entity::TRIPWIRE) type == Entity::WATERFALL || type == Entity::KILL_ALL_TRIGGERS || type == Entity::VIEW_TARGET || type == Entity::SOUND_DOOR_BELL || type == Entity::SOUND_ALARM_BELL || type == Entity::TRIPWIRE)
return 0; return 0;
//#endif //#endif

4
src/mesh.h
View File

@@ -233,7 +233,7 @@ struct MeshBuilder {
TR::Model &model = level.models[i]; TR::Model &model = level.models[i];
for (int j = 0; j < model.mCount; j++) { for (int j = 0; j < model.mCount; j++) {
int index = level.meshOffsets[model.mStart + j]; int index = level.meshOffsets[model.mStart + j];
if (index == -1) if (!index && model.mStart + j > 0)
continue; continue;
TR::Mesh &mesh = level.meshes[index]; TR::Mesh &mesh = level.meshes[index];
iCount += (mesh.rCount * 6 + mesh.tCount * 3) * DOUBLE_SIDED; iCount += (mesh.rCount * 6 + mesh.tCount * 3) * DOUBLE_SIDED;
@@ -352,7 +352,7 @@ struct MeshBuilder {
#endif #endif
int index = level.meshOffsets[model.mStart + j]; int index = level.meshOffsets[model.mStart + j];
if (index == -1) if (!index && model.mStart + j > 0)
continue; continue;
TR::Mesh &mesh = level.meshes[index]; TR::Mesh &mesh = level.meshes[index];