From 7619985ad7c28386b91f5a25341e32265abfd4d4 Mon Sep 17 00:00:00 2001 From: Turo Lamminen Date: Tue, 26 Jan 2021 14:31:20 +0200 Subject: [PATCH] Store gameEdit as idGameEditBase --- neo/d3xp/GameEdit.cpp | 4 ++-- neo/framework/Common.cpp | 2 +- neo/framework/Game.h | 4 ++-- neo/game/GameEdit.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/neo/d3xp/GameEdit.cpp b/neo/d3xp/GameEdit.cpp index 5d68b80f..822ccf72 100644 --- a/neo/d3xp/GameEdit.cpp +++ b/neo/d3xp/GameEdit.cpp @@ -670,8 +670,8 @@ void idEditEntities::DisplayEntities( void ) { =============================================================================== */ -idGameEditExt gameEditLocal; -idGameEdit * gameEdit = &gameEditLocal; +idGameEditExt gameEditLocal; +idGameEditBase * gameEdit = &gameEditLocal; /* diff --git a/neo/framework/Common.cpp b/neo/framework/Common.cpp index 7d98d780..d1133d99 100644 --- a/neo/framework/Common.cpp +++ b/neo/framework/Common.cpp @@ -126,7 +126,7 @@ unsigned int com_msgID = -1; #ifdef __DOOM_DLL__ idGame * game = NULL; -idGameEdit * gameEdit = NULL; +idGameEditBase * gameEdit = NULL; #endif // writes si_version to the config file - in a kinda obfuscated way diff --git a/neo/framework/Game.h b/neo/framework/Game.h index 044e75ee..44d30fa9 100644 --- a/neo/framework/Game.h +++ b/neo/framework/Game.h @@ -397,7 +397,7 @@ public: virtual void MapEntityTranslate( const char *name, const idVec3 &v ) const; }; -extern idGameEdit * gameEdit; +extern idGameEditBase * gameEdit; // In game script Debugging Support class idGameEditExt : public idGameEdit { @@ -467,7 +467,7 @@ typedef struct { int version; // API version idGame * game; // interface to run the game - idGameEdit * gameEdit; // interface for in-game editing + idGameEditBase * gameEdit; // interface for in-game editing } gameExport_t; diff --git a/neo/game/GameEdit.cpp b/neo/game/GameEdit.cpp index 57e7eb28..5e416ba5 100644 --- a/neo/game/GameEdit.cpp +++ b/neo/game/GameEdit.cpp @@ -670,8 +670,8 @@ void idEditEntities::DisplayEntities( void ) { =============================================================================== */ -idGameEditExt gameEditLocal; -idGameEdit * gameEdit = &gameEditLocal; +idGameEditExt gameEditLocal; +idGameEditBase * gameEdit = &gameEditLocal; /*