From c23ac39b05c49e9ee8e6ca8f51c80eb4245ce92b Mon Sep 17 00:00:00 2001 From: hikerstk Date: Fri, 8 Feb 2008 08:16:35 +0000 Subject: [PATCH] 1) Some bugfixes to the linux compile environment 2) Fixed the 'waiting for AI karts' time back to the original value. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1450 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- Makefile.am | 2 +- src/Makefile.am | 3 +-- src/constants.hpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 58b35e051..77cd3b637 100755 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/src/Makefile.am b/src/Makefile.am index 0c5678a3d..6447d7a49 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,7 +35,6 @@ supertuxkart_SOURCES = main.cpp \ 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 @@ supertuxkart_SOURCES = main.cpp \ # 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: diff --git a/src/constants.hpp b/src/constants.hpp index 9f96025a3..de9756e48 100644 --- a/src/constants.hpp +++ b/src/constants.hpp @@ -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).