Fix bug in previous commit (why on earth didn't VS complain???).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6505 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
fc202a57f5
commit
30cb112c46
@ -1,4 +1,4 @@
|
||||
// $Id$
|
||||
// $Id$
|
||||
//
|
||||
// SuperTuxKart - a fun racing game with go-kart
|
||||
// Copyright (C) 2010 Joerg Henrichs
|
||||
@ -23,12 +23,12 @@
|
||||
#include "irrlicht.h"
|
||||
using namespace irr;
|
||||
|
||||
#include "input/input.hpp"
|
||||
#include "karts/controller/kart_control.hpp"
|
||||
#include "states_screens/state_manager.hpp"
|
||||
|
||||
class Kart;
|
||||
class Item;
|
||||
enum PlayerAction;
|
||||
|
||||
/** This is the base class for kart controller - that can be a player
|
||||
* or a a robot.
|
||||
@ -64,7 +64,7 @@ public:
|
||||
virtual bool isPlayerController () const {return false;}
|
||||
virtual bool isNetworkController() const {return false;}
|
||||
/** Default: ignore actions. Only PlayerController get them. */
|
||||
virtual void action (const PlayerAction &action, int value) {}
|
||||
virtual void action (PlayerAction action, int value) {}
|
||||
virtual const irr::core::stringw& getNamePostfix() const;
|
||||
|
||||
}; // Controller
|
||||
|
@ -138,7 +138,7 @@ void EndController::reset()
|
||||
//-----------------------------------------------------------------------------
|
||||
/** The end controller must forward 'fire' presses to the race gui.
|
||||
*/
|
||||
void EndController::action(const PlayerAction &action, int value)
|
||||
void EndController::action(PlayerAction action, int value)
|
||||
{
|
||||
if(action!=PA_FIRE) return;
|
||||
RaceResultGUI *race_result_gui = dynamic_cast<RaceResultGUI*>(World::getWorld()->getRaceGUI());
|
||||
|
@ -83,7 +83,7 @@ public:
|
||||
* controller. This way e.g. highscores can still be assigned
|
||||
* to the right player. */
|
||||
virtual bool isPlayerController () const {return m_player!=NULL;}
|
||||
virtual void action (const PlayerAction &action, int value);
|
||||
virtual void action (PlayerAction action, int value);
|
||||
|
||||
}; // EndKart
|
||||
|
||||
|
@ -113,7 +113,7 @@ void PlayerController::resetInputState()
|
||||
* and if it's 0 it indicates that the corresponding button
|
||||
* was released.
|
||||
*/
|
||||
void PlayerController::action(const PlayerAction &action, int value)
|
||||
void PlayerController::action(PlayerAction action, int value)
|
||||
{
|
||||
switch (action)
|
||||
{
|
||||
|
@ -51,7 +51,7 @@ public:
|
||||
unsigned int player_index);
|
||||
~PlayerController ();
|
||||
void update (float);
|
||||
void action (const PlayerAction &action, int value);
|
||||
void action (PlayerAction action, int value);
|
||||
void handleZipper ();
|
||||
void collectedItem (const Item &item, int add_info=-1,
|
||||
float previous_energy=0);
|
||||
|
Loading…
Reference in New Issue
Block a user