Driving & safemode fixes (PWR) #4771
Conversation
Egad! some of my text ran off the side of the screen D: Fixed now.
I still haven't got it to display the message when driving with vehiclesafemode on & hostile, but Web Weaver now works properly. As in, safe mode trumps weaving.
We ought to let people know that they have to manually turn the key. Easy to forget!
Vagueness is not our friend here.
Adds parens to fix Jenkins warning.
| @@ -2067,14 +2067,15 @@ bool game::handle_action() | |||
| switch (act) { | |||
|
|
|||
| case ACTION_PAUSE: | |||
| if (run_mode == 2 && (u.controlling_vehicle && safemodeveh) ) { // Monsters around and we don't wanna pause | |||
| if (run_mode == 2 && ((u.controlling_vehicle && safemodeveh) || !(u.controlling_vehicle))) { // Monsters around and we don't wanna pause | |||
There was a problem hiding this comment.
This looks really strange, and caught my eye. It's semantically identical to run_mode == 2 && (safemodeveh || !u.controlling_vehicle), and I'm not sure if that's the actual intent of the test.
There was a problem hiding this comment.
OK, that streamlines things. Was intended to have safemode both stop the action and throw the warning; it wasn't kicking in when on foot, likely thanks to the Web Weaver action. As this stands, it stops you just fine but doesn't throw the warning when you're driving.
There was a problem hiding this comment.
In that case, yep, that'll do it. In plain English: "if we're in safe mode and a monster is detected, and either we're not driving, or else we're driving but the player doesn't want to trigger safe-mode while driving".
This reverts commit 80db982.
This reverts commit fa93876.
Hopefully this fixes the style problem and makes sure people look in the VehCtrl menu for things.
Got Web Weaver into player.cpp where it probably belonged. Still working on getting safemodeveh to actually work properly. This code appears to jam it in the "on" position. Not sure whether that's a problem with me Xing out of the process on WinXP, or if it's not saving properly, or if there's something else messed up.
|
Check that: "Cleanup a bit" jams vehicle-safemode in the Off position, not the On. You can jam it On by changing the "else" to "if (run_mode <=1) and bracing the u.pause. |
Turns out it was only updating when you load your save, rather than checking at game start. Still isn't loading from accessing the options menu in-game.
|
@narc0tiq was quite helpful on the trace there. Thanks much. |
As it happens, this was the quickest way to make sure it updated dynamically.
In response to http://smf.cataclysmdda.com/index.php?topic=4541.0 . Looks like vehicle-safemode may have been the culprit, but Web Weaver certainly contributed. Noe Web Weaver's in player.cpp where it belongs and the option calls go direct, thus providing the sort of realtime-changing that players'll want.
Tested and works. Feel free to pull when ready.
(I thought the engine-upgrade merited a Help update, too. #4770 is a good solution too.)