Merge remote-tracking branch 'Blatte/master'

locations/HotelAdmin.qsrc

@@ -2,6 +2,7 @@
 $metka = $ARGS[0]
 $loc = $CURLOC
 $location_type = 'event'
+menu_off = 1
 
 clr
 gs'stat'

locations/HotelHole.qsrc

@@ -4,6 +4,9 @@ CLOSE ALL
 $metka = $ARGS[0]
 $prevloc = $loc
 $loc = $CURLOC
+$menu_loc = 'HotelHole'
+$menu_arg = ''
+menu_off = 0
 $location_type = 'public_indoors'
 
 clr
@@ -172,6 +175,7 @@ end
 
 if $ARGS[0] = 'Pavlin' :
 	*clr & cla
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/pavlin/pavlin.jpg"></center>'
 	'Varsonofy Krestovoz is a small time gangster who makes his money by whoring out vulnerable women in Pavlovsk. Few people know his name as he is usually called Pavlin (the Peacock).'

locations/HotelRoom.qsrc

@@ -6,6 +6,9 @@ $locM = 'HotelRoom'
 $metka = 'normal'
 $loc = 'HotelRoom'
 $location_type = 'private'
+$menu_loc = 'HotelRoom'
+$menu_arg = 'normal'
+menu_off = 0
 clr
 gs 'stat'
 	cla
@@ -40,6 +43,9 @@ $metkaM = 'better'
 $locM = 'HotelRoom'
 $metka = 'better'
 $loc = 'HotelRoom'
+$menu_loc = 'HotelRoom'
+$menu_arg = 'better'
+menu_off = 0
 $location_type = 'private'
 clr
 gs 'stat'
@@ -74,6 +80,9 @@ $metkaM = 'best'
 $locM = 'HotelRoom'
 $metka = 'best'
 $loc = 'HotelRoom'
+$menu_loc = 'HotelRoom'
+$menu_arg = 'best'
+menu_off = 0
 $location_type = 'private'
 clr
 gs 'stat'

locations/etoexhib.qsrc

@@ -2,12 +2,16 @@
 CLOSE ALL
 $metka = $ARGS[0]
 $loc = $CURLOC
+$menu_loc = 'etoexhib'
+$menu_arg = ''
+menu_off = 0
 $location_type = 'public_indoors'
 
 if $ARGS[0] = 'pos1':
 	cla
 	*clr
 	minut += 5
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/solar1.jpg"></center>'
 	'You walk into the room with the solarium. The room is quiet and with dim lights, seems like there is nobody in the solarium except for the administrator. You look at the door.'

locations/exhibitionistshop.qsrc

@@ -5,7 +5,10 @@ if $ARGS[0] = 'start':
 	$loc = 'exhibitionistshop'
 	$metka = 'start'
     $location_type = 'public_indoors'
-	cls
+	$menu_loc = 'exhibitionistshop'
+	$menu_arg = 'start'
+	menu_off = 0
+	cla & *clr
 	if exhibitionQW = 3: exhibitionQW = 4
 	gs 'stat'
 

locations/experiment.qsrc

@@ -3,6 +3,9 @@
 $loc = 'experiment'
 $location_type = private
 $locM = 'experiment'
+$menu_loc = 'experiment'
+$menu_arg = 'private'
+menu_off = 0
 
 $doc1 = 'Doctor Sokolnikov'
 $doc2 = 'Doctor Ivanov'
@@ -56,6 +59,7 @@ end
 
 if $ARGS[0] = 'deskTalk':
 	minut += 3
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse2.jpg"></center>'
 	*nl
@@ -376,6 +380,7 @@ end
 
 if $ARGS[0] = 'testarea:lockeroom:locker:meetAfrican':
 	minut += 2
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\africanmeet.jpg"></center>'
 	*nl
@@ -395,6 +400,7 @@ end
 
 if $ARGS[0] = 'testarea:lockeroom:locker:stareAfrican':
 	minut += 2
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\africanmeet.jpg"></center>'
 	*nl
@@ -410,6 +416,7 @@ end
 
 if $ARGS[0] = 'testarea:lockeroom:locker':
 	minut += 2
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\lockerroom.jpg"></center>'
 	*nl

locations/hairsalon.qsrc

@@ -1,7 +1,9 @@
 # hairsalon
 if $ARGS[0] = 'start':
-	cla
-	cls
+	cla & *clr
+	$menu_loc = 'hairsalon'
+	$menu_arg = 'start'
+	menu_off = 0
 	'<center><b><font color="maroon">The Golden Curl Salon</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/golden curl/golden curl.jpg"</center>'
 	'<center>A well reviewed hair salon, capable of creating the most beautiful hairstyles. For a price of course.</center>'

locations/hotel_resep.qsrc

@@ -1,5 +1,8 @@
 # hotel_resep
 cls
+$menu_loc = 'hotel_resep'
+$menu_arg = ''
+menu_off = 0
 gs'stat'
 '<center><H4>Hotel reception</H4></center>'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'

locations/husb.qsrc

@@ -2,8 +2,7 @@
 
 if $ARGS[0] = 'start':
 	CLOSE ALL
-	cls
-	cla
+	cla & *clr
 	gs'stat'
 	'<center><B><font color = maroon><<$husName>></font></B></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/<<HusbPic>>.jpg"></center>'

locations/husbSex.qsrc

@@ -6,6 +6,7 @@ if $ARGS[0] = 'room':
 	husbandsexday += 1
 	suprdolg += 1
 	sexrand = RAND(0,3)
+	menu_off = 1
 
 	gs 'themes', 'indoors'