From 1aef858f5ecb3dc8fd816e0155635371ed3632f2 Mon Sep 17 00:00:00 2001 From: Alexander Monakov Date: Mon, 3 Jan 2011 22:41:13 +0300 Subject: [PATCH] Remove some extra declarations of "channels" --- Source/Game.cpp | 3 --- Source/GameDraw.cpp | 2 -- Source/GameInitDispose.cpp | 3 --- Source/GameTick.cpp | 1 - Source/Person.cpp | 1 - Source/Skeleton.cpp | 1 - Source/Sounds.h | 1 + Source/Weapons.cpp | 1 - Source/openal_wrapper.cpp | 2 +- 9 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Source/Game.cpp b/Source/Game.cpp index 357427f..b3289e2 100644 --- a/Source/Game.cpp +++ b/Source/Game.cpp @@ -3,9 +3,6 @@ #include "SDL_thread.h" extern int mainmenu; -extern int channels[100]; - - Game::Game() { diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp index eb90554..d5ba862 100644 --- a/Source/GameDraw.cpp +++ b/Source/GameDraw.cpp @@ -132,8 +132,6 @@ extern bool gamestarted; extern bool showdamagebar; -extern int channels[100]; - void Game::flash() { // shouldn't be that way, these should be attributes and Person class should not change rendering. flashr=1; flashg=0; diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp index 8530e37..28b0f69 100644 --- a/Source/GameInitDispose.cpp +++ b/Source/GameInitDispose.cpp @@ -34,7 +34,6 @@ extern float gravity; extern Light light; extern Skeleton testskeleton; extern int numsounds; -extern int channels[100]; extern Terrain terrain; //extern Sprites sprites; extern int kTextureSize; @@ -828,8 +827,6 @@ void Game::InitGame() //terraindetail=2; } - memset(channels, 0xff, sizeof(channels)); - LOG("Initializing sound system..."); int output = -1; diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp index 26d606f..55fbb96 100644 --- a/Source/GameTick.cpp +++ b/Source/GameTick.cpp @@ -49,7 +49,6 @@ extern XYZ viewer; extern int environment; extern float texscale; extern Terrain terrain; -extern int channels[100]; extern int kTextureSize; extern float screenwidth,screenheight; extern float gravity; diff --git a/Source/Person.cpp b/Source/Person.cpp index 6f8b29d..66d268f 100644 --- a/Source/Person.cpp +++ b/Source/Person.cpp @@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Game.h" extern float multiplier; -extern int channels[100]; extern Terrain terrain; extern float gravity; extern int environment; diff --git a/Source/Skeleton.cpp b/Source/Skeleton.cpp index 2bffab8..ff19538 100644 --- a/Source/Skeleton.cpp +++ b/Source/Skeleton.cpp @@ -29,7 +29,6 @@ extern float multiplier; extern float gravity; extern Skeleton testskeleton; extern Terrain terrain; -extern int channels[100]; extern Objects objects; extern int environment; extern float terraindetail; diff --git a/Source/Sounds.h b/Source/Sounds.h index ee9eb21..20cd2b0 100644 --- a/Source/Sounds.h +++ b/Source/Sounds.h @@ -30,6 +30,7 @@ sounds_count }; extern struct OPENAL_SAMPLE *samp[sounds_count]; +extern int channels[]; extern void loadAllSounds(); diff --git a/Source/Weapons.cpp b/Source/Weapons.cpp index 9be2636..0edca79 100644 --- a/Source/Weapons.cpp +++ b/Source/Weapons.cpp @@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Awards.h" extern float multiplier; -extern int channels[100]; extern Terrain terrain; extern float gravity; extern int environment; diff --git a/Source/openal_wrapper.cpp b/Source/openal_wrapper.cpp index 3d9021f..5e832fb 100644 --- a/Source/openal_wrapper.cpp +++ b/Source/openal_wrapper.cpp @@ -644,7 +644,7 @@ AL_API signed char OPENAL_SetOutput(int outputtype) return true; } -extern int channels[100]; +extern int channels[]; extern "C" void PlaySoundEx(int chan, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused) { -- 2.39.2