From f3dd71ccb1653d9d1d406ea22bfdd1a8aed7ea57 Mon Sep 17 00:00:00 2001
From: Aaron Kimbre <aronwk.aaron@gmail.com>
Date: Mon, 18 Apr 2022 21:02:04 -0500
Subject: [PATCH] cleanup logs, fix overrides, define LOTs in header

---
 dScripts/HydrantBroken.cpp        | 8 +++-----
 dScripts/HydrantSmashable.cpp     | 6 ++----
 dScripts/HydrantSmashable.h       | 6 ++++--
 dScripts/RockHydrantBroken.cpp    | 2 --
 dScripts/RockHydrantSmashable.cpp | 8 +++-----
 dScripts/RockHydrantSmashable.h   | 2 ++
 dScripts/WhFans.cpp               | 2 +-
 dScripts/WhFans.h                 | 6 +++---
 8 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/dScripts/HydrantBroken.cpp b/dScripts/HydrantBroken.cpp
index 93424325..2b620a21 100644
--- a/dScripts/HydrantBroken.cpp
+++ b/dScripts/HydrantBroken.cpp
@@ -2,7 +2,7 @@
 #include "EntityManager.h"
 #include "GameMessages.h"
 
-void HydrantBroken::OnStartup(Entity* self) 
+void HydrantBroken::OnStartup(Entity* self)
 {
     self->AddTimer("playEffect", 1);
 
@@ -10,8 +10,6 @@ void HydrantBroken::OnStartup(Entity* self)
 
     const auto bouncers = EntityManager::Instance()->GetEntitiesInGroup(hydrant);
 
-    Game::logger->Log("HydrantBroken", "Broken Hydrant spawned (%s)\n", hydrant.c_str());
-
     for (auto* bouncer : bouncers)
     {
         self->SetVar<LWOOBJID>(u"bouncer", bouncer->GetObjectID());
@@ -20,11 +18,11 @@ void HydrantBroken::OnStartup(Entity* self)
 
         GameMessages::SendNotifyObject(bouncer->GetObjectID(), self->GetObjectID(), u"enableCollision", UNASSIGNED_SYSTEM_ADDRESS);
     }
-    
+
     self->AddTimer("KillBroken", 25);
 }
 
-void HydrantBroken::OnTimerDone(Entity* self, std::string timerName) 
+void HydrantBroken::OnTimerDone(Entity* self, std::string timerName)
 {
     if (timerName == "KillBroken")
     {
diff --git a/dScripts/HydrantSmashable.cpp b/dScripts/HydrantSmashable.cpp
index e39f7a35..5cdf84c9 100644
--- a/dScripts/HydrantSmashable.cpp
+++ b/dScripts/HydrantSmashable.cpp
@@ -2,20 +2,18 @@
 #include "EntityManager.h"
 #include "GeneralUtils.h"
 
-void HydrantSmashable::OnDie(Entity* self, Entity* killer) 
+void HydrantSmashable::OnDie(Entity* self, Entity* killer)
 {
     const auto hydrantName = self->GetVar<std::u16string>(u"hydrant");
 
     LDFBaseData* data = new LDFData<std::string>(u"hydrant", GeneralUtils::UTF16ToWTF8(hydrantName));
 
     EntityInfo info {};
-    info.lot = 7328;
+    info.lot = HYDRANT_BROKEN;
     info.pos = self->GetPosition();
     info.rot = self->GetRotation();
     info.settings = {data};
     info.spawnerID = self->GetSpawnerID();
-    
-    Game::logger->Log("HydrantBroken", "Hydrant spawned (%s)\n", data->GetString().c_str());
 
     auto* hydrant = EntityManager::Instance()->CreateEntity(info);
 
diff --git a/dScripts/HydrantSmashable.h b/dScripts/HydrantSmashable.h
index c7e23073..90b0f3a6 100644
--- a/dScripts/HydrantSmashable.h
+++ b/dScripts/HydrantSmashable.h
@@ -1,8 +1,10 @@
 #pragma once
 #include "CppScripts.h"
 
-class HydrantSmashable : public CppScripts::Script 
+class HydrantSmashable : public CppScripts::Script
 {
 public:
-    void OnDie(Entity* self, Entity* killer) override;
+	void OnDie(Entity* self, Entity* killer) override;
+private:
+	LOT HYDRANT_BROKEN = 7328;
 };
\ No newline at end of file
diff --git a/dScripts/RockHydrantBroken.cpp b/dScripts/RockHydrantBroken.cpp
index 7895b00b..50e3c88d 100644
--- a/dScripts/RockHydrantBroken.cpp
+++ b/dScripts/RockHydrantBroken.cpp
@@ -10,8 +10,6 @@ void RockHydrantBroken::OnStartup(Entity* self)
 
 	const auto bouncers = EntityManager::Instance()->GetEntitiesInGroup(hydrant);
 
-	Game::logger->Log("RockHydrantBroken", "Broken Rock Hydrant spawned (%s)\n", hydrant.c_str());
-
 	for (auto* bouncer : bouncers)
 	{
 		self->SetVar<LWOOBJID>(u"bouncer", bouncer->GetObjectID());
diff --git a/dScripts/RockHydrantSmashable.cpp b/dScripts/RockHydrantSmashable.cpp
index 04b39c84..8d5b5861 100644
--- a/dScripts/RockHydrantSmashable.cpp
+++ b/dScripts/RockHydrantSmashable.cpp
@@ -9,15 +9,13 @@ void RockHydrantSmashable::OnDie(Entity* self, Entity* killer)
 	LDFBaseData* data = new LDFData<std::string>(u"hydrant", GeneralUtils::UTF16ToWTF8(hydrantName));
 
 	EntityInfo info {};
-	info.lot = 12293;
+	info.lot = ROCK_HYDRANT_BROKEN;
 	info.pos = self->GetPosition();
 	info.rot = self->GetRotation();
 	info.settings = {data};
 	info.spawnerID = self->GetSpawnerID();
 
-	Game::logger->Log("RockHydrantBroken", "Rock Hydrant spawned (%s)\n", data->GetString().c_str());
+	auto* hydrant = EntityManager::Instance()->CreateEntity(info);
 
-    auto* hydrant = EntityManager::Instance()->CreateEntity(info);
-
-    EntityManager::Instance()->ConstructEntity(hydrant);
+	EntityManager::Instance()->ConstructEntity(hydrant);
 }
diff --git a/dScripts/RockHydrantSmashable.h b/dScripts/RockHydrantSmashable.h
index 12c21fb0..0578cb2e 100644
--- a/dScripts/RockHydrantSmashable.h
+++ b/dScripts/RockHydrantSmashable.h
@@ -5,5 +5,7 @@ class RockHydrantSmashable : public CppScripts::Script
 {
 public:
 	void OnDie(Entity* self, Entity* killer);
+private:
+	LOT ROCK_HYDRANT_BROKEN = 12293;
 };
 
diff --git a/dScripts/WhFans.cpp b/dScripts/WhFans.cpp
index fc8fae0f..3a594a4c 100644
--- a/dScripts/WhFans.cpp
+++ b/dScripts/WhFans.cpp
@@ -66,4 +66,4 @@ void WhFans::OnDie(Entity* self, Entity* killer) {
 		ToggleFX(self, true);
 	}
 	self->SetVar<bool>(u"alive", false);
-}
\ No newline at end of file
+}
diff --git a/dScripts/WhFans.h b/dScripts/WhFans.h
index cac7236d..91aaa9d8 100644
--- a/dScripts/WhFans.h
+++ b/dScripts/WhFans.h
@@ -7,8 +7,8 @@
 class WhFans : public CppScripts::Script
 {
 public:
-	void OnStartup(Entity* self);
-	void OnDie(Entity* self, Entity* killer);
+	void OnStartup(Entity* self) override;
+	void OnDie(Entity* self, Entity* killer) override;
 	void OnFireEventServerSide(
 		Entity *self,
 		Entity *sender,
@@ -16,7 +16,7 @@ public:
 		int32_t param1,
 		int32_t param2,
 		int32_t param3
-	);
+	) override;
 private:
 	void ToggleFX(Entity* self, bool hit);
 };