Migrate some more definitions from Constants.h

diff --git a/Source/Constants.h b/Source/Constants.h
index 0d0987a87091b68e468af40f96af6700bee545ac..47c2304ca24494aafac760093f82d77bd71436d1 100644 (file)
--- a/Source/Constants.h
+++ b/Source/Constants.h
@@ -44,6 +44,4 @@ static const char *editortypenames[] = {
 
 const int max_dialogues = 20;
 const int max_dialoguelength = 20;
-
-const int maxplayers = 10;
 #endif

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index a4fa92e65be18f850bcb020e03de494d82df8b8e..9efac83e0465f2156470a4a047c5389194fc4a94 100644 (file)
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -100,8 +100,6 @@ bool musictoggle = 0;
 bool trilinear;
 Weapons weapons;
 bool damageeffects = 0;
-//apvector<Person> player(maxplayers);
-Person player[maxplayers];
 int numplayers = 0;
 bool ambientsound = 0;
 bool mousejump = 0;

diff --git a/Source/Person.cpp b/Source/Person.cpp
index 66d268ff75f592e4a3f4de9c509c09e4b120fc26..6e527fb1e9d0eccc0fb78b2204aead82d6ae5274 100644 (file)
--- a/Source/Person.cpp
+++ b/Source/Person.cpp
@@ -84,6 +84,8 @@ extern int indialogue;
 
 extern bool gamestarted;
 
+Person player[maxplayers];
+
 void Person::CheckKick()
 {
   if (!(hasvictim

diff --git a/Source/Person.h b/Source/Person.h
index b831b28448914a1184ded9576b5e56af8d0488cd..1eb92efe33d6e5a42e2f8db5b9b9a1384370a771 100644 (file)
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -430,5 +430,6 @@ struct Person
                void RagDoll(bool checkcollision);
 };
 
+const int maxplayers = 10;
 extern Person player[maxplayers];
 #endif