Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
Argent77 committed Dec 18, 2021
2 parents 7155dba + f39a523 commit 2eba07c
Show file tree
Hide file tree
Showing 37 changed files with 1,060 additions and 310 deletions.
2 changes: 1 addition & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<classpathentry exported="true" kind="lib" path="lib/rsyntaxtextarea/rsyntaxtextarea.jar" sourcepath="lib/rsyntaxtextarea/RSyntaxTextArea-3.1.1-light.zip"/>
<classpathentry exported="true" kind="lib" path="lib/jhexview/jhexview.jar" sourcepath="lib/jhexview/jhexview-current.zip"/>
<classpathentry exported="true" kind="lib" path="lib/montemedia/montemedia.jar" sourcepath="lib/montemedia/MonteMedia-0.7.7.zip"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ the [Near Infinity Wiki](https://github.com/NearInfinityBrowser/NearInfinity/wik
## How to build Near Infinity

**Required tools:**
- [Java SE Development Kit 8 or higher](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
- [Oracle's Java SE Development Kit 8 or later](https://www.oracle.com/java/technologies/downloads/), or [OpenJDK 8 or later](https://adoptium.net/releases.html)
- [Apache Ant](http://ant.apache.org/)

If you wish to compile Near Infinity from source, the easiest way to do so is
Expand Down
17 changes: 8 additions & 9 deletions src/org/infinity/NearInfinity.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
Expand Down Expand Up @@ -68,6 +67,9 @@
import javax.swing.plaf.FontUIResource;

import org.infinity.datatype.ProRef;
import org.infinity.datatype.Song2daBitmap;
import org.infinity.datatype.SpellProtType;
import org.infinity.datatype.Summon2daBitmap;
import org.infinity.gui.BrowserMenuBar;
import org.infinity.gui.ButtonPopupWindow;
import org.infinity.gui.ChildFrame;
Expand All @@ -91,6 +93,7 @@
import org.infinity.resource.ResourceFactory;
import org.infinity.resource.Viewable;
import org.infinity.resource.ViewableContainer;
import org.infinity.resource.are.AreResource;
import org.infinity.resource.bcs.Signatures;
import org.infinity.resource.cre.decoder.util.ItemInfo;
import org.infinity.resource.cre.decoder.util.SpriteUtils;
Expand Down Expand Up @@ -212,8 +215,6 @@ public static void printHelp(String jarFile)
System.out.println("\nOptions:");
System.out.println(" -v, -version Display version information.");
System.out.println(" -h, -help Display this help.");
System.out.println(" -i Disable support of case-sensitive filesystems");
System.out.println(" (temporary workaround for buggy file access on Linux systems)");
System.out.println(" -t type Force the current or specified game to be of");
System.out.println(" specific type. (Use with care!)");
System.out.println(" Supported game types:");
Expand All @@ -238,12 +239,6 @@ public static void advanceProgress(String note)

public static void main(String args[])
{
// TODO: remove option when detection of case-sensitive filesystems has been fixed
if (Arrays.asList(args).contains("-i")) {
// must be set before first file access through FileManager class
Profile.addProperty(Profile.Key.GET_GLOBAL_FILE_CASE_CHECK, Profile.Type.BOOLEAN, Boolean.valueOf(false));
}

Profile.Game forcedGame = null;
Path gameOverride = null;

Expand Down Expand Up @@ -1058,6 +1053,10 @@ private static void clearCache(boolean refreshOnly)
ColorConvert.clearCache();
SpriteUtils.clearCache();
ItemInfo.clearCache();
AreResource.clearCache();
Song2daBitmap.resetSonglist();
SpellProtType.resetTypeTable();
Summon2daBitmap.resetSummonTable();
}

private static void showProgress(String msg, int max)
Expand Down
Loading

0 comments on commit 2eba07c

Please sign in to comment.