X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FGlobals.cpp;h=fe9c136c58af36faf85817ed2abb606ea83c8822;hb=54a459691cc0e2d314008b4f3f4ce349417dadc2;hp=05b4ff4391fd799139c713a772d36bea43835fe4;hpb=43f08119f2408a487dbefcf670bb6c8f47d4c49b;p=lugaru.git

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index 05b4ff4..fe9c136 100644
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -1,3 +1,28 @@
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+
+This file is part of Lugaru.
+
+Lugaru is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#if USE_SDL
+#include "SDL.h"
+#endif
+
 #include "gamegl.h"
 #include "Quaternions.h"
 #include "Lights.h"
@@ -5,22 +30,18 @@
 #include "fmod.h"
 #include "Terrain.h"
 #include "Sprites.h"
-//#include <agl.h>
 #include "Frustum.h"
 #include "Objects.h"
 #include "Weapons.h"
 #include "Person.h"
 #include "TGALoader.h"
+#include "openal_wrapper.h"
 
 #include "Constants.h"
 
-#if USE_SDL
-#include "SDL.h"
-#endif
-
 bool visibleloading = 0;
-FSOUND_SAMPLE	*samp[100] = {0};
-FSOUND_STREAM * strm[20] = {0};
+OPENAL_SAMPLE	*samp[100] = {0};
+OPENAL_STREAM * strm[20] = {0};
 int channels[100] = {0};
 
 float volume = 0;bool buttons[3] = {0};
@@ -144,12 +165,12 @@ float dialogueboxcolor[max_dialogues][max_dialoguelength][3] = {0};
 int dialogueboxsound[max_dialogues][max_dialoguelength] = {0};
 char dialoguetext[max_dialogues][max_dialoguelength][128] = {0};
 char dialoguename[max_dialogues][max_dialoguelength][64] = {0};
-XYZ dialoguecamera[max_dialogues][max_dialoguelength] = {0};
-XYZ participantlocation[max_dialogues][10] = {0};
+XYZ dialoguecamera[max_dialogues][max_dialoguelength]; //l = {0};
+XYZ participantlocation[max_dialogues][10]; // = {0};
 int participantfocus[max_dialogues][max_dialoguelength] = {0};
 int participantaction[max_dialogues][max_dialoguelength] = {0};
 float participantrotation[max_dialogues][10] = {0};
-XYZ participantfacing[max_dialogues][max_dialoguelength][10] = {0};
+XYZ participantfacing[max_dialogues][max_dialoguelength][10]; // = {0};
 float dialoguecamerarotation[max_dialogues][max_dialoguelength] = {0};
 float dialoguecamerarotation2[max_dialogues][max_dialoguelength] = {0};
 int indialogue = 0;
@@ -196,7 +217,7 @@ float bonusnum[100] = {0};
 int hostile = 0;
 float hostiletime = 0;
 
-XYZ envsound[30] = {0};
+XYZ envsound[30]; // = {0};
 float envsoundvol[30] = {0};
 float envsoundlife[30] = {0};
 int numenvsounds;