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

#183 fix "Swimming Rats"

Browse Source
This commit is contained in:
XProger
2019-05-29 03:56:43 +03:00
parent f566fb4d39
commit 319449970c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/enemy.h
View File

@@ -1050,9 +1050,11 @@ struct Rat : Enemy {
modelLand = level->getModelIndex(TR::Entity::ENEMY_RAT_LAND) - 1; modelLand = level->getModelIndex(TR::Entity::ENEMY_RAT_LAND) - 1;
modelWater = level->getModelIndex(TR::Entity::ENEMY_RAT_WATER) - 1; modelWater = level->getModelIndex(TR::Entity::ENEMY_RAT_WATER) - 1;
} }
const virtual TR::Model* getModel() { const virtual TR::Model* getModel() {
bool water = getRoom().flags.water; bool water = getRoom().flags.water || modelWater == -1;
stand = water ? STAND_ONWATER : STAND_GROUND;
int modelIndex = water ? modelWater : modelLand; int modelIndex = water ? modelWater : modelLand;
if (modelIndex == -1) { if (modelIndex == -1) {
@@ -1065,7 +1067,6 @@ struct Rat : Enemy {
if (animation.model != model) { if (animation.model != model) {
targetBox = TR::NO_BOX; targetBox = TR::NO_BOX;
animation.setModel(model); animation.setModel(model);
stand = water ? STAND_ONWATER : STAND_GROUND;
int16 rIndex = getRoomIndex(); int16 rIndex = getRoomIndex();
if (water) { if (water) {
@@ -1075,7 +1076,6 @@ struct Rat : Enemy {
roomIndex = rIndex; roomIndex = rIndex;
} }
} else { } else {
int16 rIndex = getRoomIndex();
TR::Room::Sector *sector = level->getSector(rIndex, pos); TR::Room::Sector *sector = level->getSector(rIndex, pos);
if (sector) { if (sector) {
pos.y = float(sector->floor * 256); pos.y = float(sector->floor * 256);
@@ -1229,13 +1229,15 @@ struct Crocodile : Enemy {
modelLand = level->getModelIndex(TR::Entity::ENEMY_CROCODILE_LAND) - 1; modelLand = level->getModelIndex(TR::Entity::ENEMY_CROCODILE_LAND) - 1;
modelWater = level->getModelIndex(TR::Entity::ENEMY_CROCODILE_WATER) - 1; modelWater = level->getModelIndex(TR::Entity::ENEMY_CROCODILE_WATER) - 1;
bool water = getRoom().flags.water; bool water = getRoom().flags.water || modelWater == -1;
flying = water; flying = water;
stand = water ? STAND_UNDERWATER : STAND_GROUND; stand = water ? STAND_UNDERWATER : STAND_GROUND;
} }
const virtual TR::Model* getModel() { const virtual TR::Model* getModel() {
bool water = getRoom().flags.water; bool water = getRoom().flags.water || modelWater == -1;
stand = water ? STAND_UNDERWATER : STAND_GROUND;
int modelIndex = water ? modelWater : modelLand; int modelIndex = water ? modelWater : modelLand;
if (modelIndex == -1) { if (modelIndex == -1) {
@@ -1248,7 +1250,6 @@ struct Crocodile : Enemy {
if (animation.model != model) { if (animation.model != model) {
targetBox = TR::NO_BOX; targetBox = TR::NO_BOX;
animation.setModel(model); animation.setModel(model);
stand = water ? STAND_UNDERWATER : STAND_GROUND;
flying = water; flying = water;
int16 rIndex = getRoomIndex(); int16 rIndex = getRoomIndex();
@@ -1259,7 +1260,6 @@ struct Crocodile : Enemy {
roomIndex = rIndex; roomIndex = rIndex;
} }
} else { } else {
int16 rIndex = getRoomIndex();
TR::Room::Sector *sector = level->getSector(rIndex, pos); TR::Room::Sector *sector = level->getSector(rIndex, pos);
if (sector) { if (sector) {
pos.y = float(sector->floor * 256); pos.y = float(sector->floor * 256);