Skip to content
Snippets Groups Projects
Commit 59e25424 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'fixes' into 'pregmod-master'

Fix bad dereference

Closes #1994

See merge request pregmodfan/fc-pregmod!7299
parents be5ea10e 762f1c73
No related branches found
No related tags found
1 merge request!7299Fix bad dereference
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<<set _SlaveJ = $slaves[_j]>> <<set _SlaveJ = $slaves[_j]>>
<<setLocalPronouns _SlaveJ 2>> <<setLocalPronouns _SlaveJ 2>>
<<if (_SlaveJ.ID != _SlaveI.ID) && (_SlaveJ.relationship == 0) && (_SlaveI.rivalryTarget != _SlaveJ.ID) && (_SlaveJ.assignment != "stay confined") && (_SlaveJ.fetish != "mindbroken")>> <<if (_SlaveJ.ID != _SlaveI.ID) && (_SlaveJ.relationship == 0) && (_SlaveI.rivalryTarget != _SlaveJ.ID) && (_SlaveJ.assignment != "stay confined") && (_SlaveJ.fetish != "mindbroken")>>
<<if (_SlaveJ.ID == _S.Madam.ID) && (_SlaveI.assignment == "work in the brothel")>> <<if (_SlaveJ.ID == $MadamID) && (_SlaveI.assignment == "work in the brothel")>>
<<if _SlaveJ.rules.relationship != "restrictive">> <<if _SlaveJ.rules.relationship != "restrictive">>
_SlaveI.slaveName manages to ingratiate $himself with the Madam, _SlaveJ.slaveName. The two slaves have @@.lightgreen;struck up a friendship.@@ _SlaveI.slaveName manages to ingratiate $himself with the Madam, _SlaveJ.slaveName. The two slaves have @@.lightgreen;struck up a friendship.@@
<<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>> <<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment