Merge remote-tracking branch 'Anjuna/master'

locations/bed_get_out.qsrc

@@ -6,7 +6,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	menu_off = 1
 	minut -= 1
 	InSleep = 0
-	slept_in = 0
+	sleepVars['slept_in'] = 0
 	strip_here = 0
 	SleepHorny = 0
 	!! to fudge the first hour wake up sleep loss.

locations/pre_sleep.qsrc

@@ -9,6 +9,7 @@ $sleep_loc = 'pre_sleep'
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 	menu_off = 1
+	sleepVars['slept_in'] = 0
 	gt 'pre_sleep_events', 'start'
 end
 

locations/pre_sleep_events.qsrc

@@ -225,7 +225,7 @@ if $ARGS[0] = 'succubinit':
 	$sucself1 = 'that feeling'
 	pcs_horny = 100
 	InSleep = 0
-	slept_in = 0
+	sleepVars['slept_in'] = 0
 	strip_here = 0
 	'<center><img <<$set_imgh>> src="images/pc/body/succubusself.jpg"></center>'
 	*nl

locations/sleep.qsrc

@@ -75,7 +75,7 @@ end
 if $ARGS[0] = 'calc_minutes_to_wakeup':
 	sleepVars['time_now'] = daystart * 1440 + hour * 60 + minut
 
-	if alarmVars['alarmOn'] = 1:
+	if alarmVars['alarmOn'] = 1 and sleepVars['slept_in'] = 0:
 		if alarmVars['alarm_holiday'] = 1 and kanikuli ! 0 or ((hour < alarmVars['timerEndH'] and (week = 6 or week = 7)) or (hour => alarmVars['timerEndH'] and (week = 5 or week = 6))):
 		!! use weekend time alarm
 			sleepVars['alarm_time'] = daystart * 1440 + alarmVars['timerEndH'] * 60 + alarmVars['timerEndM']
@@ -172,7 +172,7 @@ end
 if $ARGS[0] = 'extra':
 	act '"Snooze" a few minutes more...':
 		menu_off = 1
-		slept_in = 1
+		sleepVars['slept_in'] = 1
 		gs 'stat'
 		gt 'sleep', 'start'
 	end

locations/wakeup.qsrc

@@ -30,7 +30,7 @@ end
 if $ARGS[0] = 'get_out':
 	menu_off = 1
 	sleepVars['time_now'] = daystart * 1440 + hour * 60 + minut
-	if slept_in = 1:
+	if sleepVars['slept_in'] = 1:
 		'You wake up at <<func(''alarmclock'', ''alarm_display'', hour, minut)>>, after sleeping-in a little longer than planned, but at least you''ve had plenty of sleep.'
 	elseif pcs_sleep >= 100 and alarmVars['alarmOn'] = 1 and sleepVars['time_now'] >= sleepVars['alarm_time']:
 		'You wake up at <<func(''alarmclock'', ''alarm_display'', hour, minut)>>, just before your alarm goes off. You''ve had plenty of sleep.'
@@ -90,7 +90,7 @@ if $ARGS[0] = 'get_out':
 
 	act 'Get out of bed (0:10)':
 		minut += 10
-		slept_in = 0
+		sleepVars['slept_in'] = 0
 		xgt 'bed_get_out', 'start'
 	end
 end

locations/wakeup_events.qsrc

@@ -38,7 +38,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		end
 
 
-		if mid($start_type, 1, 2) = 'sg' and slept_in = 1 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and suspended['on'] ! 1:
+		if mid($start_type, 1, 2) = 'sg' and sleepVars['slept_in'] = 1 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and suspended['on'] ! 1:
 			if (hour = 7 or hour = 8):
 				$sleep_events_priority[] = 'gs ''wakeup_events'', ''sg_go_school'' '
 			elseif hour >= 9 and hour < 14: