Apple-2-Tools
/
dmolony-DiskBrowser
mirror of https://github.com/dmolony/DiskBrowser.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

improved group routine

This commit is contained in:
Denis Molony 2022-05-28 19:15:32 +10:00
parent ce52253f5d
commit ca11e8ee68
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/bytezone/diskbrowser/wizardry/CharacterV4.java
View File

@ -11,7 +11,7 @@ public class CharacterV4 extends AbstractFile
// -----------------------------------------------------------------------------------// // -----------------------------------------------------------------------------------//
{ {
int id; int id;
int nextCharacter; int nextCharacterId;
String slogan = ""; String slogan = "";
// ---------------------------------------------------------------------------------// // ---------------------------------------------------------------------------------//
@ -21,7 +21,7 @@ public class CharacterV4 extends AbstractFile
super (name, buffer); super (name, buffer);
this.id = id; this.id = id;
nextCharacter = Utility.getShort (buffer, 0x7D); nextCharacterId = Utility.getShort (buffer, 0x7D);
} }
// ---------------------------------------------------------------------------------// // ---------------------------------------------------------------------------------//
@ -29,15 +29,17 @@ public class CharacterV4 extends AbstractFile
// ---------------------------------------------------------------------------------// // ---------------------------------------------------------------------------------//
{ {
String text = getPartialSlogan (); String text = getPartialSlogan ();
int nextCharacterId = this.nextCharacter; int nextCharacterId = this.nextCharacterId;
while (nextCharacterId > 0 && nextCharacterId != id) while (nextCharacterId != id)
{ {
CharacterV4 next = characters.get (nextCharacterId); CharacterV4 nextCharacter = characters.get (nextCharacterId);
if (!next.slogan.isEmpty ())
if (!nextCharacter.slogan.isEmpty ()) // this group has been processed already
return; return;
text += next.getPartialSlogan ();
nextCharacterId = next.nextCharacter; text += nextCharacter.getPartialSlogan ();
nextCharacterId = nextCharacter.nextCharacterId;
} }
slogan = text.replace ("\\", " - "); slogan = text.replace ("\\", " - ");
@ -60,7 +62,7 @@ public class CharacterV4 extends AbstractFile
text.append (String.format ("Id ............. %3d%n", id)); text.append (String.format ("Id ............. %3d%n", id));
text.append (String.format ("Name ........... %s%n", name)); text.append (String.format ("Name ........... %s%n", name));
text.append (String.format ("Slogan ......... %s%n", slogan)); text.append (String.format ("Slogan ......... %s%n", slogan));
text.append (String.format ("Next ........... %d%n%n", nextCharacter)); text.append (String.format ("Next ........... %d%n%n", nextCharacterId));
text.append (HexFormatter.format (buffer, 1, buffer[0] & 0xFF)); text.append (HexFormatter.format (buffer, 1, buffer[0] & 0xFF));