Skip to content

Commit 6058960

Browse files
JasperGeurtzJasperGeurtz
committed
general cleanup, remove unused code & cstyle array->java array
1 parent 1cdb420 commit 6058960

14 files changed

+181
-281
lines changed

‎src/main/java/bwapi/BuildingPlacer.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
class BuildingPlacer {
44
private static final int MAX_RANGE = 64;
5-
private static TilePosition gDirections[] = {
5+
private static TilePosition[] gDirections = {
66
new TilePosition(1, 1),
77
new TilePosition(0, 1),
88
new TilePosition(-1, 1),
@@ -12,7 +12,7 @@ class BuildingPlacer {
1212
new TilePosition(0, -1),
1313
new TilePosition(-1, -1)
1414
};
15-
private static BuildTemplate buildTemplates[] = // [13 + 1]
15+
private static BuildTemplate[] buildTemplates = // [13 + 1]
1616
{
1717
new BuildTemplate(32, 0, 0, 1),
1818
new BuildTemplate(0, 32, 1, 0),
@@ -363,8 +363,8 @@ private static class BuildTemplate {
363363

364364
static class PlacementReserve {
365365
public final int maxSearch;
366-
byte data[][];
367-
byte save[][];
366+
byte[][] data;
367+
byte[][] save;
368368

369369
PlacementReserve(final int maxRange) {
370370
maxSearch = Math.min(Math.max(0, maxRange), MAX_RANGE);
@@ -446,8 +446,6 @@ boolean hasValidSpace() {
446446
return false;
447447
}
448448

449-
;
450-
451449
void backup() {
452450
System.arraycopy(save, 0, data, 0, save.length);
453451
}

‎src/main/java/bwapi/Game.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import static bwapi.UnitType.*;
1515

1616
public class Game {
17-
private static final int damageRatio[][] = {
17+
private static final int[][] damageRatio = {
1818
// Ind, Sml, Med, Lrg, Non, Unk
1919
{0, 0, 0, 0, 0, 0}, // Independent
2020
{0, 128, 192, 256, 0, 0}, // Explosive
@@ -24,7 +24,7 @@ public class Game {
2424
{0, 0, 0, 0, 0, 0}, // None
2525
{0, 0, 0, 0, 0, 0} // Unknown
2626
};
27-
private static final boolean bPsiFieldMask[][] = {
27+
private static final boolean[][] bPsiFieldMask = {
2828
{false, false, false, false, false, true, true, true, true, true, true, false, false, false, false, false},
2929
{false, false, true, true, true, true, true, true, true, true, true, true, true, true, false, false},
3030
{false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false},

‎src/main/java/bwapi/Race.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,27 @@ public enum Race {
1717
Unknown(8);
1818

1919
public static Race[] races = new Race[8 + 1];
20-
static UnitType workerTypes[] = {
20+
static UnitType[] workerTypes = {
2121
Zerg_Drone, Terran_SCV, Protoss_Probe,
2222
UnitType.None, UnitType.None, UnitType.None, // unused
2323
UnitType.Unknown, UnitType.None, UnitType.Unknown // random, none, unk
2424
};
25-
static UnitType baseTypes[] = {
25+
static UnitType[] baseTypes = {
2626
Zerg_Hatchery, Terran_Command_Center, Protoss_Nexus,
2727
UnitType.None, UnitType.None, UnitType.None, // unused
2828
UnitType.Unknown, UnitType.None, UnitType.Unknown // random, none, unk
2929
};
30-
static UnitType refineryTypes[] = {
30+
static UnitType[] refineryTypes = {
3131
Zerg_Extractor, Terran_Refinery, Protoss_Assimilator,
3232
UnitType.None, UnitType.None, UnitType.None, // unused
3333
UnitType.Unknown, UnitType.None, UnitType.Unknown // random, none, unk
3434
};
35-
static UnitType transportTypes[] = {
35+
static UnitType[] transportTypes = {
3636
Zerg_Overlord, Terran_Dropship, Protoss_Shuttle,
3737
UnitType.None, UnitType.None, UnitType.None, // unused
3838
UnitType.Unknown, UnitType.None, UnitType.Unknown // random, none, unk
3939
};
40-
static UnitType supplyTypes[] = {
40+
static UnitType[] supplyTypes = {
4141
Zerg_Overlord, Terran_Supply_Depot, Protoss_Pylon,
4242
UnitType.None, UnitType.None, UnitType.None, // unused
4343
UnitType.Unknown, UnitType.None, UnitType.Unknown // random, none, unk

‎src/main/java/bwapi/TechType.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ public enum TechType {
4949
Unknown(46);
5050

5151
/// IMPLEMENTATION
52-
private static int defaultOreCost[] = // Same as default gas cost
52+
private static int[] defaultOreCost = // Same as default gas cost
5353
{100, 200, 200, 100, 0, 150, 0, 200, 100, 150, 100, 100, 0, 100, 0, 200, 100, 100, 0, 200, 150, 150, 150, 0, 100, 200, 0, 200, 0, 100, 100, 100, 200};
54-
private static int defaultTimeCost[] =
54+
private static int[] defaultTimeCost =
5555
{1200, 1500, 1800, 1200, 0, 1200, 0, 1200, 1800, 1500, 1200, 1200, 0, 1200, 0, 1500, 1500, 1200, 0, 1800, 1200, 1800, 1500, 0, 1200, 1200, 0, 1800, 0, 1800, 1800, 1500, 1800};
56-
private static int defaultEnergyCost[] =
56+
private static int[] defaultEnergyCost =
5757
{0, 100, 100, 0, 50, 0, 100, 75, 150, 25, 25, 0, 0, 150, 100, 150, 0, 75, 75, 75, 100, 150, 100, 0, 50, 125, 0, 150, 0, 50, 75, 100, 0, 0, 1};
58-
private static UnitType whatResearches[] = {
58+
private static UnitType[] whatResearches = {
5959
UnitType.Terran_Academy, UnitType.Terran_Covert_Ops, UnitType.Terran_Science_Facility, UnitType.Terran_Machine_Shop,
6060
UnitType.None, UnitType.Terran_Machine_Shop, UnitType.None, UnitType.Terran_Science_Facility, UnitType.Terran_Physics_Lab,
6161
UnitType.Terran_Control_Tower, UnitType.Terran_Covert_Ops, UnitType.Zerg_Hatchery, UnitType.None, UnitType.Zerg_Queens_Nest,
@@ -66,14 +66,14 @@ public enum TechType {
6666
UnitType.Zerg_Hydralisk_Den, UnitType.None, UnitType.None, UnitType.None, UnitType.None, UnitType.None, UnitType.None, UnitType.None, UnitType.None, UnitType.None, UnitType.None, UnitType.None,
6767
UnitType.None, UnitType.None, UnitType.Unknown
6868
};
69-
private static Race techRaces[] = {
69+
private static Race[] techRaces = {
7070
Race.Terran, Race.Terran, Race.Terran, Race.Terran, Race.Terran, Race.Terran, Race.Terran, Race.Terran, Race.Terran, Race.Terran, Race.Terran,
7171
Race.Zerg, Race.Zerg, Race.Zerg, Race.Zerg, Race.Zerg, Race.Zerg, Race.Zerg, Race.Zerg,
7272
Race.Protoss, Race.Protoss, Race.Protoss, Race.Protoss, Race.Protoss,
7373
Race.Terran, Race.Protoss, Race.None, Race.Protoss, Race.Protoss, Race.Protoss, Race.Terran, Race.Protoss, Race.Zerg, Race.None, Race.Terran,
7474
Race.None, Race.None, Race.None, Race.None, Race.None, Race.None, Race.None, Race.None, Race.None, Race.None, Race.Terran, Race.Unknown
7575
};
76-
private static WeaponType techWeapons[] = {
76+
private static WeaponType[] techWeapons = {
7777
WeaponType.None, WeaponType.Lockdown, WeaponType.EMP_Shockwave, WeaponType.Spider_Mines, WeaponType.None, WeaponType.None, WeaponType.None, WeaponType.Irradiate, WeaponType.Yamato_Gun,
7878
WeaponType.None, WeaponType.None, WeaponType.None, WeaponType.None, WeaponType.Spawn_Broodlings, WeaponType.Dark_Swarm, WeaponType.Plague, WeaponType.Consume, WeaponType.Ensnare, WeaponType.Parasite,
7979
WeaponType.Psionic_Storm, WeaponType.None, WeaponType.None, WeaponType.Stasis_Field, WeaponType.None, WeaponType.Restoration, WeaponType.Disruption_Web, WeaponType.None, WeaponType.Mind_Control,
@@ -83,21 +83,21 @@ public enum TechType {
8383
private static int TARG_UNIT = 1;
8484
private static int TARG_POS = 2;
8585
private static int TARG_BOTH = 3;
86-
private static int techTypeFlags[] = {
86+
private static int[] techTypeFlags = {
8787
0, TARG_UNIT, TARG_BOTH, TARG_POS, TARG_BOTH, 0, TARG_UNIT, TARG_UNIT, TARG_UNIT, 0, 0, 0,
8888
TARG_UNIT, TARG_UNIT, TARG_BOTH, TARG_BOTH, TARG_UNIT, TARG_BOTH, TARG_UNIT, TARG_BOTH, TARG_UNIT,
8989
TARG_BOTH, TARG_BOTH, TARG_UNIT, TARG_UNIT, TARG_BOTH, 0, TARG_UNIT, TARG_UNIT, TARG_UNIT, TARG_UNIT,
9090
TARG_BOTH, 0, 0, TARG_BOTH, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, TARG_BOTH
9191
};
92-
private static Order techOrders[] = {
92+
private static Order[] techOrders = {
9393
Order.None, CastLockdown, CastEMPShockwave, PlaceMine, CastScannerSweep, Order.None, CastDefensiveMatrix,
9494
CastIrradiate, FireYamatoGun, Order.None, Order.None, Order.None, CastInfestation, CastSpawnBroodlings,
9595
CastDarkSwarm, CastPlague, CastConsume, CastEnsnare, CastParasite, CastPsionicStorm,
9696
CastHallucination, CastRecall, CastStasisField, Order.None, CastRestoration, CastDisruptionWeb,
9797
Order.None, CastMindControl, Order.None, CastFeedback, CastOpticalFlare, CastMaelstrom, Order.None, Order.None, MedicHeal,
9898
Order.None, Order.None, Order.None, Order.None, Order.None, Order.None, Order.None, Order.None, Order.None, Order.None, NukePaint, Order.Unknown
9999
};
100-
private static UnitType techWhatUses[][] = {
100+
private static UnitType[][] techWhatUses = {
101101
// Stimpacks
102102
{UnitType.Terran_Marine, UnitType.Terran_Firebat, UnitType.Hero_Jim_Raynor_Marine, UnitType.Hero_Gui_Montag},
103103
// Lockdown

‎src/main/java/bwapi/Unit.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -735,8 +735,6 @@ public boolean isMoving() {
735735
return unitData.isMoving();
736736
}
737737

738-
;
739-
740738
public boolean isParasited() {
741739
return unitData.isParasited();
742740
}

0 commit comments

Comments
 (0)