[changed] small changes to phone_selfies in preparation to upload/send selfies

locations/phone_selfies.qsrc

@@ -190,15 +190,35 @@ if $ARGS[0] = 'Phone_selfie_totals':
 	selfieBathtot[11] = 0
 	selfieShowertot[11] = 0
 	selfieSwimtot[11] = 0
-	
 end
 
+if $ARGS[0] = 'send_selfie_handler':
+	temp_ssh_ret_loc = $ARGS[1]
+	temp_ssh_ret_arg = $ARGS[2]
+	temp_suppress_other_selfies = 1
+
+	gt 'phone_selfies', 'selfies'
+end
 
 if $ARGS[0] = 'selfies':
 	menu_off = 0
+
 	gs 'phone_selfies', 'Phone_selfie_totals'
+	gs 'phone_selfies', 'set_selfie_layout'
+
+	gs 'phone_selfies', 'act_exit'
+end
+
+if $ARGS[0] = 'act_exit':
+	act 'Stop watching selfies':
+		killvar 'temp_suppress_other_selfies'
+		gt $menu_loc, $menu_arg
+	end
+end
+
+
+if $ARGS[0] = 'set_selfie_layout':
 	*clr & cla
-	
 	'<center><h4><font color="maroon">Photo library</font></h4></center>'
 	*nl
 	'Selfies'
@@ -209,32 +229,31 @@ if $ARGS[0] = 'selfies':
 		temp_locationCnt += 1
 	if temp_locationCnt < arrsize('$selfieLoc'): jump'LocationLoop'
 
-	*nl
-	'Family and friends'
-	'<a href="exec:gt ''phone_selfies'', ''family''">Family</a>'
-	'<a href="exec:gt ''phone_selfies'', ''school''">School friends</a>'
-	'<a href="exec:gt ''phone_selfies'', ''teacher''">Teachers</a>'
-	'<a href="exec:gt ''phone_selfies'', ''pavlovsk''">Pavlovsk friends</a>'
-	'<a href="exec:gt ''phone_selfies'', ''city''">City friends</a>'
-	!gt $loc, $loc_arg
-	act 'Stop watching selfies': gt $menu_loc, $menu_arg
+	if temp_suppress_other_selfies = 0:
+		*nl
+		'Family and friends'
+		'<a href="exec:gt ''phone_selfies'', ''family''">Family</a>'
+		'<a href="exec:gt ''phone_selfies'', ''school''">School friends</a>'
+		'<a href="exec:gt ''phone_selfies'', ''teacher''">Teachers</a>'
+		'<a href="exec:gt ''phone_selfies'', ''pavlovsk''">Pavlovsk friends</a>'
+		'<a href="exec:gt ''phone_selfies'', ''city''">City friends</a>'
+	end
 end
 
 !! ARGS[1] is the index of the location in $selfieLoc[]
 if $ARGS[0] = 'showlocation':
-
 	'<center><h4><font color="maroon"><<$selfieLocDesc[ARGS[1]]>> selfies</font></h4></center>'
 	*nl
 	gs 'phone_selfies', 'listretrieve', ARGS[1]
 	
 	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $loc_arg
-	act 'Stop watching selfies': gt $menu_loc, $menu_arg
+	gs 'phone_selfies', 'act_exit'
 end
 
 
 !! ARGS[1] is the index of the location in $selfieLoc[]
 if $ARGS[0] = 'listretrieve':
+	$temp_selfie_loc = $selfieLoc[ARGS[1]]
 
 	!!Loop for clothed selfies, dynamics set variables as mixing them in loop instructions is bad
 	if selfieClotot[ARGS[1]] > 0:
@@ -244,9 +263,9 @@ if $ARGS[0] = 'listretrieve':
 		:temp_loop
 			!!setting value to unmixed variable so it can be checked in the if below
 			dynamic 'phone_locval = <<$selfieLoc[ARGS[1]]>>_closelfie[<<temp_clocnt>>]'
-			if phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''clothed'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_clocnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/clothed/<<$selfieFilePrefix[ARGS[1]]>><<temp_clocnt>>.jpg"     height="150" /></a>  '
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'clothed', ARGS[1], temp_clocnt)
 			temp_clocnt += 1
-		if temp_clocnt <= selfieClotot[ARGS[1]]: jump'temp_loop'
+		if temp_clocnt <= selfieClotot[ARGS[1]]: jump 'temp_loop'
 	end
 	
 	!!Loop for swimwear selfies, dynamics set variables as mixing them in loop instructions is bad
@@ -257,9 +276,9 @@ if $ARGS[0] = 'listretrieve':
 		:temp_loop1
 			!!setting value to unmixed variable so it can be checked in the if below
 			dynamic 'phone_locval = <<$selfieLoc[ARGS[1]]>>_swim[<<temp_clocnt>>]'
-			if phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''bikini'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_clocnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/bikini/<<$selfieFilePrefix[ARGS[1]]>><<temp_clocnt>>.jpg"     height="150" /></a>  '
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'bikini', ARGS[1], temp_clocnt)
 			temp_clocnt += 1
-		if temp_clocnt <= selfieSwimtot[ARGS[1]]: jump'temp_loop1'
+		if temp_clocnt <= selfieSwimtot[ARGS[1]]: jump 'temp_loop1'
 	end
 		
 	!!loop for underwear selfies
@@ -269,9 +288,9 @@ if $ARGS[0] = 'listretrieve':
 		temp_undcnt = 1
 		:temp_loop2
 			dynamic 'phone_locval = <<$selfieLoc[ARGS[1]]>>_undselfie[<<temp_undcnt>>]'
-			if phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''underwear'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_undcnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/underwear/<<$selfieFilePrefix[ARGS[1]]>><<temp_undcnt>>.jpg"     height="150" /></a>  '
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'underwear', ARGS[1], temp_undcnt)
 			temp_undcnt += 1
-		if temp_undcnt <= selfieUndtot[ARGS[1]]: jump'temp_loop2'
+		if temp_undcnt <= selfieUndtot[ARGS[1]]: jump 'temp_loop2'
 	end
 
 	!!loop for nude selfies
@@ -281,9 +300,9 @@ if $ARGS[0] = 'listretrieve':
 		temp_nudcnt = 1
 		:temp_loop3
 			dynamic 'phone_locval = <<$selfieLoc[ARGS[1]]>>_nudselfie[<<temp_nudcnt>>]'
-			if phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''nude'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_nudcnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/nude/<<$selfieFilePrefix[ARGS[1]]>><<temp_nudcnt>>.jpg"     height="150" /></a>  '
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'nude', ARGS[1], temp_nudcnt)
 			temp_nudcnt += 1
-		if temp_nudcnt <= selfieNudtot[ARGS[1]]: jump'temp_loop3'
+		if temp_nudcnt <= selfieNudtot[ARGS[1]]: jump 'temp_loop3'
 	end
 	
 	!!loop for bath selfies
@@ -293,9 +312,9 @@ if $ARGS[0] = 'listretrieve':
 		temp_bathcnt = 1
 		:temp_loop4
 			dynamic 'phone_locval = <<$selfieLoc[ARGS[1]]>>_bathselfie[<<temp_bathcnt>>]'
-			if phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''bath'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_bathcnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/bath/<<$selfieFilePrefix[ARGS[1]]>><<temp_bathcnt>>.jpg"     height="150" /></a>  '
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'bath', ARGS[1], temp_bathcnt)
 			temp_bathcnt += 1
-		if temp_bathcnt <= selfieBathtot[ARGS[1]]: jump'temp_loop4'
+		if temp_bathcnt <= selfieBathtot[ARGS[1]]: jump 'temp_loop4'
 	end
 	
 	!!loop for shower selfies
@@ -305,9 +324,9 @@ if $ARGS[0] = 'listretrieve':
 		temp_showercnt = 1
 		:temp_loop5
 			dynamic 'phone_locval = <<$selfieLoc[ARGS[1]]>>_showerselfie[<<temp_showercnt>>]'
-			if phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''shower'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_showercnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/shower/<<$selfieFilePrefix[ARGS[1]]>><<temp_showercnt>>.jpg"     height="150" /></a>  '
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'shower', ARGS[1], temp_showercnt)
 			temp_showercnt += 1
-		if temp_showercnt <= selfieShowertot[ARGS[1]]: jump'temp_loop5'
+		if temp_showercnt <= selfieShowertot[ARGS[1]]: jump 'temp_loop5'
 	end
 	
 	!!loop for flashing tits selfies
@@ -317,9 +336,9 @@ if $ARGS[0] = 'listretrieve':
 		temp_flashtitscnt = 1
 		:temp_loop6
 			dynamic 'phone_locval = <<$selfieLoc[ARGS[1]]>>_titflash[<<temp_flashtitscnt>>]'
-			if phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''titflash'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_flashtitscnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/titflash/<<$selfieFilePrefix[ARGS[1]]>><<temp_flashtitscnt>>.jpg"     height="150" /></a>  '
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'titflash', ARGS[1], temp_flashtitscnt)
 			temp_flashtitscnt += 1
-		if temp_flashtitscnt <= selfieTitflash[ARGS[1]]: jump'temp_loop6'
+		if temp_flashtitscnt <= selfieTitflash[ARGS[1]]: jump 'temp_loop6'
 	end
 	
 	!!loop for flashing ass selfies
@@ -329,9 +348,9 @@ if $ARGS[0] = 'listretrieve':
 		temp_flashasscnt = 1
 		:temp_loop7
 			dynamic 'phone_locval = <<$selfieLoc[ARGS[1]]>>_assflash[<<temp_flashasscnt>>]'
-			if phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''assflash'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_flashasscnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/assflash/<<$selfieFilePrefix[ARGS[1]]>><<temp_flashasscnt>>.jpg"     height="150" /></a>  '
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'assflash', ARGS[1], temp_flashasscnt)
 			temp_flashasscnt += 1
-		if temp_flashasscnt <= selfieAssflash[ARGS[1]]: jump'temp_loop7'
+		if temp_flashasscnt <= selfieAssflash[ARGS[1]]: jump 'temp_loop7'
 	end
 	
 	!!loop for flashing pussy selfies
@@ -341,10 +360,12 @@ if $ARGS[0] = 'listretrieve':
 		temp_flashpussycnt = 1
 		:temp_loop8
 			dynamic 'phone_locval = <<$selfieLoc[ARGS[1]]>>_pussyflash[<<temp_flashpussycnt>>]'
-			if phone_locval = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$selfieLoc[ARGS[1]]>>'', ''pussyflash'', ''<<$selfieFilePrefix[ARGS[1]]>><<temp_flashpussycnt>>''"><img src="images/pc/activities/phone/selfies/<<$selfieLoc[ARGS[1]]>>/pussyflash/<<$selfieFilePrefix[ARGS[1]]>><<temp_flashpussycnt>>.jpg"     height="150" /></a>  '
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'pussyflash', ARGS[1], temp_flashpussycnt)
 			temp_flashpussycnt += 1
-		if temp_flashpussycnt <= selfiePussyflash[ARGS[1]]: jump'temp_loop8'
+		if temp_flashpussycnt <= selfiePussyflash[ARGS[1]]: jump 'temp_loop8'
 	end
+	
+	killvar 'temp_selfie_loc'
 end
 
 
@@ -372,48 +393,56 @@ if $ARGS[0] = 'PopulateSelfiesList':
 	killvar '$selfieTakenBath'
 	killvar '$selfieTakenShower'
 	killvar '$selfieTakenSwim'
+
 	temp_locationCnt = 1
 	:LocationTakenLoop
 		CloMaxSize = selfieClotot[temp_locationCnt]
 		if CloMaxSize > 0:
 			gs 'phone_selfies', 'populateClothesType', 'closelfie', '$selfieTakenClo', 'clothed', CloMaxSize
 		end
+
 		CloMaxSize = selfieSwimtot[temp_locationCnt]
 		if CloMaxSize > 0:
 			gs 'phone_selfies', 'populateClothesType', 'swim', '$selfieTakenSwim', 'bikini', CloMaxSize
 		end
+
 		CloMaxSize = selfieUndtot[temp_locationCnt]
 		if CloMaxSize > 0:
 			gs 'phone_selfies', 'populateClothesType', 'undselfie', '$selfieTakenUnd', 'underwear', CloMaxSize
 		end
+
 		CloMaxSize = selfieNudtot[temp_locationCnt]
 		if CloMaxSize > 0:
 			gs 'phone_selfies', 'populateClothesType', 'nudselfie', '$selfieTakenNud', 'nude', CloMaxSize
 		end
+
 		CloMaxSize = selfieBathtot[temp_locationCnt]
 		if CloMaxSize > 0:
 			gs 'phone_selfies', 'populateClothesType', 'bathselfie', '$selfieTakenBath', 'bath', CloMaxSize
 		end
+
 		CloMaxSize = selfieShowertot[temp_locationCnt]
 		if CloMaxSize > 0:
 			gs 'phone_selfies', 'populateClothesType', 'showerselfie', '$selfieTakenShower', 'shower', CloMaxSize
 		end
+
 		CloMaxSize = selfieTitflash[temp_locationCnt]
 		if CloMaxSize > 0:
 			gs 'phone_selfies', 'populateClothesType', 'titflash', '$selfieTakenTitflash', 'titflash', CloMaxSize
 		end
+
 		CloMaxSize = selfieAssflash[temp_locationCnt]
 		if CloMaxSize > 0:
 			gs 'phone_selfies', 'populateClothesType', 'assflash', '$selfieTakenAssflash', 'assflash', CloMaxSize
 		end
+
 		CloMaxSize = selfiePussyflash[temp_locationCnt]
 		if CloMaxSize > 0:
 			gs 'phone_selfies', 'populateClothesType', 'pussyflash', '$selfieTakenPussyflash', 'pussyflash', CloMaxSize
 		end
 
-
 		temp_locationCnt += 1
-	if temp_locationCnt < arrsize('$selfieLoc'): jump'LocationTakenLoop'
+	if temp_locationCnt < arrsize('$selfieLoc'): jump 'LocationTakenLoop'
 end
 
 
@@ -423,6 +452,7 @@ if $ARGS[0] = 'populateClothesType':
 	$CloFolder = $ARGS[3]
 	$CloVar = '<<$ARGS[2]>>[tmpIndex]'
 	CloMaxSize = ARGS[4]
+
 	temp_clocnt = 0
 	:tempCloTakenLoop
 		dynamic 'phone_locval = <<$selfieLoc[temp_locationCnt]>>_<<$CloTypePrefix>>[<<temp_clocnt>>]'
@@ -430,8 +460,9 @@ if $ARGS[0] = 'populateClothesType':
 			dynamic 'tmpIndex = <<$CloArraySize>>'
 			dynamic "<<$CloVar>> = 'images/pc/activities/phone/selfies/<<$selfieLoc[temp_locationCnt]>>/<<$CloFolder>>/<<$selfieFilePrefix[temp_locationCnt]>><<temp_clocnt>>.jpg'"
 		end
+
 		temp_clocnt += 1
-	if temp_clocnt <= CloMaxSize: jump'tempCloTakenLoop'
+	if temp_clocnt <= CloMaxSize: jump 'tempCloTakenLoop'
 end
 
 
@@ -907,7 +938,7 @@ if $ARGS[0] = 'listretrieve2':
 		loopmaxsex = 0
 	elseif numnpc = 144:
 		'<center><h4><font color="maroon">Anushka pictures</font></h4></center>'
-		$photoloc = 'images/pc/pictures/anushka/'	
+		$photoloc = 'images/pc/pictures/anushka/'
 		$imgloc = 'images/characters/pavlovsk/school/girl/anushka/selfies/'
 		$selfienpc = 'anushka'
 		loopmaxev = 6
@@ -1070,20 +1101,20 @@ if $ARGS[0] = 'listretrieve2':
 	else
 		!! New npcs with selfies should be included above
 	end
-	
+
 	if loopmaxev > 0:
 		*nl
 		'<center><b>Pictures</b></center>'
 		*nl
-		
+
 		i = 1
 		:temp_loopev
-            dynamic '$selfie = <<$selfienpc>>photo[<<i>>]'
-			if $selfie = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show2'', ''<<$photoloc>>'', ''<<i>>''"><img src="<<$photoloc>><<i>>.jpg"     height="150" /></a>  '
-            i += 1
-        if i <= loopmax: jump'temp_loopev'
+			dynamic '$selfie = <<$selfienpc>>photo[<<i>>]'
+			if $selfie = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show2'', ''<<$photoloc>>'', ''<<i>>''"><img src="<<$photoloc>><<i>>.jpg"	 height="150" /></a>  '
+			i += 1
+		if i <= loopmax: jump 'temp_loopev'
 	end
-	
+
 	if loopmax > 0:
 		*nl
 		'<center><b>Regular selfies</b></center>'
@@ -1091,12 +1122,12 @@ if $ARGS[0] = 'listretrieve2':
 		
 		i = 1
 		:temp_loopselfies
-            dynamic '$selfie = <<$selfienpc>>[<<i>>]'
-			if $selfie = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show2'', ''<<$imgloc>>'', ''<<i>>''"><img src="<<$imgloc>><<i>>.jpg"     height="150" /></a>  '
-            i += 1
-        if i <= loopmax: jump'temp_loopselfies'
+			dynamic '$selfie = <<$selfienpc>>[<<i>>]'
+			if $selfie = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show2'', ''<<$imgloc>>'', ''<<i>>''"><img src="<<$imgloc>><<i>>.jpg"	 height="150" /></a>  '
+			i += 1
+		if i <= loopmax: jump 'temp_loopselfies'
 	end
-	
+
 	if loopmaxsveta > 0:
 		*nl
 		'<center><b>Selfies with me</b></center>'
@@ -1105,11 +1136,11 @@ if $ARGS[0] = 'listretrieve2':
 		i = 1
 		:temp_loopselfiessveta
 			dynamic '$selfie = <<$selfienpc>>sveta[<<i>>]'
-			if $selfie = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show2'', ''<<$imgloc>>sveta/'', ''<<i>>''"><img src="<<$imgloc>>sveta/<<i>>.jpg"     height="150" /></a>  '
+			if $selfie = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show2'', ''<<$imgloc>>sveta/'', ''<<i>>''"><img src="<<$imgloc>>sveta/<<i>>.jpg"	 height="150" /></a>  '
 			i += 1
-		if i <= loopmaxsveta: jump'temp_loopselfiessveta'
+		if i <= loopmaxsveta: jump 'temp_loopselfiessveta'
 	end
-	
+
 	if loopmaxsex > 0:
 		*nl
 		'<center><b>Sex selfies</b></center>'
@@ -1118,14 +1149,13 @@ if $ARGS[0] = 'listretrieve2':
 		i = 1
 		:temp_loopselfiessex
 			dynamic '$selfie = <<$selfienpc>>sex[<<i>>]'
-			if $selfie = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show2'', ''<<$imgloc>>sex/'', ''<<i>>''"><img src="<<$imgloc>>sex/<<i>>.jpg"     height="150" /></a>  '
+			if $selfie = 1: *p '<a href="exec: gs ''phone_selfies_popup'', ''show2'', ''<<$imgloc>>sex/'', ''<<i>>''"><img src="<<$imgloc>>sex/<<i>>.jpg"	 height="150" /></a>  '
 			i += 1
-		if i <= loopmaxsex: jump'temp_loopselfiessex'
+		if i <= loopmaxsex: jump 'temp_loopselfiessex'
 	end
-	
+
 	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $loc_arg
-	act 'Stop watching selfies': gt $menu_loc, $menu_arg
+	gs 'phone_selfies', 'act_exit'
 end
 
 if $ARGS[0] = 'family':
@@ -1134,26 +1164,24 @@ if $ARGS[0] = 'family':
 	count1 = 0
 	i = 1
 	'<center><table cellspacing="3">'
-	:familygruploop	
-		if count1 = 6 : $textgrup += '<tr>'
-
-		if npc_grupTipe['A<<i>>'] = 7 and npc_selfieon['A<<i>>'] = 1:
+	:familygruploop
+		if npc_selfieon['A<<i>>'] = 1 and npc_grupTipe['A<<i>>'] = 7:
 			count1 += 1
-			$textgrup += '' + '<td bgcolor=<<$theme[''table_bg_alt'']>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + $npc_selfie['A<<i>>']
-		end
-		if count1< 6 and npc_grupTipe['A<<i>>'] = 7:
-			$textgrup += '</td>'
-		elseif count1 = 6 and npc_grupTipe['A<<i>>'] = 7:
-			$textgrup +='</td></tr><tr>' & count1 = 0
+			$textgrup += '' + '<td bgcolor=<<$theme[''table_bg_alt'']>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + $npc_selfie['A<<i>>'] + '</td>'
+
+			if count1 = 6:
+				$textgrup +='</tr><tr>'
+				count1 = 0
+			end
 		end
+
 		i += 1
-	if i <= aarraynumber:jump 'familygruploop'
+	if i <= aarraynumber: jump 'familygruploop'
 
 	'<<$textgrup>>'
-	
+
 	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $loc_arg
-	act 'Stop watching selfies': gt $menu_loc, $menu_arg
+	gs 'phone_selfies', 'act_exit'
 end
 
 if $ARGS[0] = 'school':
@@ -1163,25 +1191,23 @@ if $ARGS[0] = 'school':
 	i = 1
 	'<center><table cellspacing="3">'
 	:schoolgruploop	
-		if count1 = 6 : $textgrup += '<tr>'
-
-		if (npc_grupTipe['A<<i>>'] = 1 or npc_grupTipe['A<<i>>'] = 2 or npc_grupTipe['A<<i>>'] = 3 or npc_grupTipe['A<<i>>'] = 4 or npc_grupTipe['A<<i>>'] = 5) and npc_selfieon['A<<i>>'] = 1:
+		if npc_selfieon['A<<i>>'] = 1 and (npc_grupTipe['A<<i>>'] = 1 or npc_grupTipe['A<<i>>'] = 2 or npc_grupTipe['A<<i>>'] = 3 or npc_grupTipe['A<<i>>'] = 4 or npc_grupTipe['A<<i>>'] = 5):
 			count1 += 1
-			$textgrup += '' + '<td bgcolor=<<$theme[''table_bg_alt'']>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + $npc_selfie['A<<i>>']
-		end
-		if count1< 6 and (npc_grupTipe['A<<i>>'] = 1 or npc_grupTipe['A<<i>>'] = 2 or npc_grupTipe['A<<i>>'] = 3 or npc_grupTipe['A<<i>>'] = 4 or npc_grupTipe['A<<i>>'] = 5):
-			$textgrup += '</td>'
-		elseif count1 = 6 and (npc_grupTipe['A<<i>>'] = 1 or npc_grupTipe['A<<i>>'] = 2 or npc_grupTipe['A<<i>>'] = 3 or npc_grupTipe['A<<i>>'] = 4 or npc_grupTipe['A<<i>>'] = 5):
-			$textgrup +='</td></tr><tr>' & count1 = 0
+			$textgrup += '' + '<td bgcolor=<<$theme[''table_bg_alt'']>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + $npc_selfie['A<<i>>'] + '</td>'
+
+			if count1 = 6:
+				$textgrup +='</tr><tr>'
+				count1 = 0
+			end
 		end
+
 		i += 1
-	if i <= aarraynumber:jump 'schoolgruploop'
+	if i <= aarraynumber: jump 'schoolgruploop'
 
 	'<<$textgrup>>'
-	
+
 	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $loc_arg
-	act 'Stop watching selfies': gt $menu_loc, $menu_arg
+	gs 'phone_selfies', 'act_exit'
 end
 
 if $ARGS[0] = 'teacher':
@@ -1190,26 +1216,24 @@ if $ARGS[0] = 'teacher':
 	count1 = 0
 	i = 1
 	'<center><table cellspacing="3">'
-	:teachergruploop	
-		if count1 = 6 : $textgrup += '<tr>'
-
-		if npc_grupTipe['A<<i>>'] = 6 and npc_selfieon['A<<i>>'] = 1:
+	:teachergruploop
+		if npc_selfieon['A<<i>>'] = 1 and npc_grupTipe['A<<i>>'] = 6:
 			count1 += 1
-			$textgrup += '' + '<td bgcolor=<<$theme[''table_bg_alt'']>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + $npc_selfie['A<<i>>']
-		end
-		if count1< 6 and npc_grupTipe['A<<i>>'] = 6:
-			$textgrup += '</td>'
-		elseif count1 = 6 and npc_grupTipe['A<<i>>'] = 6:
-			$textgrup +='</td></tr><tr>' & count1 = 0
+			$textgrup += '' + '<td bgcolor=<<$theme[''table_bg_alt'']>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + $npc_selfie['A<<i>>'] + '</td>'
+
+			if count1 = 6:
+				$textgrup +='</tr><tr>'
+				count1 = 0
+			end
 		end
+
 		i += 1
-	if i <= aarraynumber:jump 'teachergruploop'
+	if i <= aarraynumber: jump 'teachergruploop'
 
 	'<<$textgrup>>'
-	
+
 	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $loc_arg
-	act 'Stop watching selfies': gt $menu_loc, $menu_arg
+	gs 'phone_selfies', 'act_exit'
 end
 
 if $ARGS[0] = 'pavlovsk':
@@ -1218,34 +1242,30 @@ if $ARGS[0] = 'pavlovsk':
 	count1 = 0
 	i = 1
 	'<center><table cellspacing="3">'
-	:pavgruploop	
-		if count1 = 6 : $textgrup += '<tr>'
-
+	:pavgruploop
 		if npc_grupTipe['A<<i>>'] = 8 and npc_selfieon['A<<i>>'] = 1:
 			count1 += 1
-			$textgrup += '' + '<td bgcolor=<<$theme[''table_bg_alt'']>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + $npc_selfie['A<<i>>']
-		end
-		if count1< 6 and npc_grupTipe['A<<i>>'] = 8:
-			$textgrup += '</td>'
-		elseif count1 = 6 and npc_grupTipe['A<<i>>'] = 8:
-			$textgrup +='</td></tr><tr>' & count1 = 0
+			$textgrup += '' + '<td bgcolor=<<$theme[''table_bg_alt'']>> align="center"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"><br>' + $npc_selfie['A<<i>>'] + '</td>'
+
+			if count1 = 6:
+				$textgrup +='</tr><tr>'
+				count1 = 0
+			end
 		end
 		i += 1
-	if i <= aarraynumber:jump 'pavgruploop'
+	if i <= aarraynumber: jump 'pavgruploop'
 
 	'<<$textgrup>>'
-	
+
 	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $loc_arg
-	act 'Stop watching selfies': gt $menu_loc, $menu_arg
+	gs 'phone_selfies', 'act_exit'
 end
 
 if $ARGS[0] = 'city':
 	'<center><h4><font color="maroon">City friends</font></h4></center>'
-	
+
 	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $loc_arg
-	act 'Stop watching selfies': gt $menu_loc, $menu_arg
+	gs 'phone_selfies', 'act_exit'
 end
 
 --- phone_selfies ---------------------------------

locations/phone_selfies_popup.qsrc

@@ -2,23 +2,47 @@
 
 !! This is used to create a popup that shows the enlarged selfie
 
+
+!!	$ARGS[1] = Location where the selfie is taken
+!!	$ARGS[2] = State of dress in the selfie
+!!	 ARGS[3] = is the index of the location in $selfieLoc[] and $selfieFilePrefix
+!!	 ARGS[4] = the selfie number
+
+if $ARGS[0] = 'set_selfie':
+	$result = '<a href="exec: gs ''phone_selfies_popup'', ''show'', ''<<$ARGS[1]>>'', ''<<$ARGS[2]>>'', <<ARGS[3]>>, <<ARGS[4]>>"><img src="images/pc/activities/phone/selfies/<<$ARGS[1]>>/<<$ARGS[2]>>/<<$selfieFilePrefix[ARGS[3]]>><<ARGS[4]>>.jpg"    height="150"/></a>  '
+end
+
 if $ARGS[0] = 'show':
-	if usePopUps = 1:
-		msg '<img src="images/pc/activities/phone/selfies/<<ARGS[1]>>/<<$ARGS[2]>>/<<$ARGS[3]>>.jpg">'
+	if temp_suppress_other_selfies = 0:
+		if usePopUps = 1:
+			msg '<img src="images/pc/activities/phone/selfies/<<$ARGS[1]>>/<<$ARGS[2]>>/<<$selfieFilePrefix[ARGS[3]]>><<ARGS[4]>>.jpg">'
+		else
+			view 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/<<$ARGS[2]>>/<<$selfieFilePrefix[ARGS[3]]>><<ARGS[4]>>.jpg'
+		end
+
 	else
-		view 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/<<$ARGS[2]>>/<<$ARGS[3]>>.jpg'
+		killvar 'temp_suppres_other_selfies'
+		$selfie_last_chosen['location'] = $ARGS[1]
+		$selfie_last_chosen['type']     = $ARGS[2]
+		killvar 'temp_suppress_other_selfies'
+		gt temp_ssh_ret_loc, temp_ssh_ret_arg, temp_ssh_SMSid, 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/<<$ARGS[2]>>/<<$selfieFilePrefix[ARGS[3]]>><<ARGS[4]>>', $ARGS[1], $ARGS[2]
 	end
 end
 
-!! show2 passes the location and image number
+
+if $ARGS[0] = 'set_selfie2':
+	$result = '<a href="exec: gs ''phone_selfies_popup'', ''show2'', ''<<$ARGS[1]>>'', ARGS[2]"><img src="<<func(''phone_selfies_popup'', ''get_imloc2'', $ARGS[1]>>'', <<ARGS[2]>>.jpg" height="150" /></a>'
+end
+
 if $ARGS[0] = 'show2':
 	if usePopUps = 1:
-		msg '<img src="<<$ARGS[1]>><<$ARGS[2]>>.jpg">'
+		msg '<img src="<$ARGS[1]>><<ARGS[2]>>.jpg">'
 	else
-		view '<<$ARGS[1]>><<$ARGS[2]>>.jpg'
+		view '<$ARGS[1]>><<ARGS[2]>>.jpg'
 	end
 end
 
 
+
 --- phone_selfies_popup ---------------------------------