remove obsolete variables

locations/Palatka.qsrc

@@ -9,7 +9,6 @@ if $ARGS[0] = 'start':
 	$menu_arg = 'start'
 	menu_off = 0
     $location_type = 'private'
-	palMir = 1
 	gs 'stat'
 	'<center><b><font color="maroon">tent</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/military/palatka.jpg"></center>'
@@ -20,7 +19,7 @@ if $ARGS[0] = 'start':
 
 	'To your surprise, the tent is a quite spacious. It has a bed, a <a href="exec:gt ''mirror'', ''start''">mirror</a>, and even has an improvised <a href="exec:gt ''vann'', ''start''">shower</a>.'
 
-	act 'Leave':palMir = 0 & gt 'Military', 'start'
+	act 'Leave': gt 'Military', 'start'
 
 	act 'Sleep':
 		minut += 480

locations/bed.qsrc

@@ -6,8 +6,8 @@ if $ARGS[0] = 'start':
 	shour = 24 - hour
 	gs 'stat'
 
-	if hour > 22 and rand(0, 100) < 2 and houserab = 1 and houserabday ! daystart and pcs_sleep < 50 and tanhouse1 = 1:gt 'bed', 'rab'
-	if hour > 22 and rand(0, 200) = 0 and housrA = 1 and husband = 0:gt 'bed', 'vor'
+	if hour > 22 and rand(0, 100) < 2 and houserab = 1 and houserabday ! daystart and pcs_sleep < 50 and $loc = 'nichBedroomServant':gt 'bed', 'rab'
+	if hour > 22 and rand(0, 200) = 0 and STRPOS('bedr,bedr2x,korr,korr2x',$loc) > 0 and husband = 0:gt 'bed', 'vor'
 
 	gt 'bed2'
 end
@@ -20,7 +20,7 @@ if $ARGS[0] = 'mast':
 	pcs_mood += 15
 	pcs_vag += 1
 
-	if husband > 0 and housrA = 1 and husbandrink ! 10:
+	if husband > 0 and STRPOS('bedr,bedr2x,korr,korr2x',$loc) > 0 and husbandrink ! 10:
 		if dildo > 0:
 			if week > 5 or (week < 6 and hour > 16):
 				cla
@@ -202,19 +202,9 @@ if $ARGS[0] = 'mast':
 end
 
 if $ARGS[0] = 'fin':
-	cla
-	menu_off = 1
-	if housrA = 1:
-		gt 'bedr'
-	end
-
-	if houseob = 1:
-		gt 'uni_dorm', 'dorm_room'
-	end
-
-	if tanhouse1 = 1:
-		gt 'nichBedroomServant'
-	end
+	if STRPOS('bedr,bedr2x,korr,korr2x',$loc) > 0: gt 'bedr'
+	if $loc = 'uni_dorm': gt 'uni_dorm', 'dorm_room'
+	if $loc = 'nichBedroomServant': gt 'nichBedroomServant'
 end
 
 if $ARGS[0] = 'rab':

locations/bedr.qsrc

@@ -13,8 +13,6 @@ $locclass = 'bedr'
 $location_type = 'private'
 
 minut += 1
-housrA = 1
-housrMir = 1
 elektro += 1
 gs 'stat'
 gs 'themes', 'indoors'

locations/bedr2x.qsrc

@@ -13,8 +13,6 @@ $locclass = 'bedr'
 $location_type = 'private'
 
 minut += 1
-housrA = 1
-housrMir = 1
 elektro += 1
 gs 'stat'
 gs 'themes', 'indoors'

locations/bordel.qsrc

@@ -104,15 +104,9 @@ if $ARGS[0] = 'dysh':
 	
 	act 'Return to your room':gt 'bordel', 'brothel'
 
-	act 'Bathroom functions':
-		bordysh = 1
-		gt 'vann', 'start'
-	end
+	act 'Bathroom functions': gt 'vann', 'start'
 
-	act 'Mirror':
-		borMir = 1
-		gt 'mirror', 'start'
-	end
+	act 'Mirror': gt 'mirror', 'start'
 
 	act 'Change your clothes': gt 'wardrobe', 'start'
 end

locations/brother_voyeur.qsrc

@@ -306,7 +306,7 @@ if $ARGS[0] = 'showertalk2':
 				act'Do it':
 					menu_off = 1
 					*clr & cla
-					if rand(0, 5) = 0 and obdysh = 1:gt 'vann', 'v4'
+					if rand(0, 5) = 0: gt 'vann', 'v4'
 					'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></center>'
 					'Unable to help yourself, you decide to risk it. After taking a quick look at your brother to make sure he''s still facing away you gently lower the showerhead between your legs.'
 					'As the pressure builds on your pussy your reponses to what your brother is saying become increasingly close to moans, often being monosyllabic or simple hums and your eyes squeeze tight as you concentrate on the sensation.'

locations/city_center.qsrc

@@ -18,16 +18,7 @@ if sound = 0:
 		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
 	end
 end
-clr
-palMir = 0
-bordysh = 0
-housrA = 0
-palMir = 0
-obdysh = 0
-tanhouse1 = 0
-obMir = 0
-houseob = 0
-borMir = 0
+
 !!sets return location when visiting the bank or post office
 bankloc = 1
 gs 'stat'

locations/city_residential.qsrc

@@ -48,24 +48,12 @@ if opusk > 0 or gnewQW = 5:
 end
 
 gs 'stat'
-palMir = 0
-bordysh = 0
-housrA = 0
-obdysh = 0
-tanhouse1 = 0
-obMir = 0
-houseob = 0
-borMir = 0
-$onobjsel = 'onobjsel'
 
 if gopdeath = 1 and vsehsdaladay ! daystart:
 	over = 6
 	gt 'gameover'
-	exit
 end
 
-housrA = 0
-
 if car > 0 and cardrive = 1 or cardrive = 8:
 	if cardrive = 8:
 		'<a href="exec: minut += 10 & gs ''carF'', ''start''">Your <<$car>></a> is in your driveway.'
@@ -88,12 +76,10 @@ if home_owned[1] > 0:
 
 		if (loh > 0 or gnewQW = 7) and gopdolg > 0 and hour >= 20 and gorand >= 80:
 			gt 'gopnew', 'start'
-			exit
 		end
 
 		if (opusk > 0 or gnewQW = 5) and hour >= 20 and gorand >= 80 and gopopusday ! daystart:
 			gt 'gopnew', 'start'
-			exit
 		end
 		minut += 1
 		gt 'korr'

locations/dimaHome.qsrc

@@ -211,7 +211,7 @@ if $ARGS[0] = 'bathroom2':
 
 			act '"Wash" your pussy':
 				*clr & cla
-				if obdysh = 1 and rand(0, 5) = 1:gt 'vann', 'v4'
+				if rand(0, 5) = 1:gt 'vann', 'v4'
 				minut += 10
 
 				'<center><video autoplay loop src="images/shared/home/bathroom/wash7.mp4"></center>'

locations/din_van.qsrc

@@ -157,7 +157,7 @@ $shower = {
 			act 'Use the shower head on your pussy':
 				menu_off = 1
 				*clr & cla
-				if rand(0, 5) = 0 and obdysh = 1:gt 'vann', 'v4'
+				if rand(0, 5) = 0 and $locM = 'uni_dorm':gt 'vann', 'v4'
 				'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></center>'
 				*nl
 				'You place the shower head onto your pussy and a powerful jet of warm water begins to caress you.'
@@ -262,7 +262,7 @@ $bath = {
 		act '"Wash" your pussy':
 			menu_off = 1
 			*clr & cla
-			if obdysh = 1 and rand(0, 5) = 1:gt 'vann', 'v4'
+			if $locM = 'uni_dorm' and rand(0, 5) = 1:gt 'vann', 'v4'
 			minut += 10
 
 			'<center><video autoplay loop src="images/shared/home/bathroom/wash7.mp4"></center>'
@@ -350,7 +350,7 @@ $brit = {
 					act '<<$shave_act>> (0:15)':
 						menu_off = 1
 						*clr & cla
-						if obdysh = 1 and rand(0, 5) = 0:gt 'vann', 'brit1'
+						if $locM = 'uni_dorm' and rand(0, 5) = 0:gt 'vann', 'brit1'
 						if $loc ='gadbana':
 							'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
 						elseif pcs_pubes <= 10 and shave_length = 2:
@@ -386,7 +386,7 @@ $brit = {
 					pcs_leghair = 0
 					pcs_horny += 5
 					stanok -= 1
-					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
+					if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
 					*nl
 					if daystart < 10 and StoryLine = 0 and ntstart = 0:
@@ -491,7 +491,7 @@ $brit = {
 				pcs_leghair = 0
 				pcs_horny += 5
 				stanok -= 1
-				if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
+				if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
 				*nl
 				if daystart < 10 and StoryLine = 0 and ntstart = 0:

locations/korr.qsrc

@@ -73,8 +73,6 @@ saunaYouRoom = 0
 boycherdaksex = 0
 bonusZ = 0
 minut += 1
-housrA = 1
-housrMir = 0
 elektro += 1
 
 gs 'stat'

locations/korr2x.qsrc

@@ -18,8 +18,6 @@ boycherdaksex = 0
 bonusZ = 0
 music_on = 0
 minut = minut + 1
-housrA = 1
-housrMir = 0
 elektro = elektro + 1
 gs'stat'
 

locations/liam.qsrc

@@ -11,15 +11,6 @@ menu_off = 0
 if sound = 0:PLAY 'sound/street.mp3',30
 *clr & cla
 gs'stat'
-bordysh = 0
-housrA = 0
-palMir = 0
-obdysh = 0
-tanhouse1 = 0
-obMir = 0
-obLoker = 0
-houseob = 0
-borMir = 0
 '<center><B>Pushkin Town Center</B></center>'
 if month >= 11 or month <= 3:
 	if hour >= 8 and hour <= 21:

locations/liames.qsrc

@@ -9,16 +9,6 @@ $menu_arg = ''
 menu_off = 0
 *clr & cla
 gs'stat'
-set bordysh=0
-set housrA=0
-set palMir=0
-set obdysh=0
-set tanhouse1=0
-set obMir=0
-set obLoker=0
-set houseob=0
-set borMir=0
-set borLoker=0
 
 '<center><B>Okhlopkov Square</B></center>'
 '<center><img <<$set_imgh>> src="images/locations/pushkin/liames.jpg" ></center>'

locations/nichApartment.qsrc

@@ -25,7 +25,6 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	if nichWork = 0: gt 'nichApartment', 'visitTanya'
 
 	*clr & cla
-	tanhouse1 = 1
 	$location_type = 'private'
 	killvar '$locclass'
 		

locations/nichBedroomServant.qsrc

@@ -13,8 +13,6 @@ $menu_loc = 'nichBedroomServant'
 $menu_arg = ''
 menu_off = 0
 
-tanhouse1 = 1
-
 !! Has to happen before there is any output
 if nichWork = 2:
 	if nichLastWorkDay ! daystart: gs 'nichUtil', 'startWorkday'

locations/selfplay.qsrc

@@ -345,7 +345,7 @@ if $ARGS[0] = 'start':
 								selfplaytime += 15
 								gs 'selfplay', 'sis_prov'
 
-								if husband > 0 and housrA = 1 and husbandrink ! 10 and $loc = 'bedr': gt 'husbsex','husb_mastr_vtor'
+								if husband > 0 and husbandrink ! 10 and $loc = 'bedr': gt 'husbsex','husb_mastr_vtor'
 
 								!!if $loc = 'bedrPar':'<center><img <<$set_imgh>> src="images/shared/sex/mast/dildo.jpg"></center>'
 								if $loc = 'vanrPar':
@@ -366,7 +366,7 @@ if $ARGS[0] = 'start':
 							selfplaytime += 15
 							gs 'selfplay', 'sis_prov'
 
-							if husband > 0 and housrA = 1 and husbandrink ! 10 and $loc = 'bedr': gt 'husbsex','husb_mastr_vtor'
+							if husband > 0 and husbandrink ! 10 and $loc = 'bedr': gt 'husbsex','husb_mastr_vtor'
 
 							!!if $loc = 'bedrPar':'<center><img <<$set_imgh>> src="images/shared/sex/mast/dildo.jpg"></center>'
 							if $loc = 'vanrPar':

locations/uni_dorm.qsrc

@@ -253,7 +253,6 @@ if $ARGS[0] = 'tenth_floor':
 	act 'Leave':gt 'uni_dorm', 'elevator'
 	act 'Go to the shared shower':
 		minut += 1
-		obdysh = 1
 		gt 'vann', 'start'
 	end
 

locations/vann.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'start':
 	cls
 	gs 'stat'
 
-	if obdysh = 1 and vannin = 0:
+	if $locM = 'uni_dorm' and vannin = 0:
 		vanobrand = rand(0, 15)
 		vannin = 1
 
@@ -22,7 +22,7 @@ if $ARGS[0] = 'start':
 
 	act 'Leave the room':gt 'vann', 'fin'
 
-	if obdysh = 1 or palMir = 1 or bordysh = 1:	gs 'din_van', 'private'
+	if StrPos('uni_dorm,Palatka,bordel',$locM)>0 : gs 'din_van', 'private'
 end
 
 if $ARGS[0] = 'fin':