[changed] cheat menu refining

locations/LOCA.qsrc

@@ -6,7 +6,7 @@ if debug['trace_loc_change'] = 1:
 	gs 'debug_tools', 'trace', 'loc_change'
 end
 
-if settingmode!0: killvar '$cheatmenu'
+if settingmode = 0: killvar 'cheatmenu'
 
 !{
 msg "Changed Location 

locations/din_bad.qsrc

@@ -251,7 +251,7 @@ if $ARGS[0] = 'd_bag':
 	*nl
 	if $pursepantytype ! '' or $pursebratype ! '': 'You also have '+iif($pursepantytype ! '','<a href="exec:view''<<func(''$panty_image'', $pursepantytype, pursepantynumber)>>''">a pair of panties</a>','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','<a href="exec:view''<<func(''$bra_image'', $pursebratype, pursebranumber)>>''">a bra</a>','')+' in your purse, which you can put on in the nearest bathroom.'
 	if photographyEv >= 2: 'You have <a href="exec:gt''camera'',''start''">a camera</a> in your purse.'
-	act 'Return':gt 'obj_din', 'menu_exit'
+	act 'Return':gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
 	'</td></tr></table></center>'
 end
 

locations/mod_setting.qsrc

@@ -9,7 +9,7 @@ if settingmode = 1:
 	act '<center><b>Return to character creation</b></center>': killvar 'menu_page' & gt 'begin', 'start'
 else
 	!call from Menu - Game settings
-	act 'Exit the menu': killvar 'menu_page' & gt 'obj_din', 'menu_exit'
+	act 'Exit the menu': gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
 end
 
 *nl '<center><h1>MODs</h1></center>'

locations/obj_din.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'chartabs':
 		$tabsaction[] = 'menu_page = 6 & gs ''obj_din'', ''magic'''
 	end
 	gs 'tabhead',menu_page
-	act 'Exit the menu': killvar 'menu_page' & gt 'obj_din', 'menu_exit'
+	act 'Exit the menu': gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
 end
 
 if $ARGS[0] = 'bodytabs':
@@ -56,7 +56,7 @@ if $ARGS[0] = 'bodytabs':
 	$tabsname[] = 'Piercings'
 	$tabsaction[] = 'menu_page = 7 & gs ''obj_din'', ''piercing'''
 	gs 'tabhead',menu_page
-	act 'Exit the menu': killvar 'menu_page' & gt 'obj_din', 'menu_exit'
+	act 'Exit the menu': gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
 end
 
 if $ARGS[0] = 'settingtabs':
@@ -98,8 +98,8 @@ if $ARGS[0] = 'settingtabs':
 		act 'Enter cheat menu': killvar 'menu_page' & gs '$menu_cheat'
 		act 'Get Game Settings': killvar 'menu_page' & gt 'initg', 'get_game_set'
 		act 'Set Game Settings': killvar 'menu_page' & gt 'initg', 'set_game_set'
-		act 'Emergency Exit': killvar 'menu_page' & gt 'obj_din', 'emergency'
-		act 'Exit the menu': killvar 'menu_page' & gt 'obj_din', 'menu_exit'
+		act 'Emergency Exit': gs 'obj_din', 'menu_exit' & gt 'obj_din', 'emergency'
+		act 'Exit the menu': gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
 	end
 end
 
@@ -234,12 +234,16 @@ if $ARGS[0] = 'cheattabs':
 
 	$cheat_tab_list
 
-	act 'Settings menu': killvar 'menu_page' & gs '$menu_setting'
-	act 'Emergency Exit': killvar 'menu_page' & gt 'obj_din', 'emergency'
-	act 'Exit the menu': killvar 'menu_page' & gt 'obj_din', 'menu_exit'
+	act 'Settings menu': gs 'obj_din', 'menu_exit' & gs '$menu_setting'
+	act 'Emergency Exit': gs 'obj_din', 'menu_exit' & gt 'obj_din', 'emergency'
+	act 'Exit the menu': gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
 end
 
-if $ARGS[0] = 'menu_exit': settingmode = 0 & gt $menu_loc, $menu_arg
+if $ARGS[0] = 'menu_exit':
+	settingmode = 0
+	killvar 'cheatmenu'
+	killvar 'menu_page'
+end
 
 if $ARGS[0] = 'menu_disabled': '<font color="red"><b>Menu is disabled for this event</b></font>'
 

locations/onobjsel.qsrc

@@ -2,7 +2,12 @@
 !the dynamics can all be found in obj_din and Cheatmenu_din
 
 if $selobj = '<center>Refresh</center>':gs '$menu_obnovit'
-if $selobj = '<center>Console</center>':dynamic $cheatmenu['dynamic']
+if $selobj = '<center>Console</center>':
+	$dynamicCommand = input("Enter command to execute.")
+	if $dynamicCommand = '':exit
+	dynamic $dynamicCommand
+	killvar 'dynamicCommand'
+end
 if $selobj = '<center>Toggle Debug Variables</center>': 
 	if objectWindowDebug = 0:
 		objectWindowDebug = 1

locations/saveupdater.qsrc

@@ -2884,6 +2884,10 @@ if temp_current_save_version < 00090204:
 	end
 
 	if igor_krossdress > 0 and igor_eqwtday > 0 and igor_progulkaday = 0: igor_krossdress = 0
+
+	killvar 'dynamicCommand'
+	killvar 'bomzstartqwestdi'
+	killvar 'workbomzdi'
 end