Browse Source

[fixed/removed] Alarmclock will now return to `menu_loc` and `menu_arg`, which makes more sense and corrects behaviour around `bed2`. Removed unused `alarmloc` variables

anjuna krokus 2 weeks ago
parent
commit
c67e749f9d
2 changed files with 1 additions and 5 deletions
  1. 1 1
      locations/alarmclock.qsrc
  2. 0 4
      locations/bed2.qsrc

+ 1 - 1
locations/alarmclock.qsrc

@@ -178,7 +178,7 @@ if $ARGS[0] = 'Reset':
 	gt 'alarmclock', 'start'
 end
 
-if $ARGS[0] = 'fin':gt $loc, $loc_arg
+if $ARGS[0] = 'fin':gt $menu_loc, $menu_arg
 
 
 if $ARGS[0] = 'build_table':

+ 0 - 4
locations/bed2.qsrc

@@ -7,9 +7,7 @@
 
 if $ARGS[0] = 'bed2' or $ARGS[0] = 'start' or $ARGS[0] = '':
 	$menu_loc = 'bed2'
-	$alarmloc = 'bed2'
 	$menu_arg = 'start'
-	$alarmarg = 'start'
 	menu_off = 0
 
 	if clo_flag['bed'] = 1:
@@ -36,9 +34,7 @@ end
 
 if $ARGS[0] = 'main':
 	$menu_loc = 'bed2'
-	$alarmloc = 'bed2'
 	$menu_arg = 'main'
-	$alarmarg = 'main'
 	menu_off = 0
 
 	if pcs_makeup ! 1 and cosmetic_tattoo = 0: *nl '<b><font color="red">You need to wash off your makeup before going to bed.</font></b>'