libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-02 17:03:13 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

HDB: Fix LIGHTBARREL in Slime & moving floats

Browse Source
This commit is contained in:
Nipun Garg 2019-07-22 00:19:58 +05:30 committed by Eugene Sandulenko
parent d4f927f338
commit 7d4c665176
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/hdb/ai-funcs.cpp
View File

@ -1197,6 +1197,7 @@ void AI::animateEntity(AIEntity *e) {
addAnimateTarget(e->x, e->y, 0, 3, ANIM_NORMAL, false, false, GROUP_STEAM_PUFF_SIT);
removeEntity(e);
g_hdb->_sound->playSound(SND_BARREL_MELTING);
return;
}
}
} else if ((flags & kFlagLightMelt) && e->type == AI_LIGHTBARREL) {
@ -1237,11 +1238,12 @@ void AI::animateEntity(AIEntity *e) {
return;
} else {
// Make it float and splash in water
e->state = STATE_FLOATING;
addAnimateTarget(e->x, e->y, 0, 3, ANIM_NORMAL, false, false, GROUP_WATER_SPLASH_SIT);
floatEntity(e, STATE_FLOATING);
g_hdb->_sound->playSound(SND_SPLASH);
return;
}
}
// If it is floating downstream, keep moving it
if (flags & (kFlagPushRight | kFlagPushLeft | kFlagPushUp | kFlagPushDown)) {
@ -1306,7 +1308,6 @@ void AI::animateEntity(AIEntity *e) {
e->moveSpeed = kPushMoveSpeed >> 1;
setEntityGoal(e, e->tileX + xv, e->tileY + yv);
e->state = state;
}
}
}
} else if (((flags = g_hdb->_map->getMapBGTileFlags(e->tileX, e->tileY)) & kFlagWater) && (e->type == AI_MAGIC_EGG || e->type == AI_ICE_BLOCK)) {