ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/supertuxkart/stk-code

Browse Source
This commit is contained in:
hiker 2015-10-21 08:43:32 +11:00
commit cce4793fa3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/FindAngelscript.cmake
View File

@ -14,11 +14,11 @@ FIND_PATH(Angelscript_INCLUDE_DIRS angelscript.h
) )
FIND_LIBRARY(Angelscript_LIBRARY FIND_LIBRARY(Angelscript_LIBRARY
NAMES angelscript NAMES angelscript angelscript_s
PATHS PATHS
/usr/local /usr/local
/usr /usr
PATH_SUFFIXES lib PATH_SUFFIXES lib lib64 lib32
) )
# handle the QUIETLY and REQUIRED arguments and set ANGELSCRIPT_FOUND to TRUE if # handle the QUIETLY and REQUIRED arguments and set ANGELSCRIPT_FOUND to TRUE if

4
src/config/saved_grand_prix.cpp
View File

@ -181,5 +181,7 @@ void SavedGrandPrix::loadKarts(std::vector<RaceManager::KartStatus> & kart_list)
} // if m_local_player_id == -1 } // if m_local_player_id == -1
} // for i } // for i
std::sort(kart_list.begin(), kart_list.end(), cmp__l); // The line below causes issues in follow the leader race. The leader
// is not at first place anymore.
// std::sort(kart_list.begin(), kart_list.end(), cmp__l);
} // loadKarts } // loadKarts