classic control option

This commit is contained in:
Eduardo Bart 2012-01-06 23:48:16 -02:00
parent b0f8e495c9
commit 56aa416fee
4 changed files with 10 additions and 4 deletions

1
TODO
View File

@ -67,6 +67,7 @@
[bart] chat with tabs [bart] chat with tabs
[bart] limit FPS in options [bart] limit FPS in options
[baxnie] do lua game event calls from Game instead from GameProtocol [baxnie] do lua game event calls from Game instead from GameProtocol
[baxnie] classic control
[baxnie] trade window [baxnie] trade window
[baxnie] auto walk [baxnie] auto walk
[baxnie] hotkeys window [baxnie] hotkeys window

View File

@ -3,7 +3,8 @@ Options = {}
function Options.load() function Options.load()
local booleanOptions = { vsync = true, local booleanOptions = { vsync = true,
showfps = true, showfps = true,
fullscreen = false } fullscreen = false,
classicControl = false }
for k,v in pairs(booleanOptions) do for k,v in pairs(booleanOptions) do
Settings.setDefault(k, v) Settings.setDefault(k, v)

View File

@ -19,7 +19,7 @@ OptionCheckBox < CheckBox
MainWindow MainWindow
id: optionsWindow id: optionsWindow
title: Options title: Options
size: 286 120 size: 286 140
OptionCheckBox OptionCheckBox
id: vsync id: vsync
@ -34,6 +34,10 @@ MainWindow
id: fullscreen id: fullscreen
text: Fullscreen text: Fullscreen
OptionCheckBox
id: classicControl
text: Classic control
Button Button
text: Ok text: Ok
width: 64 width: 64

View File

@ -106,7 +106,7 @@ void Game::processInventoryChange(int slot, const ItemPtr& item)
void Game::walk(Otc::Direction direction) void Game::walk(Otc::Direction direction)
{ {
if(!m_online || !m_localPlayer->canWalk(direction) || (!checkBotProtection() && m_localPlayer->getNextWalkDirection() == Otc::InvalidDirection)) if(!m_online || !m_localPlayer->canWalk(direction) || !checkBotProtection())
return; return;
cancelFollow(); cancelFollow();
@ -318,7 +318,7 @@ bool Game::checkBotProtection()
{ {
#ifndef DISABLE_BOT_PROTECTION #ifndef DISABLE_BOT_PROTECTION
if(g_lua.isInCppCallback() && !g_ui.isOnInputEvent()) { if(g_lua.isInCppCallback() && !g_ui.isOnInputEvent()) {
logError("cought a lua call to a bot protected game function, the call was canceled"); logError("caught a lua call to a bot protected game function, the call was canceled");
return false; return false;
} }
#endif #endif