Skip to content

Commit a1c6b1b

Browse files
author
bytekeeper
committed
Fixed String retrieval generation. Printing map name and file name now and also greet the tester after 2 seconds :)
1 parent e4d8b2d commit a1c6b1b

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

src/main/java/bwapi/ClientData.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -327,28 +327,28 @@ void setMapHeight(int value) {
327327
}
328328
String getMapFileName() {
329329
int offset = myOffset + 3446408;
330-
return Buffers.toString(sharedMemory, offset, 1);
330+
return Buffers.toString(sharedMemory, offset, 261);
331331
}
332332
void setMapFileName(String value) {
333333
Buffers.fromString(sharedMemory, myOffset + 3446408, 261, value);
334334
}
335335
String getMapPathName() {
336336
int offset = myOffset + 3446669;
337-
return Buffers.toString(sharedMemory, offset, 1);
337+
return Buffers.toString(sharedMemory, offset, 261);
338338
}
339339
void setMapPathName(String value) {
340340
Buffers.fromString(sharedMemory, myOffset + 3446669, 261, value);
341341
}
342342
String getMapName() {
343343
int offset = myOffset + 3446930;
344-
return Buffers.toString(sharedMemory, offset, 1);
344+
return Buffers.toString(sharedMemory, offset, 33);
345345
}
346346
void setMapName(String value) {
347347
Buffers.fromString(sharedMemory, myOffset + 3446930, 33, value);
348348
}
349349
String getMapHash() {
350350
int offset = myOffset + 3446963;
351-
return Buffers.toString(sharedMemory, offset, 1);
351+
return Buffers.toString(sharedMemory, offset, 41);
352352
}
353353
void setMapHash(String value) {
354354
Buffers.fromString(sharedMemory, myOffset + 3446963, 41, value);
@@ -542,7 +542,7 @@ void setEventStringCount(int value) {
542542
}
543543
String getEventStrings(int i) {
544544
int offset = myOffset + 10706628 + 1 * 256 * i;
545-
return Buffers.toString(sharedMemory, offset, 2);
545+
return Buffers.toString(sharedMemory, offset, 256);
546546
}
547547
void setEventStrings(int i, String value) {
548548
Buffers.fromString(sharedMemory, myOffset + 10706628 + 1 * 256 * i, 256, value);
@@ -556,7 +556,7 @@ void setStringCount(int value) {
556556
}
557557
String getStrings(int i) {
558558
int offset = myOffset + 10962632 + 1 * 1024 * i;
559-
return Buffers.toString(sharedMemory, offset, 2);
559+
return Buffers.toString(sharedMemory, offset, 1024);
560560
}
561561
void setStrings(int i, String value) {
562562
Buffers.fromString(sharedMemory, myOffset + 10962632 + 1 * 1024 * i, 1024, value);
@@ -870,7 +870,7 @@ public ForceData(int myOffset) {
870870
}
871871
String getName() {
872872
int offset = myOffset + 0;
873-
return Buffers.toString(sharedMemory, offset, 1);
873+
return Buffers.toString(sharedMemory, offset, 32);
874874
}
875875
void setName(String value) {
876876
Buffers.fromString(sharedMemory, myOffset + 0, 32, value);
@@ -884,7 +884,7 @@ public PlayerData(int myOffset) {
884884
}
885885
String getName() {
886886
int offset = myOffset + 0;
887-
return Buffers.toString(sharedMemory, offset, 1);
887+
return Buffers.toString(sharedMemory, offset, 25);
888888
}
889889
void setName(String value) {
890890
Buffers.fromString(sharedMemory, myOffset + 0, 25, value);

src/test/java/DumpToClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public static void main(String[] args) throws IOException {
188188
break;
189189
case CHAR:
190190
out.printf("Buffers.toString(sharedMemory, offset, %d)",
191-
v.arraySizes.size());
191+
v.arraySizes.get(v.arraySizes.size() - 1));
192192
break;
193193
case ENUM:
194194
out.print(v.enumName + ".idToEnum[sharedMemory.getInt(offset)]");

src/test/java/marinehell/MarineHell.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public void onStart() {
7070
BWTA.analyze();
7171

7272
int i = 0;
73+
System.out.printf("Map name: %s; Map file name: %s\n", game.mapName(), game.mapFileName());
7374
}
7475

7576
@Override
@@ -92,6 +93,10 @@ public void onFrame() {
9293
dontBuild = true;
9394
}
9495

96+
if (game.getFrameCount() == 48) {
97+
game.sendText("Hello from JBWAPI!");
98+
}
99+
95100
game.setLocalSpeed(0);
96101

97102
if (maxCyclesForSearching < cyclesForSearching) {

0 commit comments

Comments
 (0)