Skip to content

Commit

Permalink
fix mods on mac and controls on everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
sayofthelor committed Jan 28, 2024
1 parent 4437be8 commit cd1c476
Show file tree
Hide file tree
Showing 13 changed files with 92 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ export/*
!.vscode/extensions.json
leakertrack.txt
crash-dialog/build
crash-built/
crash-built/
.DS_Store
9 changes: 9 additions & 0 deletions .idea/lore-engine.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 51 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
<haxeflag name="-w" value="-WDeprecated" /> <!-- up here juuuuuuuuust to be sure -->
<!-- _________________________ Application Settings _________________________ -->

<app title="Friday Night Funkin': Lore Engine" file="Lore" packageName="us.sayofthelor.LoreEngine" package="us.sayofthelor.LoreEngine" main="Main" version="0.2.8" company="sayofthelor" />
<app file="Lore" packageName="us.sayofthelor.LoreEngine" package="us.sayofthelor.LoreEngine" main="Main" version="0.2.8" company="sayofthelor" />
<app title="Friday Night Funkin': Lore Engine" unless="debug" />
<app title="Friday Night Funkin': Lore Engine (debug)" if="debug" />

<!--Switch Export with Unique ApplicationID and Icon-->
<set name="APP_ID" value="0x0100f6c013bbc000" />
Expand Down Expand Up @@ -233,5 +235,7 @@
<icon path="art/icon16.png" size='16'/>
<icon path="art/icon32.png" size='32'/>
<icon path="art/icon64.png" size='64'/>
<icon path="art/iconOG.png" />
<icon path="art/iconOG.png" unless='mac'/>
<icon path="art/iconMac.png" if='mac' unless='debug' />
<icon path="art/iconMac-debug.png" if='mac debug' />
</project>
Binary file added art/iconMac-debug.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added art/iconMac.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion source/ClientPrefs.hx
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ class ClientPrefs {
checkForUpdates = FlxG.save.data.checkForUpdates;
}
var save:FlxSave = new FlxSave();
save.bind('controls_v2', 'ninjamuffin99');
save.bind('controls_v2', CoolUtil.getSavePath());
if(save != null && save.data.customControls != null) {
var loadedControls:Map<String, Array<FlxKey>> = save.data.customControls;
for (control => keys in loadedControls) {
Expand Down
2 changes: 1 addition & 1 deletion source/Main.hx
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class Main extends Sprite
#end

ClientPrefs.loadDefaultKeys();
FlxG.save.bind('funkin', 'ninjamuffin99');
FlxG.save.bind('funkin', CoolUtil.getSavePath());
ClientPrefs.loadPrefs();
if (ClientPrefs.aspectRatio != '16:9') { // not a function to ensure you can't call it from the game
var _height:Int;
Expand Down
2 changes: 1 addition & 1 deletion source/Paths.hx
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ class Paths

#if MODS_ALLOWED
inline static public function mods(key:String = '') {
return #if mac '././' + #end 'mods/' + key;
return 'mods/' + key;
}

inline static public function modsFont(key:String) {
Expand Down
2 changes: 1 addition & 1 deletion source/lore/FPS.hx
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class FPS extends TextField
if (ClientPrefs.showMem) { templateText += '${memThing}{memory}'; if (ClientPrefs.showLore) templateText += "\n"; }
if (ClientPrefs.showLore) { templateText += '${loreThing}${(MainMenuState.loreEngineVersion.endsWith(".0") ? MainMenuState.loreEngineVersion.replace(".0", "") : MainMenuState.loreEngineVersion) + MainMenuState.versionSuffix}'; }
#if debug if (templateText != "") templateText += " "; templateText += '(debug)'; #end
if (MainMenuState.isNotFinal && MainMenuState.commitHash != "") { if (templateText != "") templateText += " "; templateText += '(${MainMenuState.commitHash.substr(0, 6)})'; }
#if !HIDE_HASH if (MainMenuState.isNotFinal && MainMenuState.commitHash != "") { if (templateText != "") templateText += " "; templateText += '(${MainMenuState.commitHash.substr(0, 6)})'; } #end
set_visibility(ClientPrefs.showFPS);
set_rainbowEnabled(ClientPrefs.rainbowFPS);
updatePosition();
Expand Down

0 comments on commit cd1c476

Please sign in to comment.