From df671dc1441323f08d97debd94c285e75585b0cc Mon Sep 17 00:00:00 2001
From: rr- <dash@wind.garden>
Date: Tue, 22 Mar 2022 17:24:45 +0100
Subject: [PATCH] traps: rename LightningEmitter

---
 src/game/setup.c                   |  2 +-
 src/game/traps/lightning_emitter.c | 19 ++++++++++---------
 src/game/traps/lightning_emitter.h | 10 +++++-----
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/game/setup.c b/src/game/setup.c
index fb30872cf..aa60c4180 100644
--- a/src/game/setup.c
+++ b/src/game/setup.c
@@ -219,7 +219,7 @@ void TrapObjects(void)
     SetupMovableBlock(&g_Objects[O_MOVABLE_BLOCK3]);
     SetupMovableBlock(&g_Objects[O_MOVABLE_BLOCK4]);
     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]);
     SetupThorsHead(&g_Objects[O_THORS_HEAD]);
     SetupMidasTouch(&g_Objects[O_MIDAS_TOUCH]);
diff --git a/src/game/traps/lightning_emitter.c b/src/game/traps/lightning_emitter.c
index 73d3cf445..07dc7a8c3 100644
--- a/src/game/traps/lightning_emitter.c
+++ b/src/game/traps/lightning_emitter.c
@@ -14,16 +14,16 @@
 #include "global/vars.h"
 #include "specific/s_misc.h"
 
-void SetupLightningEmitter(OBJECT_INFO *obj)
+void LightningEmitter_Setup(OBJECT_INFO *obj)
 {
-    obj->initialise = InitialiseLightning;
-    obj->control = LightningControl;
-    obj->draw_routine = DrawLightning;
-    obj->collision = LightningCollision;
+    obj->initialise = LightningEmitter_Initialise;
+    obj->control = LightningEmitter_Control;
+    obj->draw_routine = LightningEmitter_Draw;
+    obj->collision = LightningEmitter_Collision;
     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);
     g_Items[item_num].data = l;
@@ -40,7 +40,7 @@ void InitialiseLightning(int16_t item_num)
     l->zapped = 0;
 }
 
-void LightningControl(int16_t item_num)
+void LightningEmitter_Control(int16_t item_num)
 {
     ITEM_INFO *item = &g_Items[item_num];
     LIGHTNING *l = item->data;
@@ -129,7 +129,8 @@ void LightningControl(int16_t item_num)
     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;
     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];
     int32_t rate;
diff --git a/src/game/traps/lightning_emitter.h b/src/game/traps/lightning_emitter.h
index d72430734..dc74a0137 100644
--- a/src/game/traps/lightning_emitter.h
+++ b/src/game/traps/lightning_emitter.h
@@ -19,9 +19,9 @@ typedef struct {
     PHD_VECTOR shoot[LIGHTNING_SHOOTS][LIGHTNING_STEPS];
 } LIGHTNING;
 
-void SetupLightningEmitter(OBJECT_INFO *obj);
-void InitialiseLightning(int16_t item_num);
-void LightningControl(int16_t item_num);
-void LightningCollision(
+void LightningEmitter_Setup(OBJECT_INFO *obj);
+void LightningEmitter_Initialise(int16_t item_num);
+void LightningEmitter_Control(int16_t item_num);
+void LightningEmitter_Collision(
     int16_t item_num, ITEM_INFO *lara_item, COLL_INFO *coll);
-void DrawLightning(ITEM_INFO *item);
+void LightningEmitter_Draw(ITEM_INFO *item);