Merge remote-tracking branch 'julzor/master'

locations/Cheatmenu_din.qsrc

@@ -373,17 +373,6 @@ $cheatmenu['cumtrait_block'] = {
 	end
 }
 
-$cheatmenu['consolecheat'] = {
-	if cheatConsole = 0:
-		cheatConsole = 1
-		dynamic $cheatmenu['permanent']
-		exit
-	elseif cheatConsole = 1:
-		cheatConsole = 0
-		dynamic $cheatmenu['permanent']
-	end
-}
-
 $cheatmenu['timecheat'] = {
 	if cheatTime = 0:
 		cheatTime = 1
@@ -445,8 +434,6 @@ $cheatmenu['permanent'] = {
 	if cumeater_cheat = 1:$cheatcumtrait = 'Disabled'
 	if exhib_cheat = 0:$cheatexhib = 'Enabled'
 	if exhib_cheat = 1:$cheatexhib = 'Disabled'
-	if cheatConsole = 0:$cheatConsole = 'Disabled'
-	if cheatConsole = 1:$cheatConsole = 'Enabled'
 	if cheatTime = 0:$cheatTime = 'Disabled'
 	if cheatTime = 1:$cheatTime = 'Enabled'
 
@@ -512,7 +499,6 @@ $cheatmenu['permanent'] = {
 		'No dream chance: <a href="exec:Enable_nodream=input(''Enter no dream chance (%)'') & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
 	end & !1.2.3 new function
 	*nl
-	'Console input in Objects window: <a href="exec:dynamic $cheatmenu[''consolecheat'']"><<$cheatConsole>></a>'
 	'Time Cheat in Objects window: <a href="exec:dynamic $cheatmenu[''timecheat'']"><<$cheatTime>></a>'
 	*nl
 

locations/obj_din.qsrc

@@ -2635,17 +2635,15 @@ if $ARGS[0] = 'old':
 	addobj '<center>Refresh</center>'
 	!addobj '<center>Settings</center>'
 	!addobj '<center>Cheats</center>'
-	if cheatConsole = 1:
-		addobj '<center>Console</center>'
-	end
+	addobj '<center>Console</center>'
 	! if disable_autosave = 1:
 		! addobj '<center><font color = red><b>[</b></font>Autosave<font color = red><b>]</b></font></center>'
 	! else
 		! addobj '<center><font color = green><b>[</b></font>Autosave<font color = green><b>]</b></font></center>'
 	! end
 	if cheatTime = 1:
-		addobj '<center><i>-1 Hour</i></center>'
-		addobj '<center><i>+1 Hour</i></center>'
+		addobj '<center>-1 Hour</center>'
+		addobj '<center>+1 Hour</center>'
 	end
 	addobj ''
 	addobj '<center><font color = red>Emergency</font></center>'

locations/onobjsel.qsrc

@@ -30,8 +30,8 @@ if $selobj = '<center>Refresh</center>':gs '$menu_obnovit'
 	! if $selobj = '<center><font color = green><b>[</b></font>Autosave<font color = green><b>]</b></font></center>':gs 'obj_din', 'autosave'
 ! end
 if $selobj = '<center>Console</center>':dynamic $cheatmenu['dynamic']
-if $selobj = '<center><i>-1 Hour</i></center>':gs 'obj_din', '-1 Hour'
-if $selobj = '<center><i>+1 Hour</i></center>':gs 'obj_din', '+1 Hour'
+if $selobj = '<center>-1 Hour</center>':gs 'obj_din', '-1 Hour'
+if $selobj = '<center>+1 Hour</center>':gs 'obj_din', '+1 Hour'
 if $selobj = '<center><font color = red>Emergency</font></center>':gs 'obj_din', 'emergency'
 
 !The old menu: end