Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-04-30 21:58:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

effects: rename Splash_Spawn

Browse source
This commit is contained in:
rr- 2022-03-24 15:40:16 +01:00 • committed by Marcin Kurczewski
parent 9653290177
commit be0bf93b6b
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/laramisc.c
View file

@ -108,7 +108,7 @@ void LaraControl(int16_t item_num)
g_Lara.head_y_rot = 0; g_Lara.head_y_rot = 0;
g_Lara.torso_x_rot = 0; g_Lara.torso_x_rot = 0;
g_Lara.torso_y_rot = 0; g_Lara.torso_y_rot = 0;
Splash(item); Splash_Spawn(item);
} else if (g_Lara.water_status == LWS_UNDERWATER && !room_submerged) { } else if (g_Lara.water_status == LWS_UNDERWATER && !room_submerged) {
int16_t wh = GetWaterHeight( int16_t wh = GetWaterHeight(
item->pos.x, item->pos.y, item->pos.z, item->room_number); item->pos.x, item->pos.y, item->pos.z, item->room_number);

2
src/game/objects/effects/splash.c
View file

@ -25,7 +25,7 @@ void Splash_Control(int16_t fx_num)
fx->pos.x += (phd_sin(fx->pos.y_rot) * fx->speed) >> W2V_SHIFT; fx->pos.x += (phd_sin(fx->pos.y_rot) * fx->speed) >> W2V_SHIFT;
} }
void Splash(ITEM_INFO *item) void Splash_Spawn(ITEM_INFO *item)
{ {
int16_t wh = GetWaterHeight( int16_t wh = GetWaterHeight(
item->pos.x, item->pos.y, item->pos.z, item->room_number); item->pos.x, item->pos.y, item->pos.z, item->room_number);

5
src/game/objects/effects/splash.h
View file

@ -2,9 +2,6 @@
#include "global/types.h" #include "global/types.h"
#include <stdint.h>
void Splash_Setup(OBJECT_INFO *obj); void Splash_Setup(OBJECT_INFO *obj);
void Splash_Control(int16_t fx_num); void Splash_Control(int16_t fx_num);
void Splash_Spawn(ITEM_INFO *item);
void Splash(ITEM_INFO *item);