From 72e3c0144916457bd93cf0aa5bc3c9b150fac7c7 Mon Sep 17 00:00:00 2001
From: nashmuhandes <nashbackslash@gmail.com>
Date: Mon, 20 Nov 2023 01:25:45 +0800
Subject: [PATCH] Revert Fogball to a scripted class

---
 src/CMakeLists.txt                            |  1 -
 src/playsim/a_fogball.cpp                     | 30 -----------------
 src/playsim/a_fogball.h                       | 32 -------------------
 src/rendering/hwrenderer/scene/hw_sprites.cpp |  1 -
 .../static/zscript/actors/shared/fogball.zs   |  2 +-
 5 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 src/playsim/a_fogball.cpp
 delete mode 100644 src/playsim/a_fogball.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b51c575d6..c9835df23 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -861,7 +861,6 @@ set (PCH_SOURCES
 	playsim/mapthinkers/dsectoreffect.cpp
 	playsim/a_pickups.cpp
 	playsim/a_action.cpp
-	playsim/a_fogball.cpp
 	playsim/a_decals.cpp
 	playsim/a_dynlight.cpp
 	playsim/a_flashfader.cpp
diff --git a/src/playsim/a_fogball.cpp b/src/playsim/a_fogball.cpp
deleted file mode 100644
index 838d80e7f..000000000
--- a/src/playsim/a_fogball.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-**  Volumetric fog spheres AKA fogballs
-**  Copyright (c) 2023 Nash Muhandes, Magnus Norddahl
-**
-**  This software is provided 'as-is', without any express or implied
-**  warranty.  In no event will the authors be held liable for any damages
-**  arising from the use of this software.
-**
-**  Permission is granted to anyone to use this software for any purpose,
-**  including commercial applications, and to alter it and redistribute it
-**  freely, subject to the following restrictions:
-**
-**  1. The origin of this software must not be misrepresented; you must not
-**     claim that you wrote the original software. If you use this software
-**     in a product, an acknowledgment in the product documentation would be
-**     appreciated but is not required.
-**  2. Altered source versions must be plainly marked as such, and must not be
-**     misrepresented as being the original software.
-**  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include "actor.h"
-#include "a_fogball.h"
-
-IMPLEMENT_CLASS(AFogball, false, false)
-
-void AFogball::Tick()
-{
-	Super::Tick();
-}
diff --git a/src/playsim/a_fogball.h b/src/playsim/a_fogball.h
deleted file mode 100644
index 7340f08c6..000000000
--- a/src/playsim/a_fogball.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-**  Volumetric fog spheres AKA fogballs
-**  Copyright (c) 2023 Nash Muhandes, Magnus Norddahl
-**
-**  This software is provided 'as-is', without any express or implied
-**  warranty.  In no event will the authors be held liable for any damages
-**  arising from the use of this software.
-**
-**  Permission is granted to anyone to use this software for any purpose,
-**  including commercial applications, and to alter it and redistribute it
-**  freely, subject to the following restrictions:
-**
-**  1. The origin of this software must not be misrepresented; you must not
-**     claim that you wrote the original software. If you use this software
-**     in a product, an acknowledgment in the product documentation would be
-**     appreciated but is not required.
-**  2. Altered source versions must be plainly marked as such, and must not be
-**     misrepresented as being the original software.
-**  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#pragma once
-
-#include "actor.h"
-
-class AFogball : public AActor
-{
-	DECLARE_CLASS(AFogball, AActor)
-
-public:
-	void Tick();
-};
diff --git a/src/rendering/hwrenderer/scene/hw_sprites.cpp b/src/rendering/hwrenderer/scene/hw_sprites.cpp
index a7d979f7b..0c24e5694 100644
--- a/src/rendering/hwrenderer/scene/hw_sprites.cpp
+++ b/src/rendering/hwrenderer/scene/hw_sprites.cpp
@@ -33,7 +33,6 @@
 #include "r_sky.h"
 #include "r_utility.h"
 #include "a_pickups.h"
-#include "a_fogball.h"
 #include "d_player.h"
 #include "g_levellocals.h"
 #include "events.h"
diff --git a/wadsrc/static/zscript/actors/shared/fogball.zs b/wadsrc/static/zscript/actors/shared/fogball.zs
index afe4b62d5..9468df7c7 100644
--- a/wadsrc/static/zscript/actors/shared/fogball.zs
+++ b/wadsrc/static/zscript/actors/shared/fogball.zs
@@ -1,4 +1,4 @@
-class Fogball : Actor native
+class Fogball : Actor
 {
 	Default
 	{