}U = UTop;
}
if(MS0->S4.unitType == 0){
- if(MS0->S4.objeFlag) team0num = MS0->S4.unitNum;
+ if(MS0->S4.objeFlag ||!MS0->S4.placeFlag) team0num = MS0->S4.unitNum;
if((MS0->S4.unitNum == team0num) && (MS0->S4.unitNum == objeSCSunitCnt)){
trueFlag = false;
}
}else if(MS0->S4.unitType == 1){
- if(MS0->S4.objeFlag) team0num = 65000;
+ if(MS0->S4.objeFlag ||!MS0->S4.placeFlag) team0num = 65000;
if((MS0->S4.unitNum <= team0num) && (MS0->S4.unitNum <= objeSCSunitCnt)){
}U = UTop;
}
if(MS0->S4.unitType == 0){
- if(MS0->S4.objeFlag) team1num = MS0->S4.unitNum;
+ if(MS0->S4.objeFlag ||!MS0->S4.placeFlag) team1num = MS0->S4.unitNum;
if((MS0->S4.unitNum == team1num) && (MS0->S4.unitNum == objeSCSunitCnt)){
trueFlag = false;
}
}else if(MS0->S4.unitType == 1){
+ if(MS0->S4.objeFlag ||!MS0->S4.placeFlag) team1num = 65000;
if((MS0->S4.unitNum <= team1num) && (MS0->S4.unitNum <= objeSCSunitCnt)){
}else if((MS0->S4.unitNum <= team1num) && !MS0->S4.objeFlag){
trueFlag = false;
}
}else if(MS0->S4.unitType == 2){
- if(MS0->S4.objeFlag) team1num = 65000;
if((MS0->S4.unitNum >= team1num) && (MS0->S4.unitNum >= objeSCSunitCnt)){
}U = UTop;
}
if(MS0->S4.unitType == 0){
- if(MS0->S4.objeFlag) team2num = MS0->S4.unitNum;
+ if(MS0->S4.objeFlag || MS0->S4.placeFlag) team2num = MS0->S4.unitNum;
if((MS0->S4.unitNum == team2num) && (MS0->S4.unitNum == objeSCSunitCnt)){
trueFlag = false;
}
}else if(MS0->S4.unitType == 1){
- if(MS0->S4.objeFlag) team2num = 65000;
+ if(MS0->S4.objeFlag || MS0->S4.placeFlag) team2num = 65000;
if((MS0->S4.unitNum <= team2num) && (MS0->S4.unitNum <= objeSCSunitCnt)){