fixed enamy select and building units
This commit is contained in:
parent
ba32196429
commit
8f74ca2ee5
7 changed files with 83 additions and 24 deletions
|
|
@ -104,14 +104,14 @@ public class InGameMouseInput extends MouseInput{
|
|||
// Make unit mouseover select
|
||||
if(!map.isPosEmpty(pos.getX(), pos.getY())){
|
||||
if(oldMouseOver != map.getPos(pos.getX(), pos.getY())){
|
||||
if(oldMouseOver != null)oldMouseOver.setMouseOver(false);
|
||||
if(oldMouseOver != null)oldMouseOver.setMouseOver(player,false);
|
||||
oldMouseOver = map.getPos(pos.getX(), pos.getY());
|
||||
oldMouseOver.setMouseOver(true);
|
||||
oldMouseOver.setMouseOver(player,true);
|
||||
}
|
||||
}
|
||||
else{
|
||||
if(oldMouseOver != null){
|
||||
oldMouseOver.setMouseOver(false);
|
||||
oldMouseOver.setMouseOver(player,false);
|
||||
oldMouseOver = null;
|
||||
}
|
||||
}
|
||||
|
|
@ -210,12 +210,12 @@ public class InGameMouseInput extends MouseInput{
|
|||
for(int j=Math.min(startPos.getY(), stopPos.getY()); j<=Math.max(startPos.getY(), stopPos.getY()) ;j++){
|
||||
if(!map.isPosEmpty(i, j) && map.getPos(i, j).getPlayer() == player){
|
||||
selected.add(map.getPos(i, j));
|
||||
map.getPos(i, j).setSelected(true,false);
|
||||
map.getPos(i, j).setSelected(player,true,false);
|
||||
}
|
||||
}
|
||||
}
|
||||
if(!selected.isEmpty()){
|
||||
selected.get((int)(Math.random()*selected.size())).setSelected(true,true);
|
||||
selected.get((int)(Math.random()*selected.size())).setSelected(player, true,true);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -225,7 +225,7 @@ public class InGameMouseInput extends MouseInput{
|
|||
*/
|
||||
public void deselectAllUnits(){
|
||||
for(int i=0; i<selected.size(); i++) {
|
||||
selected.get(i).setSelected(false,false);
|
||||
selected.get(i).setSelected(player,false,false);
|
||||
}
|
||||
selected.clear();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue