diff --git a/Project.xml b/Project.xml
index a99e0d1..bf48e37 100644
--- a/Project.xml
+++ b/Project.xml
@@ -23,11 +23,10 @@
-
-
+
diff --git a/source/backend/Conductor.hx b/source/backend/Conductor.hx
index d19e946..274d483 100644
--- a/source/backend/Conductor.hx
+++ b/source/backend/Conductor.hx
@@ -29,8 +29,7 @@ class Conductor
{
var data:Array = arr;
for(i in 0...data.length-1) //skips last window (Shit)
- if (diff <= data[i].hitWindow)
- return data[i];
+ if (diff <= data[i].hitWindow) return data[i];
return data[data.length - 1];
}
@@ -49,8 +48,7 @@ class Conductor
}
for (i in 0...Conductor.bpmChangeMap.length)
{
- if (time >= Conductor.bpmChangeMap[i].songTime)
- lastChange = Conductor.bpmChangeMap[i];
+ if (time >= Conductor.bpmChangeMap[i].songTime) lastChange = Conductor.bpmChangeMap[i];
}
return lastChange;
@@ -65,8 +63,7 @@ class Conductor
}
for (i in 0...Conductor.bpmChangeMap.length)
{
- if (Conductor.bpmChangeMap[i].stepTime<=step)
- lastChange = Conductor.bpmChangeMap[i];
+ if (Conductor.bpmChangeMap[i].stepTime<=step) lastChange = Conductor.bpmChangeMap[i];
}
return lastChange;
@@ -88,11 +85,11 @@ class Conductor
return lastChange.stepTime + Math.floor(time - lastChange.songTime) / lastChange.stepCrochet;
}
- public static function getBeat(time:Float){
+ inline public static function getBeat(time:Float){
return getStep(time)/4;
}
- public static function getBeatRounded(time:Float):Int{
+ inline public static function getBeatRounded(time:Float):Int{
return Math.floor(getStepRounded(time)/4);
}
diff --git a/source/backend/NdllUtil.hx b/source/backend/NdllUtil.hx
deleted file mode 100644
index f888dea..0000000
--- a/source/backend/NdllUtil.hx
+++ /dev/null
@@ -1,68 +0,0 @@
-package backend;
-
-import lime.utils.Assets;
-
-/**
- * Small util that allows you to load any function from ndlls via `getFunction`.
- *
- * NDLLs must be in your mod's "data/ndlls" folder, and must follow this name scheme:
- * - `name.ndll` for Windows targeted ndlls
- *
- * If:
- * - The NDLL is not found
- * - The Function cannot be found in the NDLL
- * then an empty function will be returned instead, and a message will be shown in logs.
- * Ported to Alleyway Engine.
- * @author Codename Engine Team, Altertoriel, CharlesCatYT
- */
-class NdllUtil {
- /**
- * Returns an function from a Haxe NDLL.
- * Limited to 25 argument due to a limitation
- *
- * @param ndll Name of the NDLL.
- * @param name Name of the function.
- * @param args Number of arguments of that function.
- */
- public static function getFunction(ndll:String, name:String, args:Int):Dynamic {
- var path:String;
- #if MODS_ALLOWED
- path = Paths.modsNdll(ndll);
- if(!FileSystem.exists(path))
- #end
- path = Paths.ndll(ndll);
-
- #if NDLLS_ALLOWED
- var func:Dynamic = getFunctionFromPath(path, name, args);
- return Reflect.makeVarArgs((a:Array) -> return macros.ReflectMacro.generateReflectionLike(25, "func", "a"));
- #else
- trace('NDLLs are not supported on this platform.');
- return noop;
- #end
- }
-
- /**
- * Returns an function from a Haxe NDLL at specified path.
- *
- * @param ndll Asset path to the NDLL.
- * @param name Name of the function.
- * @param args Number of arguments of that function.
- */
- public static function getFunctionFromPath(ndll:String, name:String, args:Int):Dynamic {
- #if NDLLS_ALLOWED
- if (!#if MODS_ALLOWED FileSystem #else Assets #end.exists(ndll)) {
- trace('Couldn\'t find ndll at ${ndll}.');
- return noop;
- }
- var func = lime.system.CFFI.load(ndll, name, args);
- if (func == null) {
- trace('Method ${name} in ndll ${ndll} with ${args} args was not found.');
- return noop;
- }
- return func;
- #else trace('NDLLs are not supported on this platform.'); #end
- return noop;
- }
-
- @:noCompletion static function noop() {}
-}
\ No newline at end of file
diff --git a/source/backend/Paths.hx b/source/backend/Paths.hx
index 73f1b5c..5f12de8 100644
--- a/source/backend/Paths.hx
+++ b/source/backend/Paths.hx
@@ -182,9 +182,6 @@ class Paths
inline public static function getSharedPath(file:String = '')
return 'assets/shared/$file';
-
- inline public static function ndll(key:String)
- return getPath('data/ndlls/$key.ndll');
inline static public function txt(key:String, ?library:String)
return getPath('data/$key.txt', TEXT, library);
@@ -462,9 +459,6 @@ class Paths
inline static public function modsJson(key:String)
return modFolders('data/' + key + '.json');
- inline static public function modsNdll(key:String)
- return modFolders('data/ndlls/$key.ndll');
-
inline static public function modsVideo(key:String)
return modFolders('videos/' + key + '.' + VIDEO_EXT);
diff --git a/source/states/CreditsState.hx b/source/states/CreditsState.hx
index 90e7bb6..736c45e 100644
--- a/source/states/CreditsState.hx
+++ b/source/states/CreditsState.hx
@@ -76,8 +76,6 @@ class CreditsState extends MusicBeatState {
['Engine Contributors'],
['CrowPlexus', 'gabriela', 'Input System v3, Major Help and Other PRs', 'https://twitter.com/crowplexus', 'A1A1A1'],
['Keoiki', 'keoiki', 'Note Splash Animations and Latin Alphabet', 'https://twitter.com/Keoiki_', 'D2D2D2'],
- ['lunarcleint', 'lunar', 'codename engine code', 'https://github.com/lunarcleint', 'A1A1A1'],
- ['NeeEoo', 'neo', 'again, codename engine code', 'https://github.com/NeeEoo', 'A1A1A1'],
['Nex', 'nex', 'prs from psych, and other shit', 'https://github.com/NexIsDumb', 'A1A1A1'],
['SqirraRNG', 'sqirra', 'Crash Handler and Base code for\nChart Editor\'s Waveform', 'https://twitter.com/gedehari', 'E1843A'],
['EliteMasterEric', 'mastereric', 'Runtime Shaders support', 'https://twitter.com/EliteMasterEric', 'FFBD40'],