From 144cdc8f6834f064e72c355d5022e8b33e7d2a97 Mon Sep 17 00:00:00 2001 From: Deve Date: Sat, 8 Nov 2014 21:05:00 +0100 Subject: [PATCH 1/2] Fixed file extension. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73b1fb7bb..fbf277093 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -401,4 +401,4 @@ install(FILES ${STK_DATA_DIR}/supertuxkart.desktop DESTINATION share/application install(FILES data/supertuxkart_32.png DESTINATION share/icons/hicolor/32x32 RENAME supertuxkart.png) install(FILES data/supertuxkart_128.png DESTINATION share/icons/hicolor/128x128 RENAME supertuxkart.png) install(FILES data/supertuxkart_32.png data/supertuxkart_128.png DESTINATION share/pixmaps) -install(FILES data/supertuxkart.appdata DESTINATION share/appdata) +install(FILES data/supertuxkart.appdata.xml DESTINATION share/appdata) From 448a7eb94fe0435210c1d2d91af334be8823f4a7 Mon Sep 17 00:00:00 2001 From: Alayan-stk Date: Sun, 9 Nov 2014 16:54:01 +0100 Subject: [PATCH 2/2] Fix issue #1108 --- src/items/powerup_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/items/powerup_manager.cpp b/src/items/powerup_manager.cpp index e73661388..83e794d4d 100644 --- a/src/items/powerup_manager.cpp +++ b/src/items/powerup_manager.cpp @@ -299,7 +299,7 @@ void PowerupManager::updateWeightsForRace(unsigned int num_karts) if(w!=0 && num_karts > 4 && (type==POWERUP_PARACHUTE || type==POWERUP_SWITCH) ) { - w = w / (num_karts-4); + w = w / (num_karts/4); if(w==0) w=1; } for(unsigned int j=0; j