Skip to content

Commit

Permalink
Merge branch 'lynxlynxlynx-my-argent' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
Argent77 committed Nov 16, 2024
2 parents 87bad5e + 49452c8 commit 00ea730
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/org/infinity/resource/are/AreResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ public final class AreResource extends AbstractStruct implements Resource, HasCh
public static final String ARE_REST_MOVIE_DAY = "Rest movie (day)";
public static final String ARE_REST_MOVIE_NIGHT = "Rest movie (night)";
public static final String ARE_EXPLORED_BITMAP = "Explored bitmap";
public static final String ARE_AREA_INI_FILE = "Area INI";

public static final String[] FLAGS_ARRAY = { "Indoors", "Outdoors", "Day/Night", "Weather", "City", "Forest",
"Dungeon", "Extended night", "Can rest indoors" };
Expand Down
7 changes: 7 additions & 0 deletions src/org/infinity/resource/are/Viewer.java
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@ private JComponent makeFieldPanel() {
ViewerUtil.addLabelFieldPair(fieldPanel, new JLabel(AreResource.ARE_AREA_SCRIPT),
new LinkButton(scriptName, 0, isAlternate), gbl, gbc, true);

// IWDs and PSTs also have area INI spawn files
if ((Boolean) Profile.getProperty(Profile.Key.IS_SUPPORTED_INI)) {
String iniFile = are.getResourceEntry().getResourceRef() + ".INI";
ViewerUtil.addLabelFieldPair(fieldPanel, new JLabel(AreResource.ARE_AREA_INI_FILE),
new LinkButton(iniFile, 0, false), gbl, gbc, true);
}

JButton bView = new JButton("View Area", Icons.ICON_VOLUME_16.getIcon());
bView.setActionCommand(CMD_VIEWAREA);
bView.addActionListener(this);
Expand Down

0 comments on commit 00ea730

Please sign in to comment.