[Supertuxkart-commit] SF.net SVN: supertuxkart: [1450] trunk/supertuxkart

[<hik...@us...>]

Revision: 1450
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=1450&view=rev
Author:   hikerstk
Date:     2008-02-08 00:16:35 -0800 (Fri, 08 Feb 2008)

Log Message:
-----------
1) Some bugfixes to the linux compile environment
2) Fixed the 'waiting for AI karts' time back to the original value.

Modified Paths:
--------------
    trunk/supertuxkart/Makefile.am
    trunk/supertuxkart/src/Makefile.am
    trunk/supertuxkart/src/constants.hpp

Modified: trunk/supertuxkart/Makefile.am
===================================================================
--- trunk/supertuxkart/Makefile.am	2008-02-08 04:43:35 UTC (rev 1449)
+++ trunk/supertuxkart/Makefile.am	2008-02-08 08:16:35 UTC (rev 1450)
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = @BULLETTREE@ src wavs images models data mods fonts
+SUBDIRS = @BULLETTREE@ src wavs images models data fonts
 
 EXTRA_DIST = README ChangeLog COPYING missing
 

Modified: trunk/supertuxkart/src/Makefile.am
===================================================================
--- trunk/supertuxkart/src/Makefile.am	2008-02-08 04:43:35 UTC (rev 1449)
+++ trunk/supertuxkart/src/Makefile.am	2008-02-08 08:16:35 UTC (rev 1450)
@@ -35,7 +35,6 @@
 	collectable_manager.cpp	   collectable_manager.hpp   	\
 	sound_manager.cpp	   sound_manager.hpp           	\
 	sound_plib.cpp             sound_plib.hpp              	\
-	music_mikmod.cpp	   music_mikmod.hpp            	\
 	music_ogg.cpp	   	   music_ogg.hpp            	\
 	sfx_openal.cpp             sfx_openal.hpp              	\
 	input.hpp 						\
@@ -129,7 +128,7 @@
 # Link in the specific gcc 4.1 bug work around
 supertuxkart_LDADD = -L. -lstatic_ssg \
 	-lplibjs -lplibsl -lplibssg -lplibpu -lplibfnt -lplibsg \
-	-lplibul -lplibssgaux $(bullet_LIBS) $(opengl_LIBS)  $(sdl_LIBS) $(openal_LIBS) $(mikmod_LIBS)
+	-lplibul -lplibssgaux $(bullet_LIBS) $(opengl_LIBS)  $(sdl_LIBS) $(openal_LIBS)
 
 .PHONY: pot
 pot:

Modified: trunk/supertuxkart/src/constants.hpp
===================================================================
--- trunk/supertuxkart/src/constants.hpp	2008-02-08 04:43:35 UTC (rev 1449)
+++ trunk/supertuxkart/src/constants.hpp	2008-02-08 08:16:35 UTC (rev 1450)
@@ -22,7 +22,7 @@
 
 
 #define MAX_HISTORY            50000   /* number of history events */
-#define TIME_DELAY_TILL_FINISH  0.100f  /* time after all player karts finish */
+#define TIME_DELAY_TILL_FINISH  10.0f  /* time after all player karts finish */
 /*
   All final units are in meters (or meters/sec or meters/sec^2)
   and degrees (or degrees/sec).


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.