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

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

Browse Source
This commit is contained in:
hiker 2014-11-10 16:33:37 +11:00
commit 2c5430e66c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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_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_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_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)

2
src/items/powerup_manager.cpp
View File

@ -299,7 +299,7 @@ void PowerupManager::updateWeightsForRace(unsigned int num_karts)
if(w!=0 && num_karts > 4 && if(w!=0 && num_karts > 4 &&
(type==POWERUP_PARACHUTE || type==POWERUP_SWITCH) ) (type==POWERUP_PARACHUTE || type==POWERUP_SWITCH) )
{ {
w = w / (num_karts-4); w = w / (num_karts/4);
if(w==0) w=1; if(w==0) w=1;
} }
for(unsigned int j=0; j<w; j++) for(unsigned int j=0; j<w; j++)