Merge remote-tracking branch 'upstream/master' into ml-dev

locations/gadforest_event.qsrc

@@ -2,6 +2,7 @@
 
 $location_type = 'event_outdoors'
 gs 'stat'
+$ReturnAdr = $ARGS[1]
 
 if $ARGS[0] = 'find_meadow':
 	*clr & cla
@@ -434,7 +435,7 @@ if $ARGS[0] = 'forest_hunters':
 	if hunters_were_met = 0:'Wandering through the woods you come across some people. Judging by their appearance they must be hunters.'
 	if hunters_were_met = 1:'Wandering through the woods you see the hunters, Andrei, Sergei and Igor.'
 
-	act 'Leave them alone':gt 'gadforest', $ARGS[1]
+	act 'Leave them alone':gt 'gadforest', $ReturnAdr
 
     !%TODO: Move to hunter interactions
     act 'Approach the hunters':
@@ -460,7 +461,7 @@ if $ARGS[0] = 'forest_hunters':
                 'After chatting with them for about half an hour, the hunters begin to get up and gather their things.'
                 '"Okay <<$pcs_nickname>>, it''s time for us to go." said Andrei.'
                 '"If you want, we show you our camp," he added after a short pause. "From there we have made a path back to the village. We can show it to you if you come with us. Or if you want, you can even stay with us for a bit."'
-                act 'Stay in the forest':gt 'gadforest', $ARGS[1]
+                act 'Stay in the forest':gt 'gadforest', $ReturnAdr
                 act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
             else
                 minut += 15
@@ -477,7 +478,7 @@ if $ARGS[0] = 'forest_hunters':
                 '"Don''t run away, we won''t hurt you." said Sergei, seeing you jump to your feet.'
                 '"I think it''s about time I left" you reply.'
                 'You quickly move away from them and only slowing once you can no longer hear them talking.'
-                act 'Go back to the forest':gt 'gadforest', $ARGS[1]
+                act 'Go back to the forest':gt 'gadforest', $ReturnAdr
             end
         else
             '<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
@@ -488,7 +489,7 @@ if $ARGS[0] = 'forest_hunters':
                 minut += 30
                 'After chatting with them for about half an hour, the hunters begin to get up and gather their things.'
                 '"Okay <<$pcs_nickname>>, it''s time for us to go." said Andrei. "You should pay us another visit some time, ok?"'
-                act 'Stay in the forest':gt 'gadforest', $ARGS[1]
+                act 'Stay in the forest':gt 'gadforest', $ReturnAdr
                 act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
             else
                 '"Oh, <<$pcs_nickname>>, we were all looking forward to seeing you again" Andrei said with a smile.'
@@ -499,7 +500,7 @@ if $ARGS[0] = 'forest_hunters':
                     act 'Stay in the forest  (<<will_cost>> Willpower)':
                         gs 'willpower', 'pay', 'resist'
                         gs 'stat'
-                        gt 'gadforest', $ARGS[1]
+                        gt 'gadforest', $ReturnAdr
                     end
                 else
                     act 'Stay in the forest (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -520,7 +521,7 @@ if $ARGS[0] = 'forest_hunters':
                 *nl
                 'You pretend not to notice the hunters and walk right past them, swaying your hips pointedly to maximize the effect. Looking around, you notice that the effect has exceeded your expectations. The men have been stopped in their tracks and are staring at you...'
 
-                act 'Continue':gt 'gadforest', $ARGS[1]
+                act 'Continue':gt 'gadforest', $ReturnAdr
             end
             act 'Hide':
                 *clr & cla
@@ -531,7 +532,7 @@ if $ARGS[0] = 'forest_hunters':
                 *nl
                 'They haven''t noticed you yet, so you quickly hide from sight in a nearby bush. You wait until you can no longer hear them talking to continue on your way.'
 
-                act 'Continue':gt 'gadforest', $ARGS[1]
+                act 'Continue':gt 'gadforest', $ReturnAdr
             end
         if hunters_were_met = 1:
             '"Oh, <<$pcs_nickname>>, we were all looking forward to seeing you again" Andrei said with a smile.'
@@ -542,7 +543,7 @@ if $ARGS[0] = 'forest_hunters':
                 act 'Stay in the forest  (<<will_cost>> Willpower)':
                     gs 'willpower', 'pay', 'resist'
                     gs 'stat'
-                    gt 'gadforest', $ARGS[1]
+                    gt 'gadforest', $ReturnAdr
                 end
             else
                 act 'Stay in the forest (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'