Merge branch 'si-preg' into 'pregmod-master'

SI fixes

See merge request !6320

src/uncategorized/slaveInteract.tw

@@ -3,6 +3,7 @@
 <<set $nextButton = "Confirm changes", $nextLink = "Main">>
 <<set _SL = $slaves.length, _CL = $canines.length, _HL = $hooved.length, _FL = $felines.length>>
 <<set _i = $slaveIndices[$activeSlave.ID]>>
+<<set $slaves[_i] = $activeSlave>>
 <<setLocalPronouns $slaves[_i]>>
 <<run Enunciate($slaves[_i])>>
 <style>
@@ -17,31 +18,31 @@
 <<if !assignmentVisible($slaves[_i])>>
 	<<switch $slaves[_i].assignment>>
 	<<case "work in the brothel" "be the Madam">>
-		<<set $returnTo = "Brothel">>
+		<<set $nextLink = "Brothel">>
 	<<case "be confined in the arcade">>
-		<<set $returnTo = "Arcade">>
+		<<set $nextLink = "Arcade">>
 	<<case "serve in the club" "be the DJ">>
-		<<set $returnTo = "Club">>
+		<<set $nextLink = "Club">>
 	<<case "work in the dairy" "be the Milkmaid">>
-		<<set $returnTo = "Dairy">>
+		<<set $nextLink = "Dairy">>
 	<<case "work as a farmhand" "be the Farmer">>
-		<<set $returnTo = "Farmyard">>
+		<<set $nextLink = "Farmyard">>
 	<<case "rest in the spa" "be the Attendant">>
-		<<set $returnTo = "Spa">>
+		<<set $nextLink = "Spa">>
 	<<case "work as a nanny" "be the Matron">>
-		<<set $returnTo = "Nursery">>
+		<<set $nextLink = "Nursery">>
 	<<case "learn in the schoolroom" "be the Schoolteacher">>
-		<<set $returnTo = "Schoolroom">>
+		<<set $nextLink = "Schoolroom">>
 	<<case "work as a servant" "be the Stewardess">>
-		<<set $returnTo = "Servants' Quarters">>
+		<<set $nextLink = "Servants' Quarters">>
 	<<case "serve in the master suite" "be your Concubine">>
-		<<set $returnTo = "Master Suite">>
+		<<set $nextLink = "Master Suite">>
 	<<case "be confined in the cellblock" "be the Wardeness">>
-		<<set $returnTo = "Cellblock">>
+		<<set $nextLink = "Cellblock">>
 	<<case "get treatment in the clinic" "be the Nurse">>
-		<<set $returnTo = "Clinic">>
+		<<set $nextLink = "Clinic">>
 	<<case "live with your Head Girl">>
-		<<set $returnTo = "Head Girl Suite">>
+		<<set $nextLink = "Head Girl Suite">>
 	<</switch>>
 <</if>>