From 65db961d42f06e061df7a16aa9fcbd6bbc6ecbf1 Mon Sep 17 00:00:00 2001 From: Alexander Monakov Date: Mon, 3 Jan 2011 23:38:51 +0300 Subject: [PATCH] Migrate some more definitions from Constants.h --- Source/Constants.h | 2 -- Source/Globals.cpp | 2 -- Source/Person.cpp | 2 ++ Source/Person.h | 1 + 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Constants.h b/Source/Constants.h index 0d0987a..47c2304 100644 --- 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 a4fa92e..9efac83 100644 --- a/Source/Globals.cpp +++ b/Source/Globals.cpp @@ -100,8 +100,6 @@ bool musictoggle = 0; bool trilinear; Weapons weapons; bool damageeffects = 0; -//apvector 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 66d268f..6e527fb 100644 --- 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 b831b28..1eb92ef 100644 --- 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 -- 2.39.2