[fixed] missing menu variables in etoexhib

locations/etoexhib.qsrc

@@ -576,8 +576,10 @@ if $ARGS[0] = 'pos16':
 end
 
 if $ARGS[0] = 'pos17':
-	cla
-	*clr
+	*clr & cla
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos17'
+	menu_off = 0
 	gs 'stat'
 	'<center><b><font color="maroon">community center</font></b></center>'
 
@@ -595,12 +597,17 @@ if $ARGS[0] = 'pos17':
 end
 
 if $ARGS[0] = 'pos18':
-	cla
-	*clr
+	*clr & cla
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos18'
+	menu_off = 0
 	gs 'stat'
 	'<center><b><font color="maroon">Disco</font></b></center>'
 
+	act 'Go outside':gt 'etoexhib', 'pos17'
+	
 	if hour < 23:
+		menu_off = 1
 		temp = rand(1, 100)
 
 		if temp >= 1 and temp < 35:
@@ -609,8 +616,7 @@ if $ARGS[0] = 'pos18':
 			'The dance floor is full of people. All are dancing and having fun.'
 
 			act 'Dance':
-				cla
-				*clr
+				*clr & cla
 				minut += 30
 				fat -= 1
 
@@ -689,14 +695,14 @@ if $ARGS[0] = 'pos18':
 		end
 	else
 		'The Club closes, the lights go off, the music fades and everyone begins to leave.'
-	end
-
-	act 'Go outside':gt 'etoexhib', 'pos17'
+	end	
 end
 
 if $ARGS[0] = 'pos19':
-	cla
-	*clr
+	*clr & cla
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos19'
+	menu_off = 0
 	gs 'stat'
 	'<center><b><font color="maroon">Reception</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_holl.jpg"></center>'
@@ -704,6 +710,7 @@ if $ARGS[0] = 'pos19':
 
 	if workPTU = 2:
 		*clr & cla
+		menu_off = 1
 		pcs_mood -= 50
 		workPTU = 1
 		teachlevel = 0
@@ -726,12 +733,14 @@ if $ARGS[0] = 'pos19':
 	if teachlevel >= 70 and teachlevel < 90:'Your experience and knowledge is known outside the Lyceum.'
 	if teachlevel >= 90:'You are the personification of education.'
 
+	act 'On the street':gt 'etoexhib', 'pos20'
 	if workPTU > 2:
 		act 'Go to the corridor on this floor':gt 'etoexhib', 'pos22'
 		act 'Go to the second floor corridor':gt 'etoexhib', 'pos23'
 		act 'Go to the third floor corridor':gt 'etoexhib', 'pos24'
 	elseif workPTU ! 1:
 		act 'Visit the personnel department.':
+			menu_off = 1
 			if workPTU > 2:
 				cla
 				*clr
@@ -786,13 +795,13 @@ if $ARGS[0] = 'pos19':
 			end
 		end
 	end
-
-	act 'On the street':gt 'etoexhib', 'pos20'
 end
 
 if $ARGS[0] = 'pos20':
-	cla
-	*clr
+	*clr & cla
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos20'
+	menu_off = 0
 	gs 'stat'
 	'<center><b><font color="maroon">High School</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/lizey.jpg"></center>'
@@ -802,21 +811,23 @@ if $ARGS[0] = 'pos20':
 
 	if teachlevel > 0 and teachlevel < 10:workPTU = 2
 
-	act 'Enter the Lyceum':gt 'etoexhib', 'pos19'
 	act 'Leave':minut += 15 & gt 'pavCommercial'
+	act 'Enter the Lyceum':gt 'etoexhib', 'pos19'
 end
 
 if $ARGS[0] = 'pos21':
-	cla
-	*clr
+	*clr & cla
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos22'
+	menu_off = 0
 	gs 'stat'
 	'<center><b><font color="maroon">Playground</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/stadion.jpg"></center>'
 	'You see all that remains of a football field. Pathetic. Nevertheless, the guys are still having fun playing football here.'
-	temp = rand(1, 100)
 
-	if temp >= 90:
+	if rand(1,100) >= 90:
 		*clr & cla
+		menu_off = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_fight.jpg"></center>'
 		'You see a group of girls, mocking and kicking a young man.'
@@ -837,15 +848,15 @@ if $ARGS[0] = 'pos21':
 end
 
 if $ARGS[0] = 'pos22':
-	cla
-	*clr
+	*clr & cla
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos22'
+	menu_off = 0
 	gs 'stat'
 	'<center><b><font color="maroon">Corridor (1st floor)</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_1korr.jpg"></center>'
 	'On the first floor there is a medical office, the HR offices, a gym, a dining room and some classes.'
-	temp = rand(1, 100)
-
-	if temp >= 90:
+	if rand(1,100 >= 90:
 		*clr & cla
 		pcs_horny += 5
 		gs 'stat'
@@ -855,23 +866,25 @@ if $ARGS[0] = 'pos22':
 		act 'Next':gt 'etoexhib', 'pos22'
 	end
 
+	act 'Go inside the hall':gt 'etoexhib', 'pos19'
 	act 'Go inside the gym':gt 'etoexhib', 'pos33'
 	act 'Go inside the medical office':gt 'etoexhib', 'pos36'
 	act 'Go inside the dining room':gt 'etoexhib', 'pos37'
-	act 'Go inside the hall':gt 'etoexhib', 'pos19'
 end
 
 if $ARGS[0] = 'pos23':
-	cla
-	*clr
+	*clr & cla
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos23'
+	menu_off = 0
 	gs 'stat'
 	'<center><b><font color="maroon">Corridor (2nd floor)</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_2korr.jpg"></center>'
 	'On this floor there are classrooms, the principal''s office, a library and the teacher''s toilet.'
-	temp = rand(1, 100)
 
-	if temp >= 90:
+	if rand(1, 100) >= 90:
 		*clr & cla
+		menu_off = 0
 		pcs_horny += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_korr1.jpg"></center>'
@@ -887,27 +900,30 @@ if $ARGS[0] = 'pos23':
 end
 
 if $ARGS[0] = 'pos24':
-	cla
-	*clr
+	*clr & cla
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos24'
+	menu_off = 0
 	gs 'stat'
 	'<center><b><font color="maroon">Corridor (3rd floor)</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_3korr.jpg"></center>'
 	'On this floor there is a class of optional subjects.'
 
-	if hour >= 9 and hour <= 13:act 'Go in class':gt 'etoexhib', 'pos25'
+	act 'Go inside the hall':gt 'etoexhib', 'pos19'
+	if hour >= 9 and hour <= 13:act 'Go to class':gt 'etoexhib', 'pos25'
 	if hour >= 14 and hour < 15:act 'Start teaching':gt 'etoexhib', 'pos26'
-	if hour >= 15 and hour <= 18:act 'Go in class':gt 'etoexhib', 'pos25'
+	if hour >= 15 and hour <= 18:act 'Go to class':gt 'etoexhib', 'pos25'
 	if hour >= 7 and hour <= 20:act 'Staff room':gt'etoexhib','pos24tk'
-
-	act 'Go inside the hall':gt 'etoexhib', 'pos19'
 end
 
 if $ARGS[0] = 'pos24tk':
 	$metkaM = 'pos24tk'
 	$locM = 'etoexhib'
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos24tk'
+	menu_off = 0
 	$location_type = 'public_indoors'
-	cla
-	*clr
+	*clr & cla
 	gs'stat'
 	minut +=10
 	'<center><b><font color = maroon>Teacher</font></b></center>'
@@ -916,26 +932,14 @@ if $ARGS[0] = 'pos24tk':
 	'On the wall near the front door hanging <a href="exec:gt ''mirror'',''start''">mirror</a>.'
 	'In one corner there is a small old sofa.'
 
-	$prositdirizv = {
-		*clr & cla
-		cla
-		gs'stat'
-		set izvad = 1
-		set pzptu = 1
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_angdir.jpg" ></center>'
-		'You stand back up and see the Director apologizing for your actions.'
-		'The Director tells you that you need will come to her study in your free time.'
-		act 'Leave':gt'etoexhib','pos24'
-	}
-
 	act 'Lie down on the couch':
 		cla
 		minut += 30
 
 		if pcs_sleep < 90:
-		pcs_sleep += 10
+			pcs_sleep += 10
 		else
-		pcs_sleep = 100
+			pcs_sleep = 100
 		end
 		'You relax on the couch.'
 
@@ -943,27 +947,26 @@ if $ARGS[0] = 'pos24tk':
 	end
 
 	if hour >= 14 and hour <= 15:
-		temp = RAND(1,100)
+		temp = rand(1,100)
 		if temp >= 90:
 			*clr & cla
+			menu_off = 1
 			minut += 6
 			pcs_mood -= 10
 			pcs_willpwr -= 10
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_angdir.jpg"></center>'
 			'"<<$pcs_nickname>>, where were you? Do you know what is happening in your class right now? I can tell you: there''s some confusion, walking around and there''s even an, pardon the expression, orgy. Go immediately to class, calm everyone down and teach your lesson through the remaining time as is expected of you".'
-			if pcs_dom < SUB and izvad = 0:
-				cla
-				*clr
-				minut = minut + 5
+			if pcs_dom < sub and izvad = 0:
+				*clr & cla
+				minut += 5
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_angdir.jpg"></center>'
-				'You <a href="exec:dynamic $prositdirizv">ask</a> for forgiveness of the Director.'
+				'You <a href="exec: gs ''etoexhib'', ''pos24_director'' ">ask</a> for forgiveness of the Director.'
 				exit
-			elseif pcs_dom > SUB and izvad = 0:
-				cla
-				*clr
-				minut = minut + 5
+			elseif pcs_dom > sub and izvad = 0:
+				*clr & cla
+				minut += 5
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_angdir.jpg"></center>'
 				'You agree with your error and say that in the future this will not happen again.'
@@ -971,13 +974,11 @@ if $ARGS[0] = 'pos24tk':
 				exit
 			end
 		end
-	end
-
-	if hour >= 9 and hour <= 12:
-		temp = RAND(1,100)
+	elseif hour >= 9 and hour <= 12:
+		temp = rand(1,100)
 		if temp >= 90:
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			minut += 60
 			teachlevel += 2
 			gs'stat'
@@ -990,9 +991,21 @@ if $ARGS[0] = 'pos24tk':
 	act 'In the corridor':gt'etoexhib','pos24'
 end
 
+if $ARGS = 'pos24_director':
+	*clr & cla
+	menu_off = 1
+	gs'stat'
+	izvad = 1
+	pzptu = 1
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_angdir.jpg" ></center>'
+	'You stand back up and see the Director apologizing for your actions.'
+	'The Director tells you that you need will come to her study in your free time.'
+	act 'Leave':gt'etoexhib','pos24'
+end
+
 if $ARGS[0] = 'pos25':
-	cla
-	*clr
+	*clr & cla
+	menu_off =1
 	gs 'stat'
 	'<center><b><font color="maroon">Cabinet</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_klass.jpg"></center>'
@@ -1032,9 +1045,8 @@ if $ARGS[0] = 'pos25':
 
 		act 'Next':gt 'etoexhib', 'pos25'
 	end
-	if teachlevel > 10: act 'Read the school magazine':gt 'etoexhib', 'pos90'
-
 	act 'Get out into the corridor':gt 'etoexhib', 'pos24'
+	if teachlevel > 10: act 'Read the school magazine':gt 'etoexhib', 'pos90'
 end
 
 if $ARGS[0] = 'pos26':
@@ -1047,30 +1059,18 @@ if $ARGS[0] = 'pos26':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_lesson0.jpg"></center>'
 		'You went to your classroom and are ready to start the exercises. Your pupils, divided into groups, talk to each other, some are laughing, some chatting on the phone, others are eating. Basically any other youth.'
 
-		act 'Post activity':
-			cla
-			minut = 0
-			hour = 14
-			gt'etoexhib','pos27'
-		end
-	end
-
-	if pzptu = 1:
+		act 'Post activity': minut = 0 & hour = 14 & gt'etoexhib','pos27'
+	elseif pzptu = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_lesson1xl.jpg"></center>'
 		'You went to class and were stunned by what they saw, in class it was madness and mayhem. '
 
-		act 'Post activity':
-			cla
-			minut += 5
-			pzptu = 0
-			gt'etoexhib','pos27'
-		end
+		act 'Post activity': minut += 5 & pzptu = 0 & gt'etoexhib','pos27'
 	end
 end
 
 if $ARGS[0] = 'pos27':
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	minut += 5
 	gs 'stat'
 	'<center><b><font color="maroon">Cabinet</font></b></center>'
@@ -1193,11 +1193,7 @@ if $ARGS[0] = 'pos27':
 			cla
 			'The lesson ends and the students rush to leave the classroom.'
 
-			act 'Leave':
-				cla
-				minut += 5
-				gt 'etoexhib', 'pos24'
-			end
+			act 'Leave': minut += 5 & gt 'etoexhib', 'pos24'
 		end
 	end
 
@@ -1205,16 +1201,14 @@ if $ARGS[0] = 'pos27':
 end
 
 if $ARGS[0] = 'pos28':
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	gs 'stat'
 	'<center><b><font color="maroon">Direction</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_dir.jpg"></center>'
 	if izvad = 0:
 		'"Welcome, <<$pcs_nickname>>! Hope you like working with us. If you have any questions for me, I''m listening."'
-	end
-
-	if izvad = 1:
+	elseif izvad = 1: 
 		'"Hello again, <<$pcs_nickname>>."'
 	end
 
@@ -1222,21 +1216,25 @@ if $ARGS[0] = 'pos28':
 end
 
 if $ARGS[0] = 'pos33':
-	cla
-	*clr
+	*clr & cla
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos33'
+	menu_off = 0
 	gs 'stat'
 	'<center><b><font color="maroon">Gym</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/sportzal.jpg"></center>'
 	'Gym for team sports.'
 
+	act 'Go to the hall':gt 'etoexhib', 'pos19'
 	act 'Women''s Shower':gt 'etoexhib', 'pos34'
 	act 'Men''s shower':gt 'etoexhib', 'pos35'
-	act 'Go to the hall':gt 'etoexhib', 'pos19'
 end
 
 if $ARGS[0] = 'pos34':
-	cla
-	*clr
+	clr & cla
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos34'
+	menu_off = 0
 	minut += 15
 	gs 'stat'
 	'<center><b><font color="maroon">Women''s Shower</font></b></center>'
@@ -1246,6 +1244,7 @@ if $ARGS[0] = 'pos34':
 
 	if temp >= 90:
 		*clr & cla
+		menu_off = 1
 		minut += 15
 		pcs_horny += 20
 		gs 'stat'
@@ -1261,8 +1260,8 @@ if $ARGS[0] = 'pos34':
 end
 
 if $ARGS[0] = 'pos35':
-	cla
-	*clr
+	*clr & cla
+	menu_off = 1
 	minut += 15
 	teachlevel -= 1
 	gs 'stat'
@@ -1274,8 +1273,10 @@ if $ARGS[0] = 'pos35':
 end
 
 if $ARGS[0] = 'pos36':
-	cla
-	*clr
+	*clr & cla
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos36'
+	menu_off = 0
 	minut += 15
 	gs 'stat'
 	'<center><b><font color="maroon">Doctor</font></b></center>'
@@ -1285,6 +1286,7 @@ if $ARGS[0] = 'pos36':
 
 	if temp >= 90:
 		*clr & cla
+		menu_off = 1
 		minut += 15
 		pcs_horny += 10
 		gs 'stat'