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

Remove some unused code

Browse Source
This commit is contained in:
Flakebi
2014-11-15 12:20:11 +01:00
parent 4ab84a6b83
commit be999895b4
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/input/gamepad_device.cpp
View File

@@ -38,11 +38,11 @@ GamePadDevice::GamePadDevice(const int irr_index, const std::string &name,
GamepadConfig *config = static_cast<GamepadConfig*>(m_configuration);
if(m_configuration->getNumberOfButtons()<button_count)
{
static_cast<GamepadConfig*>(m_configuration)->setNumberOfButtons(button_count);
config->setNumberOfButtons(button_count);
}
if(m_configuration->getNumberOfAxes()<axis_count)
{
static_cast<GamepadConfig*>(m_configuration)->setNumberOfAxis(axis_count);
config->setNumberOfAxis(axis_count);
}
m_prev_axis_directions = new Input::AxisDirection[axis_count];
m_prev_axis_value = new int[axis_count];

4
src/karts/controller/player_controller.cpp
View File

@@ -196,10 +196,8 @@ void PlayerController::action(PlayerAction action, int value)
m_controls->m_rescue = (value!=0);
break;
case PA_FIRE:
{
m_controls->m_fire = (value!=0);
break;
}
case PA_LOOK_BACK:
m_controls->m_look_back = (value!=0);
break;
@@ -207,12 +205,14 @@ void PlayerController::action(PlayerAction action, int value)
if(value==0)
m_controls->m_skid = KartControl::SC_NONE;
else
{
if(m_steer_val==0)
m_controls->m_skid = KartControl::SC_NO_DIRECTION;
else
m_controls->m_skid = m_steer_val<0
? KartControl::SC_RIGHT
: KartControl::SC_LEFT;
}
break;
case PA_PAUSE_RACE:
if (value != 0) StateManager::get()->escapePressed();

8
src/modes/world.cpp
View File

@@ -615,12 +615,12 @@ void World::resetAllKarts()
if (!kart_over_ground)
{
Log::error("[World]",
Log::error("World",
"No valid starting position for kart %d on track %s.",
(int)(i-m_karts.begin()), m_track->getIdent().c_str());
if (UserConfigParams::m_artist_debug_mode)
{
Log::warn("[World]", "Activating fly mode.");
Log::warn("World", "Activating fly mode.");
(*i)->flyUp();
continue;
}
@@ -672,14 +672,14 @@ void World::resetAllKarts()
&normal);
if(!material)
{
Log::error("[World]",
Log::error("World",
"No valid starting position for kart %d "
"on track %s.",
(int)(i-m_karts.begin()),
m_track->getIdent().c_str());
if (UserConfigParams::m_artist_debug_mode)
{
Log::warn("[World]", "Activating fly mode.");
Log::warn("World", "Activating fly mode.");
(*i)->flyUp();
continue;
}

2
src/states_screens/dialogs/message_dialog.cpp
View File

@@ -97,8 +97,6 @@ void MessageDialog::doInit(MessageDialogType type,
}
else if (type == MessageDialog::MESSAGE_DIALOG_YESNO)
{
ButtonWidget* yesbtn = getWidget<ButtonWidget>("confirm");
ButtonWidget* cancelbtn = getWidget<ButtonWidget>("cancel");
cancelbtn->setText(_("No"));