From aaea25bf1f4895a84ba65a10d0c5747016eb2ec1 Mon Sep 17 00:00:00 2001
From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com>
Date: Thu, 29 Jan 2026 21:36:01 +0100
Subject: [PATCH] haxe language server hopeful fix (needs testing)
---
project.xml | 30 +++++++++++++++++--
source/funkin/backend/FunkinSprite.hx | 4 +++
.../backend/system/macros/AliasMacro.hx | 2 +-
.../backend/system/macros/DefinesMacro.hx | 4 +--
.../backend/system/macros/GitCommitMacro.hx | 18 +++++------
source/funkin/game/Character.hx | 7 +++--
6 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/project.xml b/project.xml
index a0a557a7..5ed82a43 100644
--- a/project.xml
+++ b/project.xml
@@ -19,7 +19,7 @@
-
+
-
+
+
+
+
@@ -115,6 +119,24 @@
+
+
+
+
+
+
+
+
@@ -172,7 +194,7 @@
-
+
@@ -219,8 +241,10 @@
+
diff --git a/source/funkin/backend/FunkinSprite.hx b/source/funkin/backend/FunkinSprite.hx
index 97ad5a11..de2b2d24 100644
--- a/source/funkin/backend/FunkinSprite.hx
+++ b/source/funkin/backend/FunkinSprite.hx
@@ -374,6 +374,10 @@ class FunkinSprite extends FlxAnimate implements IBeatReceiver implements IOffse
super.prepareDrawMatrix(matrix, camera);
+ applyZoomFactor(matrix, camera);
+ }
+
+ function applyZoomFactor(matrix:FlxMatrix, camera:FlxCamera) {
if(__shouldDoZoomFactor()) {
__prepareZoomFactor(_rect2, camera);
matrix.setTo(
diff --git a/source/funkin/backend/system/macros/AliasMacro.hx b/source/funkin/backend/system/macros/AliasMacro.hx
index 227c9f76..2c322bb6 100644
--- a/source/funkin/backend/system/macros/AliasMacro.hx
+++ b/source/funkin/backend/system/macros/AliasMacro.hx
@@ -25,7 +25,7 @@ class AliasMacro {
}];
public static function build():Array {
- #if display
+ #if LIME_DISPLAY
return Context.getBuildFields();
#end
diff --git a/source/funkin/backend/system/macros/DefinesMacro.hx b/source/funkin/backend/system/macros/DefinesMacro.hx
index 7fe19375..298e4365 100644
--- a/source/funkin/backend/system/macros/DefinesMacro.hx
+++ b/source/funkin/backend/system/macros/DefinesMacro.hx
@@ -19,9 +19,9 @@ class DefinesMacro {
// INTERNAL MACROS
#if REGION
- private static macro function __getDefines() {
+ private static macro function __getDefines():Expr {
#if display
- return macro $v{[]};
+ return macro $v{([]:Map)};
#else
return macro $v{Context.getDefines()};
#end
diff --git a/source/funkin/backend/system/macros/GitCommitMacro.hx b/source/funkin/backend/system/macros/GitCommitMacro.hx
index 8b275499..c27b169d 100644
--- a/source/funkin/backend/system/macros/GitCommitMacro.hx
+++ b/source/funkin/backend/system/macros/GitCommitMacro.hx
@@ -64,7 +64,7 @@ class GitCommitMacro {
// INTERNAL MACROS
#if REGION
private static macro function __getCommitHash() {
- #if display
+ #if LIME_DISPLAY
return macro $v{"-"};
#else
try {
@@ -78,7 +78,7 @@ class GitCommitMacro {
}
private static macro function __getCommitNumber() {
- #if display
+ #if LIME_DISPLAY
return macro $v{0};
#else
try {
@@ -92,7 +92,7 @@ class GitCommitMacro {
}
private static macro function __getCommitHashLong() {
- #if display
+ #if LIME_DISPLAY
return macro $v{"-"};
#else
try {
@@ -106,7 +106,7 @@ class GitCommitMacro {
}
private static macro function __getCommitMessage() {
- #if display
+ #if LIME_DISPLAY
return macro $v{"-"};
#else
try {
@@ -124,7 +124,7 @@ class GitCommitMacro {
}
private static macro function __getCommitAuthor() {
- #if display
+ #if LIME_DISPLAY
return macro $v{"-"};
#else
try {
@@ -138,8 +138,8 @@ class GitCommitMacro {
}
private static macro function __getCommitDate() {
- #if display
- return macro $v{Date.now()};
+ #if LIME_DISPLAY
+ return macro Date.now();
#else
try {
// get the time in UTC format
@@ -164,7 +164,7 @@ class GitCommitMacro {
}
private static macro function __getCurrentBranch() {
- #if display
+ #if LIME_DISPLAY
return macro $v{"-"};
#else
try {
@@ -179,7 +179,7 @@ class GitCommitMacro {
}
private static macro function __getHasUncommittedChanges() {
- #if display
+ #if LIME_DISPLAY
return macro $v{false};
#else
try {
diff --git a/source/funkin/game/Character.hx b/source/funkin/game/Character.hx
index 54d7cf20..4951cd59 100644
--- a/source/funkin/game/Character.hx
+++ b/source/funkin/game/Character.hx
@@ -1,6 +1,5 @@
package funkin.game;
-import sys.FileSystem;
import flixel.util.FlxSpriteUtil;
import openfl.display.Graphics;
import flixel.util.typeLimit.OneOfTwo;
@@ -90,6 +89,8 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
scripts.call("create");
buildCharacter(xml);
scripts.call("postCreate");
+
+
}
@:noCompletion var __swappedLeftRightAnims:Bool = false;
@@ -158,9 +159,9 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
if (event.cancelled) return;
if (isDanceLeftDanceRight)
- playAnim(((danced = !danced) ? 'danceLeft' : 'danceRight') + idleSuffix, DANCE);
+ playAnim(((danced = !danced) ? 'danceLeft' : 'danceRight') + idleSuffix, false, DANCE);
else
- playAnim('idle' + idleSuffix, DANCE);
+ playAnim('idle' + idleSuffix, false, DANCE);
}
public function tryDance() {