Bug fixes for all locations beginning with M

- Location 'the_film' again is now 'film' as it should be

locations/Mall

@@ -19,7 +19,7 @@ elseif car > 0 and benzin <= 0:
 	gs 'stat'
 	'You ran out of gas and you had to go on the bus, paying the fare of 20 rubles.'
 end
-act 'Buy':gt 'RynokP', 'the_choice'
+act 'Buy':gt 'RynokP', 'selection'
 act 'Go home':gt 'street'
 
 if rinwork > 0 and hour < 9:
@@ -50,7 +50,7 @@ if rinwork > 0 and hour < 9:
 				act 'Go home':gt 'street'
 			end
 
-			act 'Ogle':gt 'RynokHoz', 'the_beginning'
+			act 'Ogle':gt 'RynokHoz', 'beginning'
 		elseif rinrand < 60 and palevorin = 0 and rinhoz = 1:
 			act 'Go home':gt 'street'
 		elseif rinrand >= 60 and palevorin = 0 and rinhoz = 1:
@@ -64,7 +64,7 @@ if rinwork > 0 and hour < 9:
 				act 'Go home':gt 'street'
 			end
 
-			act 'Ogle':gt 'RynokHoz', 'the_beginning'
+			act 'Ogle':gt 'RynokHoz', 'beginning'
 		elseif rinrand < 60 and palevorin = 1:
 			'On the market there is a rumor among the sellers that you fucks boss tray'
 
@@ -80,7 +80,7 @@ if rinwork > 0 and hour < 9:
 				act 'Go home':gt 'street'
 			end
 
-			act 'Ogle':gt 'RynokHoz', 'the_beginning'
+			act 'Ogle':gt 'RynokHoz', 'beginning'
 		elseif rinrand < 40 and palevorin = 2:
 			'On the market there is a rumor among the sellers that you fucks boss tray with buddies'
 			slutrand = rand(1, 100)
@@ -103,7 +103,7 @@ if rinwork > 0 and hour < 9:
 				act 'Go home':gt 'street'
 			end
 
-			act 'Ogle':gt 'RynokHoz', 'the_beginning'
+			act 'Ogle':gt 'RynokHoz', 'beginning'
 		elseif rinrand >= 70 and palevorin = 2:
 			'To you approached the owner of the tent c already familiar to you guys and they began to entice you to perform oral sex, promising to write premium'
 
@@ -192,7 +192,7 @@ if rinokTorg = 1 and rinhour ! number:
 	act 'Dismiss saleswoman':
 		cla
 		rinokTorg = 0
-		'You hired fired saleswoman'
+		'You fired saleswoman'
 
 		act 'Go home':gt 'street'
 	end

locations/Maria1

@@ -1,7 +1,7 @@
 # Maria1
 '- How can I help you?'
 
-act 'Move away':gt 'the_stand'
+act 'Move away':gt 'rack'
 
 if nom_1 = 0:
 	act 'Ask about plans for the evening':
@@ -28,9 +28,9 @@ if nomer = 0:
 	*clr
 
 	act 'Stay':
+		cla
 		'- I would like to stay'
 		'- Well, what would you like?'
-		cla
 
 		act 'Cheap room':
 			'- Cheap room'
@@ -86,7 +86,7 @@ if nom_1 = 1 and flag = 0:
 		'Thank you for using our services'
 		'Your room <<nom_nom>>'
 
-		act 'Goodbye':gt 'the_stand'
+		act 'Goodbye':gt 'rack'
 	end
 
 	act 'Change Your Mind':
@@ -97,7 +97,7 @@ if nom_1 = 1 and flag = 0:
 end
 
 if nom_1 = 0:
-	act 'Move away':gt 'the_stand'
+	act 'Move away':gt 'rack'
 end
 
 --- Maria1 ---------------------------------

locations/Menu.Add

@@ -4,7 +4,7 @@ if $ARGS[0] = '' or $ARGS[1] = '':EXIT
 if $ARGS[1] = '---' or lcase($ARGS[1]) = 'separator':
 	dynamic "$otg_Menyu_<<$ARGS[0]>>[] = '-:-'"
 
-	EXIT
+	exit
 end
 !!----------
 ARGS[10] = arrsize('ARGS')
@@ -17,8 +17,8 @@ if $ARGS[2] <> '':$ARGS[2] = ':' + replace($ARGS[2], '''', '''''')
 if $ARGS[3] <> '':$ARGS[3] = replace($ARGS[3], '''', '''''')
 !!----------
 dynamic "
-	$<<$ARGS[0]>>[] = '<<$ARGS[1]>>Menu.Processing<<$ARGS[2]>>'
-	$<<$ARGS[0]>>_parameters[str(arrsize('<<$ARGS[0]>>'))+'_Z'] = '<<$ARGS[1]>>'
+	$<<$ARGS[0]>>[] = '<<$ARGS[1]>>:Menu.Processing<<$ARGS[2]>>'
+	$<<$ARGS[0]>>_parameters[str(arrsize('<<$ARGS[0]>>'))+'_W'] = '<<$ARGS[1]>>'
 	$<<$ARGS[0]>>_parameters[str(arrsize('<<$ARGS[0]>>'))+'_F'] = '<<$ARGS[3]>>'
 "
 !!----------
@@ -29,7 +29,7 @@ if ARGS[10] > 4:
 
 	if ARGS[11] < ARGS[10]:
 		if $ARGS[ARGS[11]] <> '':
-			$ARGS[3] += '''' + replace($ARGS[ARGS[11]], '''', '''''')+''''
+			$ARGS[3] += ',''' + replace($ARGS[ARGS[11]], '''', '''''') + ''''
 		else
 			if ARGS[ARGS[11]] <> 0:
 				$ARGS[3] += ', ' + str(ARGS[ARGS[11]])

locations/Menu.AddCondition

@@ -3,7 +3,7 @@ if $ARGS[0] = '' or $ARGS[1] = '':EXIT
 !!----------
 ARGS[10] = dyneval("Result = arrsize('otg_Menyu_<<$ARGS[0]>>')")
 
-if dyneval("$Result = $otg_Menyu_<<$ARGS[0]>>[<<ARGS[10]>>-1]") = '-:-':EXIT
+if dyneval("$Result = $otg_Menyu_<<$ARGS[0]>>[<<ARGS[10]>>-1]") = '-:-':exit
 !!----------
 dynamic "
 	$otg_Menyu_<<$ARGS[0]>>_parameters['<<ARGS[10]>>y'] = '<<replace($ARGS[1], '''', '''''')>>'

locations/Menu.AddEvent

@@ -1,6 +1,6 @@
 # Menu.AddEvent
 
-if $ARGS[0] = '' or $ARGS[1] = '':EXIT
+if $ARGS[0] = '' or $ARGS[1] = '':exit
 !!----------
 $ARGS[1] = lcase(trim($ARGS[1]))
 !!----------

locations/Menu.Chosen

@@ -1,6 +1,6 @@
 # Menu.Chosen
 
-if $ARGS[0] = '':EXIT
+if $ARGS[0] = '':exit
 Result = dyneval("Result = otg_Menyu_<<$ARGS[0]>>_selected")
 
 --- Menu.Chosen ---------------------------------

locations/Menu.Create

@@ -1,13 +1,13 @@
 # Menu.Create
 if $ARGS[0] = '':EXIT
 !!----------
-$ARGS[0] = 'otg_Menyu_'+$ARGS[0]
+$ARGS[0] = 'otg_Menyu_' + $ARGS[0]
 !!----------
 killvar '<<$ARGS[0]>>'
-killvar '<<$ARGS[0]>>_Parametry'
-killvar '<<$ARGS[0]>>_Vybrali'
+killvar '<<$ARGS[0]>>_Parameters'
+killvar '<<$ARGS[0]>>_Selected'
 killvar '<<$ARGS[0]>>_VybrannyyPunkt'
-killvar '<<$ARGS[0]>>_Vremya'
+killvar '<<$ARGS[0]>>_Time'
 killvar '<<$ARGS[0]>>_ModuliSobyty'
 
 --- Menu.Create ---------------------------------

locations/Menu.Destroy

@@ -1,6 +1,6 @@
 # Menu.Destroy
 
-if $ARGS[0] = '':EXIT
+if $ARGS[0] = '':exit
 
 GS 'Menu.Create', $ARGS[0]
 --- Menu.Destroy ---------------------------------

locations/Menu.Info

@@ -1,11 +1,11 @@
 # Menu.Info
-*NL 'Module to work with the menu'
-*NL 'Version:1.0'
-*NL 'Author:Olegus t.Gl. (C) 2011'
-*NL 'Website:http://olegus.ifiction.ru'
-*NL 'e-mail:olegus.tgl @ gmail.com'
-*NL 'icq:145540276'
-*NL 'Forum topic:http://forum.ifiction.ru/viewtopic.php?id = 1527'
+*nl 'Module to work with the menu'
+*nl 'Version:1.0'
+*nl 'Author:Olegus t.Gl. (C) 2011'
+*nl 'Website:http://olegus.ifiction.ru'
+*nl 'e-mail:olegus.tgl@gmail.com'
+*nl 'icq:145 540 276'
+*nl 'Forum topic:http://forum.ifiction.ru/viewtopic.php?id=1527'
 
 --- Menu.Info ---------------------------------
 

locations/meet

@@ -352,8 +352,8 @@ if $ARGS[0] = 'start':
 			exit
 		end
 	elseif venera >= 4:
-		'<center><img src="images/etogame/venera.jpg"></center>'
 		bfa = 0
+		'<center><img src="images/etogame/venera.jpg"></center>'
 		'<<$boyA>> take a closer look at you and said, "What have you got with the lips? They are very sore. Is that genital herpes? I''d better go, do not want to get infected. Goodbye."'
 
 		act 'Leave.':gt 'street'

locations/mother

@@ -23,7 +23,7 @@ act 'Move away':gt $loc, $metka
 if motherWorry = 1 and indorf = 0:
 	motherWorry = 0
 	mother -= 1
-	'Mother sleeps and stands in the hallway waiting for you. "Where are you shlyaeshsya? You know what hour in the court?"'
+	'Mama is awake and stands in the hallway waiting for you. "Where are you shlyaeshsya? You know what hour in the court?"'
 elseif motherWorry = 1 and indorf > 0:
 	motherWorry = 0
 end
@@ -32,7 +32,7 @@ if SchoolAtestat = 1 and SAtestatGift = 0:
 	SAtestatGift = 1
 	money += 5000
 	gs 'stat'
-	'Mum was delighted, "Now you graduated from high school and I want to give you five thousand rubles. Can buy myself a gift."'
+	'Mama was delighted, "Now you graduated from high school and I want to give you five thousand rubles. Can buy myself a gift."'
 end
 
 if hour > 5:
@@ -136,9 +136,9 @@ if hour > 5:
 					end
 				end
 			elseif mother >= 40 and mother < 60:
-				if motherPayDay = day:'Mother frowned "That thou Velcro. Received nothing!"'
-
-				if motherPayDay ! day:
+				if motherPayDay = day:
+					'Mother frowned "That thou Velcro. Received nothing!"'
+				elseif motherPayDay ! day:
 					mother -= 1
 					motherPayDay = day
 

locations/motherkafeboss

@@ -1,6 +1,6 @@
 # motherkafeboss
 gs 'stat'
-'Cafe owner and Glory tall.'
+'Cafe owner and Glory tall, thin man in his forties.'
 
 act 'Leave':gt $loc, $metka
 

locations/movie

@@ -0,0 +1,126 @@
+# movie
+if $ARGS[0] = 'movie':
+	cla
+	clr
+	gs 'stat'
+
+	!!pfilmA
+	if pfilmA >= 5:
+		cla
+		pfilmA = 0
+		pfilm = 0
+		film = film + 1
+		'You dosnyal in the film.'
+
+		act 'Approach to Peter':gt 'pornstudio', 'start'
+		act 'Finish':gt 'down'
+	end
+
+	if hour >= 22 and pfilmA < 5:
+		cla
+		'Time is too late for filming'
+
+		act 'Go home':gt 'down'
+	elseif hour < 22 and pfilmA < 5 and pfilm > 0:
+		cla
+		minut += 60
+		money += 1000
+
+		if pfilmA = 0:guy+= 1
+
+		bj += 1
+		pfilmA += 1
+		gs 'stat'
+		'You undress and start shooting.'
+		prand = rand(1, 2)
+
+		if prand = 1:
+			porand = rand(1, 10)
+
+			'<center><img src="images/picBJ/bj<<porand>>.jpg"></center>'
+			'You suck dick for an hour at the actor portraying the passion and lust. Really hard to concentrate when there are fixtures, Assistant, you continually shoved the camera to face.'
+		elseif prand = 2:
+			facial += 1
+			porand = rand(1, 10)
+
+			'<center><img src="images/picBJ/fa<<picrand>>.jpg"></center>'
+			'You suck dick for an hour at the actor portraying the passion and lust. He ends up on your face, you lick the sperm. You every minute shoved the camera in person, running an assistant and illuminators.'
+		end
+
+		act 'Finish':gt 'down'
+
+		if hour < 22:act 'Acting on':gt 'film', 'film'
+	end
+end
+
+if $ARGS[0] = 'movie2':
+cla
+clr
+gs 'stat'
+
+	!!pfilmB
+	if pfilmB >= 10:
+		cla
+		pfilmB = 0
+		pfilm = 0
+		film = film + 1
+		'You dosnyal in the film.'
+
+		act 'Approach to Peter':gt 'pornstudio', 'start'
+		act 'Go home':gt 'down'
+	end
+
+	if h >= 22 and pfilmB < 10:
+		cla
+		'Time is too late for filming'
+
+		act 'Go home':gt 'down'
+	elseif hour < 22 and pfilmB < 10 and pfilm > 0:
+		cla
+		minut += 60
+		money += 3000
+
+		if pfilmB = 0:guy += 1
+
+		pfilmB += 1
+		gs 'stat'
+		'You undress and start shooting.'
+		prand = rand(1, 3)
+
+		if prand = 1:
+			bj += 1
+			porand = rand(1, 10)
+			'<center><img src="images/picBJ/bj<<picrand>>.jpg"></center>'
+			'You suck dick for an hour at the actor portraying the passion and lust. Really hard to concentrate when there are fixtures, Assistant, you continually shoved the camera to face.'
+		elseif prand = 2:
+			anus += 1
+			anal += 1
+			porand = rand(1, 10)
+
+			'<center><img src="images/pics/anal<<picrand>>.jpg"></center>'
+			'An hour you fucked in the ass for the camera, you do not pleasant, but you portray passion and pleasure. Finally, the actor does not stand up and fills your ass with his sperm. You every minute shoved the camera in person, running an assistant and illuminators.'
+		elseif prand = 3:
+			sex += 1
+			vagina+= 1
+			facial += 1
+
+			porand = rand(0, 1)
+
+			if porand = 0:
+				picrand = rand(1, 5)
+				'<center><img src="images/pics/vagcow<<picrand>>.jpg"></center>'
+			else
+				picrand = rand(1, 5)
+				'<center><img src="images/pics/vagdog<<picrand>>.jpg"></center>'
+			end
+
+			'You have an hour before the camera, you portray passion and lust. He ends up on your face, you lick the sperm. You every minute shoved the camera in person, running an assistant and illuminators.'
+		end
+
+		act 'Go home':gt 'down'
+
+		if hour < 22:act 'Acting on':gt 'movie', 'movie2'
+	end
+end
+
+--- movie ---------------------------------

locations/the_film

@@ -1,177 +0,0 @@
-# the_film
-if $ARGS[0] = 'film':
-	cla
-	clr
-	gs 'stat'
-
-	!!pfilmA
-	if pfilmA >= 5:
-		cla
-		set pfilmA = 0
-		set pfilm = 0
-		film = film + 1
-		'You dosnyal in the film.'
-
-		act 'Approach to Peter':gt 'pornstudio', 'start'
-		act 'Finish':gt 'down'
-	end
-
-	if h >= 22 and pfilmA < 5:
-		cla
-		'Time is too late for filming'
-
-		act 'Go home':gt 'down'
-	end
-
-	if hour < 22 and pfilmA < 5 and pfilm > 0:
-		cla
-		set minut += 60
-		gs 'stat'
-		set money += 1000
-
-		if pfilmA = 0:set guy+= 1
-
-		bj += 1
-		set pfilmA += 1
-		'You undress and start shooting.'
-		set prand = rand(1, 2)
-
-		if prand = 1:
-			set porand = rand(1, 10)
-
-			if porand = 1:'<center><img src="images/picBJ/bj.jpg"></center>'
-			if porand = 2:'<center><img src="images/picBJ/bj2.jpg"></center>'
-			if porand = 3:'<center><img src="images/picBJ/bj3.jpg"></center>'
-			if porand = 4:'<center><img src="images/picBJ/bj4.jpg"></center>'
-			if porand = 5:'<center><img src="images/picBJ/bj5.jpg"></center>'
-			if porand = 6:'<center><img src="images/picBJ/bj6.jpg"></center>'
-			if porand = 7:'<center><img src="images/picBJ/bj7.jpg"></center>'
-			if porand = 8:'<center><img src="images/picBJ/bj8.jpg"></center>'
-			if porand = 9:'<center><img src="images/picBJ/bj9.jpg"></center>'
-			if porand = 10:'<center><img src="images/picBJ/bj10.jpg"></center>'
-
-			'You suck dick for an hour at the actor portraying the passion and lust. Really hard to concentrate when there are fixtures, Assistant, you continually shoved the camera to face.'
-		end
-
-		if prand = 2:
-			facial += 1
-			set porand = rand(1, 10)
-
-			if porand = 1:'<center><img src="images/picBJ/fa.jpg"></center>'
-			if porand = 2:'<center><img src="images/picBJ/fa2.jpg"></center>'
-			if porand = 3:'<center><img src="images/picBJ/fa3.jpg"></center>'
-			if porand = 4:'<center><img src="images/picBJ/fa4.jpg"></center>'
-			if porand = 5:'<center><img src="images/picBJ/fa5.jpg"></center>'
-			if porand = 6:'<center><img src="images/picBJ/fa6.jpg"></center>'
-			if porand = 7:'<center><img src="images/picBJ/fa7.jpg"></center>'
-			if porand = 8:'<center><img src="images/picBJ/fa8.jpg"></center>'
-			if porand = 9:'<center><img src="images/picBJ/fa9.jpg"></center>'
-			if porand = 10:'<center><img src="images/picBJ/fa10.jpg"></center>'
-
-			'You suck dick for an hour at the actor portraying the passion and lust. He ends up on your face, you lick the sperm. You every minute shoved the camera in person, running an assistant and illuminators.'
-		end
-
-		act 'Finish':gt 'down'
-
-		if hour < 22:act 'Acting on':gt 'film', 'film'
-	end
-end
-
-if $ARGS[0] = 'film2':
-cla
-clr
-gs 'stat'
-
-	!!pfilmB
-	if pfilmB >= 10:
-		cla
-		set pfilmB = 0
-		set pfilm = 0
-		film = film + 1
-		'You dosnyal in the film.'
-
-		act 'Approach to Peter':gt 'pornstudio', 'start'
-		act 'Go home':gt 'down'
-	end
-
-	if h >= 22 and pfilmB < 10:
-		cla
-		'Time is too late for filming'
-
-		act 'Go home':gt 'down'
-	end
-
-	if hour < 22 and pfilmB < 10 and pfilm > 0:
-		cla
-		set minut += 60
-		gs 'stat'
-		set money += 3000
-
-		if pfilmB = 0:guy += 1
-
-		set pfilmB += 1
-		'You undress and start shooting.'
-		set prand = rand(1, 3)
-
-		if prand = 1:
-			bj += 1
-			set porand = rand(1, 10)
-
-			if porand = 1:'<center><img src="images/picBJ/bj.jpg"></center>'
-			if porand = 2:'<center><img src="images/picBJ/bj2.jpg"></center>'
-			if porand = 3:'<center><img src="images/picBJ/bj3.jpg"></center>'
-			if porand = 4:'<center><img src="images/picBJ/bj4.jpg"></center>'
-			if porand = 5:'<center><img src="images/picBJ/bj5.jpg"></center>'
-			if porand = 6:'<center><img src="images/picBJ/bj6.jpg"></center>'
-			if porand = 7:'<center><img src="images/picBJ/bj7.jpg"></center>'
-			if porand = 8:'<center><img src="images/picBJ/bj8.jpg"></center>'
-			if porand = 9:'<center><img src="images/picBJ/bj9.jpg"></center>'
-			if porand = 10:'<center><img src="images/picBJ/bj10.jpg"></center>'
-
-			'You suck dick for an hour at the actor portraying the passion and lust. Really hard to concentrate when there are fixtures, Assistant, you continually shoved the camera to face.'
-		end
-
-		if prand = 2:
-			anus += 1
-			set anal += 1
-			set porand = rand(1, 10)
-
-			if porand = 1:'<center><img src="images/pics/anal.jpg"></center>'
-			if porand = 2:'<center><img src="images/pics/anal2.jpg"></center>'
-			if porand = 3:'<center><img src="images/pics/anal3.jpg"></center>'
-			if porand = 4:'<center><img src="images/pics/anal4.jpg"></center>'
-			if porand = 5:'<center><img src="images/pics/anal5.jpg"></center>'
-			if porand = 6:'<center><img src="images/pics/anal6.jpg"></center>'
-			if porand = 7:'<center><img src="images/pics/anal7.jpg"></center>'
-			if porand = 8:'<center><img src="images/pics/anal8.jpg"></center>'
-			if porand = 9:'<center><img src="images/pics/anal9.jpg"></center>'
-			if porand = 10:'<center><img src="images/pics/anal10.jpg"></center>'
-
-			'An hour you fucked in the ass for the camera, you do not pleasant, but you portray passion and pleasure. Finally, the actor does not stand up and fills your ass with his sperm. You every minute shoved the camera in person, running an assistant and illuminators.'
-		end
-
-		if prand = 3:
-			set sex += 1
-			vagina+= 1
-			facial += 1
-
-			set porand = rand(0, 1)
-
-			if porand = 0:
-				picrand = rand(1, 6)
-				'<center><img src="images/pics/vagcow<<picrand>>.jpg"></center>'
-			else
-				picrand = rand(1, 5)
-				'<center><img src="images/pics/vagdog<<picrand>>.jpg"></center>'
-			end
-
-			'You have an hour before the camera, you portray passion and lust. He ends up on your face, you lick the sperm. You every minute shoved the camera in person, running an assistant and illuminators.'
-		end
-
-		act 'Go home':gt 'down'
-
-		if hour < 22:act 'Acting on':gt 'film', 'film2'
-	end
-end
-
---- the_film ---------------------------------