Skip to content

Fixed crocodile underwater death animation #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TokyoSU wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed crocodile underwater death animation #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ef1f8e
Fixed crocodile underwater death animation
TokyoSU Jan 26, 2024
f2ee52b
Removed error with creature->enemy
TokyoSU Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions TOMB4/game/box.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1321,26 +1321,27 @@ void CreatureFloat(short item_number)
item = &items[item_number];
item->hit_points = -16384;
item->pos.x_rot = 0;
water_level = GetWaterHeight(item->pos.x_pos, item->pos.y_pos, item->pos.z_pos, item->room_number);

if (item->pos.y_pos > water_level)
item->pos.y_pos -= 32;

if (item->pos.y_pos < water_level)
item->pos.y_pos = water_level;
int ypos = item->pos.y_pos - 16; // NOTE: Avoid the item position to be below the water so 'item->pos.y_pos <= water_level' won't trigger !
water_level = GetWaterHeight(item->pos.x_pos, ypos, item->pos.z_pos, item->room_number);
if (ypos > water_level)
ypos -= 16;
if (ypos < water_level)
ypos = water_level;

AnimateItem(item);
room_number = item->room_number;
item->floor = GetHeight(GetFloor(item->pos.x_pos, item->pos.y_pos, item->pos.z_pos, &room_number),
item->pos.x_pos, item->pos.y_pos, item->pos.z_pos);

item->floor = GetHeight(GetFloor(item->pos.x_pos, ypos, item->pos.z_pos, &room_number), item->pos.x_pos, ypos, item->pos.z_pos);
if (item->room_number != room_number)
ItemNewRoom(item_number, room_number);

if (item->pos.y_pos <= water_level && item->frame_number == anims[item->anim_number].frame_base)
item->pos.y_pos = ypos;
// NOTE: Changed 'item->frame_number == anims[item->anim_number].frame_base' to 'item->frame_number >= anims[item->anim_number].frame_end - 1' since
// death animation don't have only 1 frame (also '>= end-1' to avoid problem).
if (item->pos.y_pos <= water_level && item->frame_number >= anims[item->anim_number].frame_end - 1)
{
item->status = ITEM_DEACTIVATED;
item->collidable = 0;
item->collidable = FALSE;
item->pos.y_pos = water_level;
DisableBaddieAI(item_number);
RemoveActiveItem(item_number);
Expand Down
6 changes: 3 additions & 3 deletions TOMB4/game/croc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ void CrocControl(short item_number)

if (item->hit_points <= 0)
{
item->hit_points = 0;

if (item->current_anim_state != 7 && item->current_anim_state != 10)
{
if (room[item->room_number].flags & ROOM_UNDERWATER)
Expand All @@ -94,7 +92,6 @@ void CrocControl(short item_number)
item->frame_number = anims[item->anim_number].frame_base;
item->current_anim_state = 10;
item->goal_anim_state = 10;
item->hit_points = -16384;
}
else
{
Expand All @@ -106,7 +103,10 @@ void CrocControl(short item_number)
}

if (room[item->room_number].flags & ROOM_UNDERWATER)
{
CreatureFloat(item_number);
return;
}
}
else
{
Expand Down
4 changes: 0 additions & 4 deletions TOMB4/game/savegame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,10 +1006,6 @@ void RestoreLevelData(long FullSave)
{
ReadSG(creature, 22);
creature->enemy = (ITEM_INFO*)((long)creature->enemy + (long)malloc_buffer);

if (creature->enemy < 0)
creature->enemy = 0;

ReadSG(&creature->ai_target.object_number, sizeof(short));
ReadSG(&creature->ai_target.room_number, sizeof(short));
ReadSG(&creature->ai_target.box_number, sizeof(ushort));
Expand Down
8 changes: 4 additions & 4 deletions tomb4.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand Down