Skip to content

Commit

Permalink
loading screen temp-disabled 'til i figur out shit
Browse files Browse the repository at this point in the history
also ndlls are removed cuz useless
  • Loading branch information
charlesisfeline committed Mar 1, 2024
1 parent 7901ebf commit 29894d2
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 86 deletions.
3 changes: 1 addition & 2 deletions Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@

<define name="CRASH_HANDLER" if="desktop" />
<define name="GITHUB_ALLOWED" />
<haxedef name="NDLLS_ALLOWED" if="cpp"/>
<!--<define name="FREEPLAY_SECTIONS" />-->
<define name="ACHIEVEMENTS_ALLOWED" />
<!--<define name="BUTTPLUG_ALLOWED" />-->
<define name="LOADING_SCREEN" />
<!--<define name="LOADING_SCREEN" />--> <!-- i will uncomment this once moxie does something with this repo lol -->
<define name="VIDEOS_ALLOWED" if="windows || linux || android" unless="32bits" /><!-- wait why is there some hints of an official android port wtf -->
<define name="ALLEYWAY_WATERMARKS" />
<define name="TITLE_SCREEN_EASTER_EGG" />
Expand Down
13 changes: 5 additions & 8 deletions source/backend/Conductor.hx
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ class Conductor
{
var data:Array<Rating> = 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];
}
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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);
}

Expand Down
68 changes: 0 additions & 68 deletions source/backend/NdllUtil.hx

This file was deleted.

6 changes: 0 additions & 6 deletions source/backend/Paths.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 0 additions & 2 deletions source/states/CreditsState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down

0 comments on commit 29894d2

Please sign in to comment.