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

traps: rename LightningEmitter

Browse source
This commit is contained in:
rr- 2022-03-22 17:24:45 +01:00 • committed by Marcin Kurczewski
parent 574ff5a87d
commit df671dc144
3 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/setup.c
View file

@ -219,7 +219,7 @@ void TrapObjects(void)
SetupMovableBlock(&g_Objects[O_MOVABLE_BLOCK3]); SetupMovableBlock(&g_Objects[O_MOVABLE_BLOCK3]);
SetupMovableBlock(&g_Objects[O_MOVABLE_BLOCK4]); SetupMovableBlock(&g_Objects[O_MOVABLE_BLOCK4]);
SetupRollingBlock(&g_Objects[O_ROLLING_BLOCK]); SetupRollingBlock(&g_Objects[O_ROLLING_BLOCK]);
SetupLightningEmitter(&g_Objects[O_LIGHTNING_EMITTER]); LightningEmitter_Setup(&g_Objects[O_LIGHTNING_EMITTER]);
SetupThorsHandle(&g_Objects[O_THORS_HANDLE]); SetupThorsHandle(&g_Objects[O_THORS_HANDLE]);
SetupThorsHead(&g_Objects[O_THORS_HEAD]); SetupThorsHead(&g_Objects[O_THORS_HEAD]);
SetupMidasTouch(&g_Objects[O_MIDAS_TOUCH]); SetupMidasTouch(&g_Objects[O_MIDAS_TOUCH]);

19
src/game/traps/lightning_emitter.c
View file

@ -14,16 +14,16 @@
#include "global/vars.h" #include "global/vars.h"
#include "specific/s_misc.h" #include "specific/s_misc.h"
void SetupLightningEmitter(OBJECT_INFO *obj) void LightningEmitter_Setup(OBJECT_INFO *obj)
{ {
obj->initialise = InitialiseLightning; obj->initialise = LightningEmitter_Initialise;
obj->control = LightningControl; obj->control = LightningEmitter_Control;
obj->draw_routine = DrawLightning; obj->draw_routine = LightningEmitter_Draw;
obj->collision = LightningCollision; obj->collision = LightningEmitter_Collision;
obj->save_flags = 1; obj->save_flags = 1;
} }
void InitialiseLightning(int16_t item_num) void LightningEmitter_Initialise(int16_t item_num)
{ {
LIGHTNING *l = GameBuf_Alloc(sizeof(LIGHTNING), GBUF_TRAP_DATA); LIGHTNING *l = GameBuf_Alloc(sizeof(LIGHTNING), GBUF_TRAP_DATA);
g_Items[item_num].data = l; g_Items[item_num].data = l;
@ -40,7 +40,7 @@ void InitialiseLightning(int16_t item_num)
l->zapped = 0; l->zapped = 0;
} }
void LightningControl(int16_t item_num) void LightningEmitter_Control(int16_t item_num)
{ {
ITEM_INFO *item = &g_Items[item_num]; ITEM_INFO *item = &g_Items[item_num];
LIGHTNING *l = item->data; LIGHTNING *l = item->data;
@ -129,7 +129,8 @@ void LightningControl(int16_t item_num)
Sound_Effect(SFX_THUNDER, &item->pos, SPM_NORMAL); Sound_Effect(SFX_THUNDER, &item->pos, SPM_NORMAL);
} }
void LightningCollision(int16_t item_num, ITEM_INFO *lara_item, COLL_INFO *coll) void LightningEmitter_Collision(
int16_t item_num, ITEM_INFO *lara_item, COLL_INFO *coll)
{ {
LIGHTNING *l = g_Items[item_num].data; LIGHTNING *l = g_Items[item_num].data;
if (!l->zapped) { if (!l->zapped) {
@ -143,7 +144,7 @@ void LightningCollision(int16_t item_num, ITEM_INFO *lara_item, COLL_INFO *coll)
} }
} }
void DrawLightning(ITEM_INFO *item) void LightningEmitter_Draw(ITEM_INFO *item)
{ {
int16_t *frmptr[2]; int16_t *frmptr[2];
int32_t rate; int32_t rate;

10
src/game/traps/lightning_emitter.h
View file

@ -19,9 +19,9 @@ typedef struct {
PHD_VECTOR shoot[LIGHTNING_SHOOTS][LIGHTNING_STEPS]; PHD_VECTOR shoot[LIGHTNING_SHOOTS][LIGHTNING_STEPS];
} LIGHTNING; } LIGHTNING;
void SetupLightningEmitter(OBJECT_INFO *obj); void LightningEmitter_Setup(OBJECT_INFO *obj);
void InitialiseLightning(int16_t item_num); void LightningEmitter_Initialise(int16_t item_num);
void LightningControl(int16_t item_num); void LightningEmitter_Control(int16_t item_num);
void LightningCollision( void LightningEmitter_Collision(
int16_t item_num, ITEM_INFO *lara_item, COLL_INFO *coll); int16_t item_num, ITEM_INFO *lara_item, COLL_INFO *coll);
void DrawLightning(ITEM_INFO *item); void LightningEmitter_Draw(ITEM_INFO *item);