Merge branch 'patch-18' into 'pregmod-master'

Fix for custom slave voice not setting correctly

See merge request !1556

src/uncategorized/customSlave.tw

@@ -203,11 +203,11 @@
 <br>
 
 <span id = "voice">
-<<if $customSlave.voice == 3>>high, girly voice.
-<<elseif $customSlave.voice == 2>>feminine voice.
-<<elseif $customSlave.voice == 1>>deep voice.
-<<elseif $customSlave.voice == 0>>mute.
-<<elseif $customSlave.voice == -1>>Voice is unimportant.
+<<if $customSlave.voice == 3>>High, girly voice.
+<<elseif $customSlave.voice == 2>>Feminine voice.
+<<elseif $customSlave.voice == 1>>Deep voice.
+<<elseif $customSlave.voice == 0>>Mute.
+<<else>>Voice is unimportant.
 <</if>>
 </span>
 <<link "high, girly voice">>
@@ -274,7 +274,7 @@
 
 <span id = "weight">
 <<if $customSlave.weight == -50>>Very thin.
-<<elseif $customSlave.weight == -15>>thin.
+<<elseif $customSlave.weight == -15>>Thin.
 <<elseif $customSlave.weight == 0>>Average weight.
 <<elseif $customSlave.weight == 15>>Chubby.
 <<elseif $customSlave.weight == 50>>Plump.

src/uncategorized/seCustomSlaveDelivery.tw

@@ -80,8 +80,10 @@
 <<if $customSlave.analVirgin == 0>>
 	<<set $activeSlave.anus = $customSlave.analVirgin>>
 <</if>>
-<<if $customSlave.voice != -1>>
+<<if def $customSlave.voice && $customSlave.voice != -1>>
 	<<set $activeSlave.voice = $customSlave.voice>>
+<<else>>
+	<<set $activeSlave.voice = random(0,3)>>
 <</if>>
 <<set $activeSlave.health = $customSlave.health>>
 <<set $activeSlave.muscles = $customSlave.muscles>>

src/utility/slaveCreationWidgets.tw

@@ -1552,11 +1552,11 @@
 %/
 <<widget "CustomSlaveVoice">>
 	<<replace #voice>>
-		<<if $customSlave.voice == 3>>high, girly voice.
-		<<elseif $customSlave.voice == 2>>feminine voice.
-		<<elseif $customSlave.voice == 1>>deep voice.
-		<<elseif $customSlave.voice == 0>>mute.
-		<<elseif $customSlave.voice == -1>>Voice is unimportant.
+		<<if $customSlave.voice == 3>>High, girly voice.
+		<<elseif $customSlave.voice == 2>>Feminine voice.
+		<<elseif $customSlave.voice == 1>>Deep voice.
+		<<elseif $customSlave.voice == 0>>Mute.
+		<<else>>Voice is unimportant.
 		<</if>>
 	<</replace>>
 <</widget>>
@@ -1581,7 +1581,7 @@
 <<widget "CustomSlaveWeight">>
 	<<replace #weight>>
 		<<if $customSlave.weight == -50>>Very thin.
-		<<elseif $customSlave.weight == -15>>thin.
+		<<elseif $customSlave.weight == -15>>Thin.
 		<<elseif $customSlave.weight == 0>>Average weight.
 		<<elseif $customSlave.weight == 15>>Chubby.
 		<<elseif $customSlave.weight == 50>>Plump.