Merge remote-tracking branch 'rachels/master'

locations/etoexhib.qsrc

@@ -700,7 +700,7 @@ if $ARGS[0] = 'pos18':
 	end
 end
 
-if $ARGS[0] = 'pos19':
+if $ARGS[0] = 'pos19' or $ARGS[0] = '':
 	*clr & cla
 	$menu_loc = 'etoexhib'
 	$menu_arg = 'pos19'

locations/katjaEv.qsrc

@@ -161,7 +161,7 @@ if $ARGS[0] = '3':
 	if katjaLernTimes >= 10: gs 'katjaEv', 'learning'
 
 	if mey_vika['key'] = 1:
-		Act 'Leave the room': gt 'mey_home', 'start'
+		act 'Leave the room': gt 'mey_home', 'start'
 	else
 		act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 	end
@@ -178,9 +178,9 @@ if $ARGS[0] = 'learning':
 		if katrand = 2:'Katja as if by accident puts her hand on your knee, then quickly removes it.'
 		if katrand = 3:'Katja smiles at you, quite a silly smile, then turns away.'
 	elseif katjaLernQW = 5:
-		gt 'katjaEv', '5'
+		xgt 'katjaEv', '5'
 	elseif katjaLernQW >= 6:
-		gt 'katjaEv', '6'
+		xgt 'katjaEv', '6'
 	end
 end
 

locations/obroom.qsrc

@@ -1,6 +1,6 @@
 # obroom
 
-if $ARGS[0] = 'start':
+if $ARGS[0] = 'start' or $ARGS[0] = '':
 	$sexloc = 'obroom'
 	CLOSE ALL
 	$loc_arg = 'start'

locations/set_home.qsrc

@@ -20,7 +20,7 @@ elseif curr_home = 4:
 	$home_name = 'Old town apartment'
 	$home_town = 'oldtown'
 	$home_location = 'liames'
-	$home_entrance = 'koor2x'
+	$home_entrance = 'korr2x'
 elseif curr_home = 5:
 	$home_name = 'My mansion'
 	$home_town = 'city'

locations/swamphouse.qsrc

@@ -1,6 +1,6 @@
 # swamphouse
 
-if $ARGS[0] = 'start':
+if $ARGS[0] = 'start' or $ARGS[0] = '':
 	*clr & cla
 	$location_type = 'indoors'
 	$loc = 'swamphouse'