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

glife.qproj

@@ -710,8 +710,6 @@
 		<Location name="natkolEv"/>
 		<Location name="natpimp"/>
 		<Location name="NatBelGo"/>
-		<Location name="NatBelHome"/>
-		<Location name="NatBelVhod"/>
 	</Folder>
 	<Folder name="Albina">
 		<Location name="albinaEv"/>

locations/NatBelGo.qsrc

@@ -10,6 +10,7 @@ gs 'stat'
 act 'Go with Natasha':
 	cls
 	minut += 15
+	BeInNatBelHome = 1
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/16.jpg"></center>'

locations/lab.qsrc

@@ -439,7 +439,7 @@ if $ARGS[0] = 'Tatiana':
 		act 'No, no, I''ve changed my mind. Thank you':gt 'lab', 'Tatiana'
 
 
-		act "Restore you body to it's original shape":
+		act 'Restore you body to it''s original shape':
 			cla
 			'"Tatiana, I''m having problems with my body image, I''m not happy and was hoping that you might be able to help me."'
 			'"It''s possible but I will have to draw on your magical energy, it will cost 40 mana to perform a reset spell.'

locations/pod_ezd.qsrc

@@ -197,7 +197,7 @@ if $ARGS[0] = 'etaj_4':
 	act 'Go down to the third floor': minut += 1 & gt 'pod_ezd','etaj_3'
 	act 'Go up to the fifth floor': minut += 1 & gt 'pod_ezd','etaj_5'
 
-	if BeInNatBelHome = 1: act 'Apartment 19: Natasha Belova': gt 'NatBelVhod'
+	if BeInNatBelHome = 1: act 'Apartment 19: Natasha Belova': gt 'natbelapt', 'home'
 
 	act 'Apartment 21: Aunt Luda':
 		*clr & cla

locations/telefon.qsrc

@@ -963,6 +963,8 @@ if $ARGS[0] = 'Phone_camera':
 		$phone_loc = 'lockeroom'
 	elseif $locclass = 'beach':
 		$phone_loc = 'beach'
+	else
+		$phone_loc = ''
 	end
 	pl '<center><b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b></center>'
 	pl '<center><TABLE cellspacing="0" width="80%"><TR><TD><img src="images/system/icon/icon_statusbar_left.png"></TD><TD></TD><TD align="right"><img src="images/system/icon/icon_statusbar_right.png"></TD></TR></TABLE></center>'