project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Datastructures/Team.java
equal
deleted
inserted
replaced
86 |
86 |
87 public Team(Parcel in){ |
87 public Team(Parcel in){ |
88 readFromParcel(in); |
88 readFromParcel(in); |
89 } |
89 } |
90 |
90 |
|
91 @Override |
91 public boolean equals(Object o){ |
92 public boolean equals(Object o){ |
92 if(super.equals(o)) return true; |
93 if(super.equals(o)) return true; |
93 else if(o instanceof Team){ |
94 else if(o instanceof Team){ |
94 Team t = (Team)o; |
95 Team t = (Team)o; |
95 boolean ret = name.equals(t.name); |
96 boolean ret = name.equals(t.name); |
100 ret &= hash.equals(t.hash); |
101 ret &= hash.equals(t.hash); |
101 return ret; |
102 return ret; |
102 }else{ |
103 }else{ |
103 return false; |
104 return false; |
104 } |
105 } |
|
106 } |
|
107 |
|
108 @Override |
|
109 public int hashCode() { |
|
110 final int prime = 31; |
|
111 int result = 1; |
|
112 result = prime * result + ((name == null) ? 0 : name.hashCode()); |
|
113 result = prime * result + ((grave == null) ? 0 : grave.hashCode()); |
|
114 result = prime * result + ((flag == null) ? 0 : flag.hashCode()); |
|
115 result = prime * result + ((voice == null) ? 0 : voice.hashCode()); |
|
116 result = prime * result + ((fort == null) ? 0 : fort.hashCode()); |
|
117 result = prime * result + ((hash == null) ? 0 : hash.hashCode()); |
|
118 return result; |
105 } |
119 } |
106 |
120 |
107 public void setRandomColor(int[] illegalcolors){ |
121 public void setRandomColor(int[] illegalcolors){ |
108 Integer[] colorsToPickFrom = TEAM_COLORS; |
122 Integer[] colorsToPickFrom = TEAM_COLORS; |
109 if(illegalcolors != null){ |
123 if(illegalcolors != null){ |