From 9c3189475a8cd64663d9d1a2c7c31478c31e0701 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 10 May 2020 09:28:13 +0200
Subject: [PATCH] - renamed unprocessed files and added missing WT firefly
 effect.

---
 source/games/duke/CMakeLists.txt              | 54 +++++++++----------
 source/games/duke/src/actors.h                | 37 +++++++------
 source/games/duke/src/actors_d.cpp            | 48 +++++++++++++++++
 source/games/duke/src/sectors_cpp             | 36 +++++++++++++
 .../duke/src/{e_actors.cpp => zz_actors.cpp}  |  0
 .../games/duke/src/{anim.cpp => zz_anim.cpp}  |  0
 .../duke/src/{cheats.cpp => zz_cheats.cpp}    |  0
 .../duke/src/{cmdline.cpp => zz_cmdline.cpp}  |  0
 .../duke/src/{common.cpp => zz_common.cpp}    |  0
 .../duke/src/{config.cpp => zz_config.cpp}    |  0
 .../duke/src/{d_menu.cpp => zz_d_menu.cpp}    |  0
 .../games/duke/src/{demo.cpp => zz_demo.cpp}  |  0
 .../games/duke/src/{game.cpp => zz_game.cpp}  |  0
 .../duke/src/{gamedef.cpp => zz_gamedef.cpp}  |  0
 .../src/{gameexec.cpp => zz_gameexec.cpp}     |  0
 .../src/{gamevars.cpp => zz_gamevars.cpp}     |  0
 .../duke/src/{global.cpp => zz_global.cpp}    |  0
 .../{interpolate.cpp => zz_interpolate.cpp}   |  0
 .../src/{namesdyn.cpp => zz_namesdyn.cpp}     |  0
 source/games/duke/src/{net.cpp => zz_net.cpp} |  0
 .../duke/src/{osdcmds.cpp => zz_osdcmds.cpp}  |  0
 .../duke/src/{player.cpp => zz_player.cpp}    |  0
 .../duke/src/{premap.cpp => zz_premap.cpp}    |  0
 .../games/duke/src/{rrdh.cpp => zz_rrdh.cpp}  |  0
 .../src/{savegame.cpp => zz_savegame.cpp}     |  0
 .../games/duke/src/{sbar.cpp => zz_sbar.cpp}  |  0
 .../duke/src/{screens.cpp => zz_screens.cpp}  |  0
 .../duke/src/{sector.cpp => zz_sector.cpp}    |  0
 .../duke/src/{sounds.cpp => zz_sounds.cpp}    |  0
 .../src/{soundsdyn.cpp => zz_soundsdyn.cpp}   |  0
 .../games/duke/src/{text.cpp => zz_text.cpp}  |  0
 31 files changed, 131 insertions(+), 44 deletions(-)
 create mode 100644 source/games/duke/src/sectors_cpp
 rename source/games/duke/src/{e_actors.cpp => zz_actors.cpp} (100%)
 rename source/games/duke/src/{anim.cpp => zz_anim.cpp} (100%)
 rename source/games/duke/src/{cheats.cpp => zz_cheats.cpp} (100%)
 rename source/games/duke/src/{cmdline.cpp => zz_cmdline.cpp} (100%)
 rename source/games/duke/src/{common.cpp => zz_common.cpp} (100%)
 rename source/games/duke/src/{config.cpp => zz_config.cpp} (100%)
 rename source/games/duke/src/{d_menu.cpp => zz_d_menu.cpp} (100%)
 rename source/games/duke/src/{demo.cpp => zz_demo.cpp} (100%)
 rename source/games/duke/src/{game.cpp => zz_game.cpp} (100%)
 rename source/games/duke/src/{gamedef.cpp => zz_gamedef.cpp} (100%)
 rename source/games/duke/src/{gameexec.cpp => zz_gameexec.cpp} (100%)
 rename source/games/duke/src/{gamevars.cpp => zz_gamevars.cpp} (100%)
 rename source/games/duke/src/{global.cpp => zz_global.cpp} (100%)
 rename source/games/duke/src/{interpolate.cpp => zz_interpolate.cpp} (100%)
 rename source/games/duke/src/{namesdyn.cpp => zz_namesdyn.cpp} (100%)
 rename source/games/duke/src/{net.cpp => zz_net.cpp} (100%)
 rename source/games/duke/src/{osdcmds.cpp => zz_osdcmds.cpp} (100%)
 rename source/games/duke/src/{player.cpp => zz_player.cpp} (100%)
 rename source/games/duke/src/{premap.cpp => zz_premap.cpp} (100%)
 rename source/games/duke/src/{rrdh.cpp => zz_rrdh.cpp} (100%)
 rename source/games/duke/src/{savegame.cpp => zz_savegame.cpp} (100%)
 rename source/games/duke/src/{sbar.cpp => zz_sbar.cpp} (100%)
 rename source/games/duke/src/{screens.cpp => zz_screens.cpp} (100%)
 rename source/games/duke/src/{sector.cpp => zz_sector.cpp} (100%)
 rename source/games/duke/src/{sounds.cpp => zz_sounds.cpp} (100%)
 rename source/games/duke/src/{soundsdyn.cpp => zz_soundsdyn.cpp} (100%)
 rename source/games/duke/src/{text.cpp => zz_text.cpp} (100%)

diff --git a/source/games/duke/CMakeLists.txt b/source/games/duke/CMakeLists.txt
index 44e4e8c98..3ab1f8a8c 100644
--- a/source/games/duke/CMakeLists.txt
+++ b/source/games/duke/CMakeLists.txt
@@ -5,32 +5,32 @@ set( PCH_SOURCES
 	src/actors_d.cpp
 	src/actors_lava.cpp
 	src/bowling.cpp
-	src/e_actors.cpp
-	src/anim.cpp
-	src/cheats.cpp
-	src/cmdline.cpp
-	src/common.cpp
-	src/config.cpp
-	src/d_menu.cpp
-	src/demo.cpp
-	src/game.cpp
-	src/gamedef.cpp
-	src/gameexec.cpp
-	src/gamevars.cpp
-	src/global.cpp
-	src/interpolate.cpp
-	src/namesdyn.cpp
-	src/net.cpp
-	src/osdcmds.cpp
-	src/player.cpp
-	src/premap.cpp
-	src/savegame.cpp
-	src/sbar.cpp
-	src/screens.cpp
-	src/text.cpp
-	src/sector.cpp
-	src/sounds.cpp
-	src/soundsdyn.cpp
-	src/rrdh.cpp)
+	src/zz_actors.cpp
+	src/zz_anim.cpp
+	src/zz_cheats.cpp
+	src/zz_cmdline.cpp
+	src/zz_common.cpp
+	src/zz_config.cpp
+	src/zz_d_menu.cpp
+	src/zz_demo.cpp
+	src/zz_game.cpp
+	src/zz_gamedef.cpp
+	src/zz_gameexec.cpp
+	src/zz_gamevars.cpp
+	src/zz_global.cpp
+	src/zz_interpolate.cpp
+	src/zz_namesdyn.cpp
+	src/zz_net.cpp
+	src/zz_osdcmds.cpp
+	src/zz_player.cpp
+	src/zz_premap.cpp
+	src/zz_savegame.cpp
+	src/zz_sbar.cpp
+	src/zz_screens.cpp
+	src/zz_text.cpp
+	src/zz_sector.cpp
+	src/zz_sounds.cpp
+	src/zz_soundsdyn.cpp
+	src/zz_rrdh.cpp)
 
 add_game_library2( duke )
diff --git a/source/games/duke/src/actors.h b/source/games/duke/src/actors.h
index d1c851f5e..68e29968c 100644
--- a/source/games/duke/src/actors.h
+++ b/source/games/duke/src/actors.h
@@ -42,23 +42,26 @@ BEGIN_DUKE_NS
 #define ACTOR_ONWATER_ADDZ (24<<8)
 
 // KEEPINSYNC lunatic/con_lang.lua
-#define STAT_DEFAULT        0
-#define STAT_ACTOR          1
-#define STAT_ZOMBIEACTOR    2
-#define STAT_EFFECTOR       3
-#define STAT_PROJECTILE     4
-#define STAT_MISC           5
-#define STAT_STANDABLE      6
-#define STAT_LOCATOR        7
-#define STAT_ACTIVATOR      8
-#define STAT_TRANSPORT      9
-#define STAT_PLAYER         10
-#define STAT_FX             11
-#define STAT_FALLER         12
-#define STAT_DUMMYPLAYER    13
-#define STAT_LIGHT          14
-#define STAT_RAROR          15
-#define STAT_NETALLOC       MAXSTATUS-1
+enum
+{
+	STAT_DEFAULT        = 0,
+	STAT_ACTOR          = 1,
+	STAT_ZOMBIEACTOR    = 2,
+	STAT_EFFECTOR       = 3,
+	STAT_PROJECTILE     = 4,
+	STAT_MISC           = 5,
+	STAT_STANDABLE      = 6,
+	STAT_LOCATOR        = 7,
+	STAT_ACTIVATOR      = 8,
+	STAT_TRANSPORT      = 9,
+	STAT_PLAYER         = 10,
+	STAT_FX             = 11,
+	STAT_FALLER         = 12,
+	STAT_DUMMYPLAYER    = 13,
+	STAT_LIGHT          = 14,
+	STAT_RAROR          = 15,
+	STAT_NETALLOC       = MAXSTATUS-1
+};
 
 
 // Defines the motion characteristics of an actor
diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp
index e16862bab..e6c20807e 100644
--- a/source/games/duke/src/actors_d.cpp
+++ b/source/games/duke/src/actors_d.cpp
@@ -3160,6 +3160,50 @@ void moveactors_d(void)
 //
 //---------------------------------------------------------------------------
 
+static void fireflyflyingeffect(int i)
+{
+	spritetype* s = &sprite[i];
+	auto t = &hittype[i].temp_data[0];
+	int x, p = findplayer(s, &x);
+	execute(i, p, x);
+
+	auto owner = &sprite[s->owner];
+	if (owner->picnum != FIREFLY) 
+	{
+		deletesprite(i);
+		return;
+	}
+
+	if (owner->xrepeat >= 24 || owner->pal == 1)
+		s->cstat |= 0x8000;
+	else
+		s->cstat &= ~0x8000;
+
+	double dx = owner->x - sprite[ps[p].i].x;
+	double dy = owner->y - sprite[ps[p].i].y;
+	double dist = sqrt(dx * dx + dy * dy);
+	if (dist != 0.0) 
+	{
+		dx /= dist;
+		dy /= dist;
+	}
+
+	s->x = (int) (owner->x - (dx * -10.0));
+	s->y = (int) (owner->y - (dy * -10.0));
+	s->z = owner->z + 2048;
+
+	if (owner->extra <= 0) 
+	{
+		deletesprite(i);
+	}
+
+}
+//---------------------------------------------------------------------------
+//
+// 
+//
+//---------------------------------------------------------------------------
+
 void moveexplosions_d(void)  // STATNUM 5
 {
 	int nexti, sect, p;
@@ -3187,6 +3231,10 @@ void moveexplosions_d(void)  // STATNUM 5
 
 		switch (s->picnum)
 		{
+		case FIREFLYFLYINGEFFECT:
+			if (isWorldTour()) fireflyflyingeffect(i);
+			continue;
+			
 		case NEON1:
 		case NEON2:
 		case NEON3:
diff --git a/source/games/duke/src/sectors_cpp b/source/games/duke/src/sectors_cpp
new file mode 100644
index 000000000..f96adccbe
--- /dev/null
+++ b/source/games/duke/src/sectors_cpp
@@ -0,0 +1,36 @@
+//-------------------------------------------------------------------------
+/*
+Copyright (C) 1996, 2003 - 3D Realms Entertainment
+Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
+
+This file is part of Enhanced Duke Nukem 3D version 1.5 - Atomic Edition
+
+Duke Nukem 3D is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+Original Source: 1996 - Todd Replogle
+Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
+
+EDuke enhancements integrated: 04/13/2003 - Matt Saettler
+
+Note: EDuke source was in transition.  Changes are in-progress in the
+source as it is released.
+
+*/
+//-------------------------------------------------------------------------
+
+#include "duke3d.h"
+
+// PRIMITIVE
diff --git a/source/games/duke/src/e_actors.cpp b/source/games/duke/src/zz_actors.cpp
similarity index 100%
rename from source/games/duke/src/e_actors.cpp
rename to source/games/duke/src/zz_actors.cpp
diff --git a/source/games/duke/src/anim.cpp b/source/games/duke/src/zz_anim.cpp
similarity index 100%
rename from source/games/duke/src/anim.cpp
rename to source/games/duke/src/zz_anim.cpp
diff --git a/source/games/duke/src/cheats.cpp b/source/games/duke/src/zz_cheats.cpp
similarity index 100%
rename from source/games/duke/src/cheats.cpp
rename to source/games/duke/src/zz_cheats.cpp
diff --git a/source/games/duke/src/cmdline.cpp b/source/games/duke/src/zz_cmdline.cpp
similarity index 100%
rename from source/games/duke/src/cmdline.cpp
rename to source/games/duke/src/zz_cmdline.cpp
diff --git a/source/games/duke/src/common.cpp b/source/games/duke/src/zz_common.cpp
similarity index 100%
rename from source/games/duke/src/common.cpp
rename to source/games/duke/src/zz_common.cpp
diff --git a/source/games/duke/src/config.cpp b/source/games/duke/src/zz_config.cpp
similarity index 100%
rename from source/games/duke/src/config.cpp
rename to source/games/duke/src/zz_config.cpp
diff --git a/source/games/duke/src/d_menu.cpp b/source/games/duke/src/zz_d_menu.cpp
similarity index 100%
rename from source/games/duke/src/d_menu.cpp
rename to source/games/duke/src/zz_d_menu.cpp
diff --git a/source/games/duke/src/demo.cpp b/source/games/duke/src/zz_demo.cpp
similarity index 100%
rename from source/games/duke/src/demo.cpp
rename to source/games/duke/src/zz_demo.cpp
diff --git a/source/games/duke/src/game.cpp b/source/games/duke/src/zz_game.cpp
similarity index 100%
rename from source/games/duke/src/game.cpp
rename to source/games/duke/src/zz_game.cpp
diff --git a/source/games/duke/src/gamedef.cpp b/source/games/duke/src/zz_gamedef.cpp
similarity index 100%
rename from source/games/duke/src/gamedef.cpp
rename to source/games/duke/src/zz_gamedef.cpp
diff --git a/source/games/duke/src/gameexec.cpp b/source/games/duke/src/zz_gameexec.cpp
similarity index 100%
rename from source/games/duke/src/gameexec.cpp
rename to source/games/duke/src/zz_gameexec.cpp
diff --git a/source/games/duke/src/gamevars.cpp b/source/games/duke/src/zz_gamevars.cpp
similarity index 100%
rename from source/games/duke/src/gamevars.cpp
rename to source/games/duke/src/zz_gamevars.cpp
diff --git a/source/games/duke/src/global.cpp b/source/games/duke/src/zz_global.cpp
similarity index 100%
rename from source/games/duke/src/global.cpp
rename to source/games/duke/src/zz_global.cpp
diff --git a/source/games/duke/src/interpolate.cpp b/source/games/duke/src/zz_interpolate.cpp
similarity index 100%
rename from source/games/duke/src/interpolate.cpp
rename to source/games/duke/src/zz_interpolate.cpp
diff --git a/source/games/duke/src/namesdyn.cpp b/source/games/duke/src/zz_namesdyn.cpp
similarity index 100%
rename from source/games/duke/src/namesdyn.cpp
rename to source/games/duke/src/zz_namesdyn.cpp
diff --git a/source/games/duke/src/net.cpp b/source/games/duke/src/zz_net.cpp
similarity index 100%
rename from source/games/duke/src/net.cpp
rename to source/games/duke/src/zz_net.cpp
diff --git a/source/games/duke/src/osdcmds.cpp b/source/games/duke/src/zz_osdcmds.cpp
similarity index 100%
rename from source/games/duke/src/osdcmds.cpp
rename to source/games/duke/src/zz_osdcmds.cpp
diff --git a/source/games/duke/src/player.cpp b/source/games/duke/src/zz_player.cpp
similarity index 100%
rename from source/games/duke/src/player.cpp
rename to source/games/duke/src/zz_player.cpp
diff --git a/source/games/duke/src/premap.cpp b/source/games/duke/src/zz_premap.cpp
similarity index 100%
rename from source/games/duke/src/premap.cpp
rename to source/games/duke/src/zz_premap.cpp
diff --git a/source/games/duke/src/rrdh.cpp b/source/games/duke/src/zz_rrdh.cpp
similarity index 100%
rename from source/games/duke/src/rrdh.cpp
rename to source/games/duke/src/zz_rrdh.cpp
diff --git a/source/games/duke/src/savegame.cpp b/source/games/duke/src/zz_savegame.cpp
similarity index 100%
rename from source/games/duke/src/savegame.cpp
rename to source/games/duke/src/zz_savegame.cpp
diff --git a/source/games/duke/src/sbar.cpp b/source/games/duke/src/zz_sbar.cpp
similarity index 100%
rename from source/games/duke/src/sbar.cpp
rename to source/games/duke/src/zz_sbar.cpp
diff --git a/source/games/duke/src/screens.cpp b/source/games/duke/src/zz_screens.cpp
similarity index 100%
rename from source/games/duke/src/screens.cpp
rename to source/games/duke/src/zz_screens.cpp
diff --git a/source/games/duke/src/sector.cpp b/source/games/duke/src/zz_sector.cpp
similarity index 100%
rename from source/games/duke/src/sector.cpp
rename to source/games/duke/src/zz_sector.cpp
diff --git a/source/games/duke/src/sounds.cpp b/source/games/duke/src/zz_sounds.cpp
similarity index 100%
rename from source/games/duke/src/sounds.cpp
rename to source/games/duke/src/zz_sounds.cpp
diff --git a/source/games/duke/src/soundsdyn.cpp b/source/games/duke/src/zz_soundsdyn.cpp
similarity index 100%
rename from source/games/duke/src/soundsdyn.cpp
rename to source/games/duke/src/zz_soundsdyn.cpp
diff --git a/source/games/duke/src/text.cpp b/source/games/duke/src/zz_text.cpp
similarity index 100%
rename from source/games/duke/src/text.cpp
rename to source/games/duke/src/zz_text.cpp