Breakout rest of the enums from dCommonVars and clean it up (#1061)

* Breakout rest of the enums from dcommonvars
so we don't have to deal with merge conflicts
ePlayerFlags is not a scoped enum, yet, due to it's complexity

* address feedback

* make player flag types consistent

* fix typo

dScripts/02_server/Map/GF/GfCaptainsCannon.cpp

@@ -2,6 +2,8 @@
 #include "GameMessages.h"
 #include "EntityManager.h"
 #include "MissionComponent.h"
+#include "eTerminateType.h"
+#include "eStateChangeType.h"
 
 void GfCaptainsCannon::OnUse(Entity* self, Entity* user) {
 	if (self->GetVar<bool>(u"bIsInUse")) {
@@ -78,6 +80,6 @@ void GfCaptainsCannon::OnTimerDone(Entity* self, std::string timerName) {
 			missionComponent->ForceProgress(601, 910, 1);
 		}
 
-		GameMessages::SendTerminateInteraction(playerId, FROM_INTERACTION, self->GetObjectID());
+		GameMessages::SendTerminateInteraction(playerId, eTerminateType::FROM_INTERACTION, self->GetObjectID());
 	}
 }

dScripts/02_server/Map/GF/GfTikiTorch.cpp

@@ -5,6 +5,7 @@
 #include "RenderComponent.h"
 #include "eMissionTaskType.h"
 #include "eReplicaComponentType.h"
+#include "eTerminateType.h"
 
 void GfTikiTorch::OnStartup(Entity* self) {
 	LightTorch(self);
@@ -33,7 +34,7 @@ void GfTikiTorch::OnTimerDone(Entity* self, std::string timerName) {
 		Entity* player = EntityManager::Instance()->GetEntity(self->GetI64(u"userID"));
 
 		if (player != nullptr && player->GetCharacter()) {
-			GameMessages::SendTerminateInteraction(player->GetObjectID(), FROM_INTERACTION, self->GetObjectID());
+			GameMessages::SendTerminateInteraction(player->GetObjectID(), eTerminateType::FROM_INTERACTION, self->GetObjectID());
 		}
 
 		self->SetBoolean(u"isInUse", false);

dScripts/02_server/Map/GF/MastTeleport.cpp

@@ -4,6 +4,7 @@
 #include "Preconditions.h"
 #include "eEndBehavior.h"
 #include "DestroyableComponent.h"
+#include "eStateChangeType.h"
 
 #ifdef _WIN32
 #define _USE_MATH_DEFINES