[change] split up listretrieve to support showing part of the total selfie catalogue (aka only the clothed, the non-nude, only nudes, etc). Added more options in the "select a selfie" section of phone_selfies_popup to better support sending/uploading selfies

locations/phone_selfies.qsrc

@@ -248,17 +248,31 @@ end
 if $ARGS[0] = 'showlocation':
 	'<center><h4><font color="maroon"><<$selfieLocDesc[ARGS[1]]>> selfies</font></h4></center>'
 	*nl
-	gs 'phone_selfies', 'listretrieve', ARGS[1]
+	gs 'phone_selfies', 'listretrieve', ARGS[1], $selfieLoc[ARGS[1]]
 	
 	act 'Back': gt 'phone_selfies', 'selfies'
 	gs 'phone_selfies', 'act_exit'
 end
 
 
-!! ARGS[1] is the index of the location in $selfieLoc[]
+!!  ARGS[1] is the index of the location in $selfieLoc[]
+!! $ARGS[2] is the selfie location (park, home, etc)
 if $ARGS[0] = 'listretrieve':
-	$temp_selfie_loc = $selfieLoc[ARGS[1]]
+	gs 'phone_selfies', 'retrieve_clothed_selfies',		ARGS[1], $ARGS[2]
+	gs 'phone_selfies', 'retrieve_swim_selfies',		ARGS[1], $ARGS[2]
+	gs 'phone_selfies', 'retrieve_underwear_selfies',	ARGS[1], $ARGS[2]
+	gs 'phone_selfies', 'retrieve_nude_selfies',		ARGS[1], $ARGS[2]
+	gs 'phone_selfies', 'retrieve_bath_selfies',		ARGS[1], $ARGS[2]
+	gs 'phone_selfies', 'retrieve_shower_selfies',		ARGS[1], $ARGS[2]
+	gs 'phone_selfies', 'retrieve_titflash_selfies',	ARGS[1], $ARGS[2]
+	gs 'phone_selfies', 'retrieve_assflash_selfies',	ARGS[1], $ARGS[2]
+	gs 'phone_selfies', 'retrieve_pussyflash_selfies',	ARGS[1], $ARGS[2]
+end
 
+
+!!  ARGS[1] is the index of the location in $selfieLoc[]
+!! $ARGS[2] is the selfie location
+if $ARGS[0] = 'retrieve_clothed_selfies':
 	!!Loop for clothed selfies, dynamics set variables as mixing them in loop instructions is bad
 	if selfieClotot[ARGS[1]] > 0:
 		'<center><b>Clothed selfies</b></center>'
@@ -266,113 +280,126 @@ if $ARGS[0] = 'listretrieve':
 		temp_clocnt = 1
 		: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 func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'clothed', ARGS[1], temp_clocnt)
+			dynamic 'phone_locval = <<$ARGS[2]>>_closelfie[<<temp_clocnt>>]'
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $ARGS[2], 'clothed', ARGS[1], temp_clocnt)
 			temp_clocnt += 1
 		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
+end
+
+if $ARGS[0] = 'retrieve_swim_selfies':
 	if selfieSwimtot[ARGS[1]] > 0:
 		'<center><b>Swimwear selfies</b></center>'
 		*nl
 		temp_clocnt = 1
 		: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 func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'bikini', ARGS[1], temp_clocnt)
+			dynamic 'phone_locval = <<$ARGS[2]>>_swim[<<temp_clocnt>>]'
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $ARGS[2], 'bikini', ARGS[1], temp_clocnt)
 			temp_clocnt += 1
 		if temp_clocnt <= selfieSwimtot[ARGS[1]]: jump 'temp_loop1'
 	end
-		
-	!!loop for underwear selfies
+end
+
+if $ARGS[0] = 'retrieve_underwear_selfies':
 	if selfieUndtot[ARGS[1]] > 0:
 		'<center><b>Underwear selfies</b></center>'
 		*nl
 		temp_undcnt = 1
 		:temp_loop2
-			dynamic 'phone_locval = <<$selfieLoc[ARGS[1]]>>_undselfie[<<temp_undcnt>>]'
-			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'underwear', ARGS[1], temp_undcnt)
+			dynamic 'phone_locval = <<$ARGS[2]>>_undselfie[<<temp_undcnt>>]'
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $ARGS[2], 'underwear', ARGS[1], temp_undcnt)
 			temp_undcnt += 1
 		if temp_undcnt <= selfieUndtot[ARGS[1]]: jump 'temp_loop2'
 	end
+end
 
-	!!loop for nude selfies
+if $ARGS[0] = 'retrieve_nude_selfies':
 	if selfieNudtot[ARGS[1]] > 0:
 		'<center><b>Nude selfies</b></center>'
 		*nl
 		temp_nudcnt = 1
 		:temp_loop3
-			dynamic 'phone_locval = <<$selfieLoc[ARGS[1]]>>_nudselfie[<<temp_nudcnt>>]'
-			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'nude', ARGS[1], temp_nudcnt)
+			dynamic 'phone_locval = <<$ARGS[2]>>_nudselfie[<<temp_nudcnt>>]'
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $ARGS[2], 'nude', ARGS[1], temp_nudcnt)
 			temp_nudcnt += 1
 		if temp_nudcnt <= selfieNudtot[ARGS[1]]: jump 'temp_loop3'
 	end
-	
+end
+
+if $ARGS[0] = 'retrieve_bath_selfies':
 	!!loop for bath selfies
 	if selfieBathtot[ARGS[1]] > 0:
 		'<center><b>Bath selfies</b></center>'
 		*nl
 		temp_bathcnt = 1
 		:temp_loop4
-			dynamic 'phone_locval = <<$selfieLoc[ARGS[1]]>>_bathselfie[<<temp_bathcnt>>]'
-			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'bath', ARGS[1], temp_bathcnt)
+			dynamic 'phone_locval = <<$ARGS[2]>>_bathselfie[<<temp_bathcnt>>]'
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $ARGS[2], 'bath', ARGS[1], temp_bathcnt)
 			temp_bathcnt += 1
 		if temp_bathcnt <= selfieBathtot[ARGS[1]]: jump 'temp_loop4'
 	end
-	
+end
+
+if $ARGS[0] = 'retrieve_shower_selfies':
 	!!loop for shower selfies
 	if selfieShowertot[ARGS[1]] > 0:
 		'<center><b>Shower selfies</b></center>'
 		*nl
 		temp_showercnt = 1
 		:temp_loop5
-			dynamic 'phone_locval = <<$selfieLoc[ARGS[1]]>>_showerselfie[<<temp_showercnt>>]'
-			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'shower', ARGS[1], temp_showercnt)
+			dynamic 'phone_locval = <<$ARGS[2]>>_showerselfie[<<temp_showercnt>>]'
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $ARGS[2], 'shower', ARGS[1], temp_showercnt)
 			temp_showercnt += 1
 		if temp_showercnt <= selfieShowertot[ARGS[1]]: jump 'temp_loop5'
 	end
-	
+end
+
+if $ARGS[0] = 'retrieve_titflash_selfies':
 	!!loop for flashing tits selfies
 	if selfieTitflash[ARGS[1]] > 0:
 		'<center><b>Flashing tits selfies</b></center>'
 		*nl
 		temp_flashtitscnt = 1
 		:temp_loop6
-			dynamic 'phone_locval = <<$selfieLoc[ARGS[1]]>>_titflash[<<temp_flashtitscnt>>]'
-			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'titflash', ARGS[1], temp_flashtitscnt)
+			dynamic 'phone_locval = <<$ARGS[2]>>_titflash[<<temp_flashtitscnt>>]'
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $ARGS[2], 'titflash', ARGS[1], temp_flashtitscnt)
 			temp_flashtitscnt += 1
 		if temp_flashtitscnt <= selfieTitflash[ARGS[1]]: jump 'temp_loop6'
 	end
-	
+end
+
+if $ARGS[0] = 'retrieve_assflash_selfies':
 	!!loop for flashing ass selfies
 	if selfieAssflash[ARGS[1]] > 0:
 		'<center><b>Flashing ass selfies</b></center>'
 		*nl
 		temp_flashasscnt = 1
 		:temp_loop7
-			dynamic 'phone_locval = <<$selfieLoc[ARGS[1]]>>_assflash[<<temp_flashasscnt>>]'
-			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'assflash', ARGS[1], temp_flashasscnt)
+			dynamic 'phone_locval = <<$ARGS[2]>>_assflash[<<temp_flashasscnt>>]'
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $ARGS[2], 'assflash', ARGS[1], temp_flashasscnt)
 			temp_flashasscnt += 1
 		if temp_flashasscnt <= selfieAssflash[ARGS[1]]: jump 'temp_loop7'
 	end
-	
+end
+
+if $ARGS[0] = 'retrieve_pussyflash_selfies':
 	!!loop for flashing pussy selfies
 	if selfiePussyflash[ARGS[1]] > 0:
 		'<center><b>Flashing pussy selfies</b></center>'
 		*nl
 		temp_flashpussycnt = 1
 		:temp_loop8
-			dynamic 'phone_locval = <<$selfieLoc[ARGS[1]]>>_pussyflash[<<temp_flashpussycnt>>]'
-			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $temp_selfie_loc, 'pussyflash', ARGS[1], temp_flashpussycnt)
+			dynamic 'phone_locval = <<$ARGS[2]>>_pussyflash[<<temp_flashpussycnt>>]'
+			if phone_locval = 1: *p func('phone_selfies_popup', 'set_selfie', $ARGS[2], 'pussyflash', ARGS[1], temp_flashpussycnt)
 			temp_flashpussycnt += 1
 		if temp_flashpussycnt <= selfiePussyflash[ARGS[1]]: jump 'temp_loop8'
 	end
-	
-	killvar 'temp_selfie_loc'
 end
 
 
+
+
 !! Sets up a list of selfies taken by category
 !! loops through the arrays of selfie flags (1 means that se;lfie has been taken by the player)
 !! adds the image path for each taken selfie to the relevant array
@@ -470,6 +497,7 @@ if $ARGS[0] = 'populateClothesType':
 end
 
 
+
 if $ARGS[0] = 'listretrieve2':
 	if numnpc = 1:
 		'<center><h4><font color="maroon">Dimka pictures</font></h4></center>'
@@ -1114,7 +1142,7 @@ if $ARGS[0] = 'listretrieve2':
 		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>  '
+			if $selfie = 1: *p func('phone_selfies_popup', 'set_selfie2', $photoloc, i)
 			i += 1
 		if i <= loopmax: jump 'temp_loopev'
 	end
@@ -1127,7 +1155,7 @@ 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>  '
+			if $selfie = 1: *p func('phone_selfies_popup', 'set_selfie2', $imgloc, i)
 			i += 1
 		if i <= loopmax: jump 'temp_loopselfies'
 	end
@@ -1140,7 +1168,7 @@ 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 func('phone_selfies_popup', 'set_selfie2', '<<$imgloc>>sveta/', i)
 			i += 1
 		if i <= loopmaxsveta: jump 'temp_loopselfiessveta'
 	end
@@ -1153,7 +1181,7 @@ 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 func('phone_selfies_popup', 'set_selfie2', '<<$imgloc>>sex/', i)
 			i += 1
 		if i <= loopmaxsex: jump 'temp_loopselfiessex'
 	end
@@ -1162,6 +1190,9 @@ if $ARGS[0] = 'listretrieve2':
 	gs 'phone_selfies', 'act_exit'
 end
 
+
+
+
 if $ARGS[0] = 'family':
 	'<center><h4><font color="maroon">Family members</font></h4></center>'
 	$textgrup = ''

locations/phone_selfies_popup.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'show':
 		$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, 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/<<$ARGS[2]>>/<<$selfieFilePrefix[ARGS[3]]>><<ARGS[4]>>.jpg', $ARGS[1], $ARGS[2]
+		gt $temp_ssh_ret_loc, $temp_ssh_ret_arg, 'images/pc/activities/phone/selfies/<<$ARGS[1]>>/<<$ARGS[2]>>/<<$selfieFilePrefix[ARGS[3]]>><<ARGS[4]>>.jpg', $ARGS[1], $ARGS[2], ARGS[3], ARGS[4]
 	end
 end