From 4692ec6888b3a2eb166fd1693cb583d2c53e346c Mon Sep 17 00:00:00 2001 From: Alexander Monakov Date: Mon, 7 Jun 2010 01:15:27 +0400 Subject: [PATCH] Move declaration of animation array into Animation.h --- Source/Animation.h | 1 + Source/GameInitDispose.cpp | 1 - Source/GameTick.cpp | 1 - Source/Person.cpp | 1 - Source/Weapons.cpp | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Source/Animation.h b/Source/Animation.h index 1e5ad10..0d4c8d1 100644 --- a/Source/Animation.h +++ b/Source/Animation.h @@ -29,4 +29,5 @@ enum animation_types { animation_count }; +extern Animation animation[animation_count]; #endif diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp index e936228..dccc889 100644 --- a/Source/GameInitDispose.cpp +++ b/Source/GameInitDispose.cpp @@ -32,7 +32,6 @@ extern float fadestart; extern float texscale; extern float gravity; extern Light light; -extern Animation animation[animation_count]; extern Skeleton testskeleton; extern int numsounds; extern OPENAL_SAMPLE *samp[100]; diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp index 2adf41e..476b5aa 100644 --- a/Source/GameTick.cpp +++ b/Source/GameTick.cpp @@ -60,7 +60,6 @@ extern int slomo; extern float slomodelay; extern bool floatjump; extern float volume; -extern Animation animation[animation_count]; extern Light light; extern float texdetail; extern GLubyte bloodText[512*512*3]; diff --git a/Source/Person.cpp b/Source/Person.cpp index 76e9503..dac3b59 100644 --- a/Source/Person.cpp +++ b/Source/Person.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Animation.h" extern float multiplier; -extern Animation animation[animation_count]; extern OPENAL_SAMPLE *samp[100]; extern int channels[100]; extern Terrain terrain; diff --git a/Source/Weapons.cpp b/Source/Weapons.cpp index 2c48dd8..cd35a47 100644 --- a/Source/Weapons.cpp +++ b/Source/Weapons.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Animation.h" extern float multiplier; -extern Animation animation[animation_count]; extern OPENAL_SAMPLE *samp[100]; extern int channels[100]; extern Terrain terrain; -- 2.39.2