Merge branch 'master' of https://git.catrenelle.com/3xpurt/glife

locations/cum_arrcheat.qsrc

@@ -258,7 +258,13 @@ else
 	'No Pregnancies registered.'
 end
 killvar '$cycletemp'
-act 'Leave':gt $curloc
+if $loc ! '' and $metka ! '':
+	act 'Leave':gt $loc, $metka
+elseif $loc ! '':
+	act 'Leave':gt $loc
+elseif $curloc ! '':
+	act 'Leave':gt $curloc
+end
 
 --- cum_arrcheat ---------------------------------
 

locations/obj_din.qsrc

@@ -1922,7 +1922,13 @@ if $ARGS[0] = 'exit':
 	cla
 	if StoryLine = 1:act 'Go to Pavlovsk':gt 'pavResidential'
 	act 'Go to City Residental':gt 'street'
-	act 'Cancel':gt $curloc
+	if $loc ! '' and $metka ! '':
+		act 'Cancel':gt $loc, $metka
+	elseif $loc ! '':
+		act 'Cancel':gt $loc
+	elseif $curloc ! '':
+		act 'Cancel':gt $curloc
+	end
 end
 
 if $ARGS[0] = 'new':