File tree Expand file tree Collapse file tree 2 files changed +2
-5
lines changed Expand file tree Collapse file tree 2 files changed +2
-5
lines changed Original file line number Diff line number Diff line change @@ -400,14 +400,12 @@ bool GameActivity::IsBuyGUIVisible(int which) const {
400
400
401
401
bool GameActivity::LockControlledActor (Players player, bool lock, Controller::InputMode lockToMode) {
402
402
if (player >= Players::PlayerOne && player < Players::MaxPlayerCount) {
403
+ bool prevLock = m_LuaLockActor[player];
403
404
m_LuaLockActor[player] = lock;
404
405
m_LuaLockActorMode[player] = lockToMode;
405
- if (m_pBuyGUI[player]->IsVisible () || m_InventoryMenuGUI[player]->IsVisible ()) {
406
- m_LuaLockActor[player] = false ;
407
- return false ;
408
- }
409
406
return true ;
410
407
}
408
+ return false ;
411
409
}
412
410
413
411
// ////////////////////////////////////////////////////////////////////////////////////////
Original file line number Diff line number Diff line change @@ -255,7 +255,6 @@ class GameActivity : public Activity {
255
255
// / <summary>
256
256
// / Locks a player controlled actor to a specific controller mode.
257
257
// / Locking the actor will disable player input, including switching actors.
258
- // / Locking will fail if the actor is already locked for another reason (such as being in a menu).
259
258
// / </summary>
260
259
// / <param name="player">Which player to lock the actor for.</param>
261
260
// / <param name="lock">Whether to lock or unlock the actor. (Default: true)</param>
You can’t perform that action at this time.
0 commit comments