[Opentnl-cvs] tnl/zap projectile.cpp,1.4,1.5 sfx.cpp,1.6,1.7

[Ben G. <s_a...@us...>]

Update of /cvsroot/opentnl/tnl/zap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6557/zap

Modified Files:
	projectile.cpp sfx.cpp 
Log Message:
Merged MacOS X build fixes.

Index: projectile.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/projectile.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** projectile.cpp	20 Apr 2004 21:53:35 -0000	1.4
--- projectile.cpp	20 Apr 2004 22:17:42 -0000	1.5
***************
*** 181,195 ****
     process(deltaT);
     liveTime += deltaT;
-   /* if(alive)
-    {
-       if(liveTime <= deltaT)
-       {
-          getGame()->deleteObject(this, 500);
-          liveTime = 0;
-          alive = false;
-       }
-       else
-          liveTime -= deltaT;
-    } */
  }
  
--- 181,184 ----
***************
*** 235,237 ****
  }
  
! };
\ No newline at end of file
--- 224,226 ----
  }
  
! };

Index: sfx.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/sfx.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sfx.cpp	20 Apr 2004 19:45:05 -0000	1.6
--- sfx.cpp	20 Apr 2004 22:17:46 -0000	1.7
***************
*** 29,33 ****
  #include "tnlLog.h"
  
! #if defined (TNL_OS_WIN32) || defined (TNL_OS_LINUX)
  
  #include "alInclude.h"
--- 29,33 ----
  #include "tnlLog.h"
  
! #if defined (TNL_OS_WIN32) || defined (TNL_OS_LINUX) || defined (TNL_OS_MAC_OSX)
  
  #include "alInclude.h"
***************
*** 242,246 ****
--- 242,250 ----
        ALboolean loop;
  
+ #ifdef TNL_OS_MAC_OSX
+       alutLoadWAVFile((ALbyte *) gSFXProfiles[i].fileName, &format, &data, &size, &freq);
+ #else
        alutLoadWAVFile((ALbyte *) gSFXProfiles[i].fileName, &format, &data, &size, &freq, &loop);
+ #endif
        if(alGetError() != AL_NO_ERROR)
           return;