0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Low Carryover

Browse source 
http://gna.org/bugs/?23674

We don't want to use the units and gold stored in the global variables if we already get them from normal carryover becasue that results in having them twice.
This commit is contained in:
gfgtdf 2015-07-03 16:26:10 +02:00 • committed by Ignacio R. Morelle
parent bb87a306e9
commit 8a04442ce2
1 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
View file

@ -249,6 +249,15 @@ Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Scout, Dwarvish Guardsman#enddef
##### Persistent Global Variable macros for multiplayer mode #####
#define IF_FIRST_SCENARIO CODE
[if]
{VARIABLE_CONDITIONAL "side_number" equals ""}
[then]
{CODE}
[/then]
[/if]
#enddef
#define LOAD_PERSISTENT_IF_LOCAL_EMPTY SIDE NAMESPACE GLOBAL_VAR LOCAL_VAR
[if]
{VARIABLE_CONDITIONAL ({LOCAL_VAR}.length) equals 0}
@ -313,36 +322,48 @@ Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Scout, Dwarvish Guardsman#enddef
#define GET_PERSISTENT_RECALLS_FROM2 SIDE1 SIDE2 NAMESPACE GLOBAL_VAR
#Loads the recall list variable from both sides.
{LOAD_PERSISTENT_2PLAYER {SIDE1} {SIDE2} {NAMESPACE} {GLOBAL_VAR} party_store}
{UNSTORE_PARTY {SIDE1} }
{IF_FIRST_SCENARIO (
{LOAD_PERSISTENT_2PLAYER {SIDE1} {SIDE2} {NAMESPACE} {GLOBAL_VAR} party_store}
{UNSTORE_PARTY {SIDE1} }
)}
#enddef
#define GET_PERSISTENT_RECALLS_FROM3 SIDE1 SIDE2 SIDE3 NAMESPACE GLOBAL_VAR
#Loads the recall list variable from three sides.
{LOAD_PERSISTENT_3PLAYER {SIDE1} {SIDE2} {SIDE3} {NAMESPACE} {GLOBAL_VAR} party_store}
{UNSTORE_PARTY {SIDE1} }
{IF_FIRST_SCENARIO (
{LOAD_PERSISTENT_3PLAYER {SIDE1} {SIDE2} {SIDE3} {NAMESPACE} {GLOBAL_VAR} party_store}
{UNSTORE_PARTY {SIDE1} }
)}
#enddef
#define GET_PERSISTENT_RECALLS_FROM4 SIDE1 SIDE2 SIDE3 SIDE4 NAMESPACE GLOBAL_VAR
#Loads the recall list variable from four sides.
{LOAD_PERSISTENT_4PLAYER {SIDE1} {SIDE2} {SIDE3} {SIDE4} {NAMESPACE} {GLOBAL_VAR} party_store}
{UNSTORE_PARTY {SIDE1} }
{IF_FIRST_SCENARIO (
{LOAD_PERSISTENT_4PLAYER {SIDE1} {SIDE2} {SIDE3} {SIDE4} {NAMESPACE} {GLOBAL_VAR} party_store}
{UNSTORE_PARTY {SIDE1} }
)}
#enddef
#define GET_PERSISTENT_GOLD_FROM2 SIDE1 SIDE2 NAMESPACE GLOBAL_VAR
#Loads the recall list variable from both sides.
{LOAD_PERSISTENT_2PLAYER {SIDE1} {SIDE2} {NAMESPACE} {GLOBAL_VAR} gold_store}
{SET_MP_GOLD {SIDE1} }
{IF_FIRST_SCENARIO (
{LOAD_PERSISTENT_2PLAYER {SIDE1} {SIDE2} {NAMESPACE} {GLOBAL_VAR} gold_store}
{SET_MP_GOLD {SIDE1} }
)}
#enddef
#define GET_PERSISTENT_GOLD_FROM3 SIDE1 SIDE2 SIDE3 NAMESPACE GLOBAL_VAR
#Loads the recall list variable from both sides.
{LOAD_PERSISTENT_3PLAYER {SIDE1} {SIDE2} {SIDE3} {NAMESPACE} {GLOBAL_VAR} gold_store}
{SET_MP_GOLD {SIDE1} }
{IF_FIRST_SCENARIO (
{LOAD_PERSISTENT_3PLAYER {SIDE1} {SIDE2} {SIDE3} {NAMESPACE} {GLOBAL_VAR} gold_store}
{SET_MP_GOLD {SIDE1} }
)}
#enddef
#define GET_PERSISTENT_GOLD_FROM4 SIDE1 SIDE2 SIDE3 SIDE4 NAMESPACE GLOBAL_VAR
#Loads the recall list variable from both sides.
{LOAD_PERSISTENT_4PLAYER {SIDE1} {SIDE2} {SIDE3} {SIDE4} {NAMESPACE} {GLOBAL_VAR} gold_store}
{SET_MP_GOLD {SIDE1} }
{IF_FIRST_SCENARIO (
{LOAD_PERSISTENT_4PLAYER {SIDE1} {SIDE2} {SIDE3} {SIDE4} {NAMESPACE} {GLOBAL_VAR} gold_store}
{SET_MP_GOLD {SIDE1} }
)}
#enddef