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

Fix merge

Browse Source
This commit is contained in:
Flakebi 2015-11-21 23:15:54 +01:00
parent ffa85d2206
commit b4904b182f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/scriptengine/script_kart.cpp
View File

@ -16,13 +16,15 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <assert.h> #include "script_kart.hpp"
#include <angelscript.h>
#include "karts/abstract_characteristic.hpp"
#include "karts/kart.hpp" #include "karts/kart.hpp"
#include "modes/world.hpp" #include "modes/world.hpp"
#include "script_kart.hpp"
#include "scriptvec3.hpp" #include "scriptvec3.hpp"
#include <assert.h>
#include <angelscript.h>
//debug //debug
#include <iostream> #include <iostream>
@ -121,8 +123,7 @@ namespace Scripting
float getMaxSpeed(int idKart) float getMaxSpeed(int idKart)
{ {
AbstractKart* kart = World::getWorld()->getKart(idKart); AbstractKart* kart = World::getWorld()->getKart(idKart);
return kart->getKartProperties()->getMaxSpeed() * return kart->getCharacteristic()->getEngineMaxSpeed();
kart->getPlayerDifficulty()->getMaxSpeed();
} }
/** @}*/ /** @}*/