Fixed 2DA resref detection issues in script editor and compiler

Argent77 · May 26, 2017 · 5a39c27 · 5a39c27
1 parent 10040e2
commit 5a39c27
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/org/infinity/gui/ScriptTextArea.java b/src/org/infinity/gui/ScriptTextArea.java
@@ -573,7 +573,7 @@ private InteractiveToken updateStringToken(Token token)
           retVal.resourceEntries.addAll(resList);
           retVal.resourceEntries.add(ResourceFactory.getResourceEntry("SPELL.IDS"));
           break;
-        } else if (Character.isUpperCase(type.charAt(0))) {
+        } else if (Character.isUpperCase(type.charAt(0)) || Character.isDigit(type.charAt(0))) {
           // regular resource
           if (!"ARE".equals(type) || !ScriptInfo.getInfo().isGlobalScope(token.getLexeme())) {
             String resRef = value + '.' + type;

diff --git a/src/org/infinity/resource/bcs/Compiler.java b/src/org/infinity/resource/bcs/Compiler.java
@@ -730,7 +730,7 @@ private void checkParams(ScriptNode node)
                 checkSpellList(param, value, node);
                 found = true;
                 break;
-              } else if (Character.isUpperCase(resType.charAt(0))) {
+              } else if (Character.isUpperCase(resType.charAt(0)) || Character.isDigit(resType.charAt(0)) ) {
                 if (value.length() <= 8) {
                   // checking resource
                   if (value.isEmpty()) {

diff --git a/src/org/infinity/resource/bcs/Decompiler.java b/src/org/infinity/resource/bcs/Decompiler.java
@@ -1143,7 +1143,8 @@ private String generateStringComment(String value, Signatures.Function.Parameter
           }
           sb.append(']');
           break;
-        } else if (Character.isUpperCase(type.charAt(0)) && value.length() <= 8) {
+        } else if ((Character.isUpperCase(type.charAt(0)) || Character.isDigit(type.charAt(0))) &&
+                   value.length() <= 8) {
           if (!type.equals("ARE") || !ScriptInfo.getInfo().isGlobalScope(value)) {
             // resolving resource name
             String resRef = value + '.' + type;