Remove some extra declarations of "channels"

diff --git a/Source/Game.cpp b/Source/Game.cpp
index 357427fd3a8ee1f342fbd0dc5a55dd2517adb447..b3289e29f489201d4d83a94f0e5f89105172cd2e 100644 (file)
--- 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 eb905545834c49e26ebd9a974479bde209f98d06..d5ba8621a64158a14e0641caa559469ee01769a6 100644 (file)
--- 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 8530e37b6b2e5670439ef580197e8bc89f61210c..28b0f69a74965837408a226bfc8096ca4bbfb36b 100644 (file)
--- 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 26d606f12de6232ebe419239bd2e571fd2b4ebaf..55fbb962a89ff8c10767c532f034cb504a61a236 100644 (file)
--- 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 6f8b29d6fbbb64e49cf8a820eded9466625bad54..66d268ff75f592e4a3f4de9c509c09e4b120fc26 100644 (file)
--- 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 2bffab8c6df8401d2932a16312f551d61a14a0bd..ff195387e5227d044a6df8a193e92beab28c5389 100644 (file)
--- 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 ee9eb21c57d9878adcd04432acbeb2baab2a860f..20cd2b0c3dc0732269e0a380d24126e59af757be 100644 (file)
--- 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 9be2636232ed6f74e8fe37f3a7854ebe7d6f9956..0edca797df5ab4415985668e044efdeb9e15a4ab 100644 (file)
--- 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 3d9021f006e86e4bb929623433541f92c43a7a17..5e832fb5bc6959099b292cc2eea29e4aeb22184b 100644 (file)
--- 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)
 {