Skip to content

Commit b14132b

Browse files
2 characters.
Fixed a crash that would occur if any scripts ran globally and you had Self-Awareness Mode turned off also removed the option because it isn't necessary, if anyone doesn't want their username being shown they could just change it with the lua script since they're lua variables closes #945 and #946
1 parent 216dd95 commit b14132b

File tree

4 files changed

+5
-18
lines changed

4 files changed

+5
-18
lines changed

source/ClientPrefs.hx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ class ClientPrefs { //default settings if it can't find a save file containing y
187187

188188
//Misc
189189
public static var JSEngineRecharts:Bool = false;
190-
public static var SAM:Bool = false;
191190
public static var alwaysTriggerCutscene:Bool = false;
192191
public static var disableSplash:Bool = false;
193192
public static var rainbowTime:Float = 5.0;

source/FunkinLua.hx

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -228,15 +228,10 @@ class FunkinLua {
228228
set('scriptName', scriptName);
229229
set('currentModDirectory', Paths.currentModDirectory);
230230

231-
// breaking the fourth wall shit
232-
if (ClientPrefs.SAM) {
233-
set('user_path', 'Boyfriend.dat');
234-
set("user_name", "Boyfriend"); // usable for things like Exploitation
235-
}
236-
else {
237-
set('user_path', CoolSystemStuff.getUserPath);
238-
set("user_name", CoolSystemStuff.getUsername);
239-
}
231+
// If you don't want this to show, you can use the lua script to change it
232+
set('user_path', CoolSystemStuff.getUserPath());
233+
set("user_name", CoolSystemStuff.getUsername());
234+
240235
#if windows
241236
set('buildTarget', 'windows');
242237
#elseif linux

source/MainMenuState.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class MainMenuState extends MusicBeatState
2626
{
2727
public static final gitCommit:String = HaxeCommit.getGitCommitHash();
2828

29-
public static var psychEngineJSVersionNumber:String = '1.44.1'; //This is also used for Discord RPC
29+
public static var psychEngineJSVersionNumber:String = '1.44.2'; //This is also used for Discord RPC
3030
public static var psychEngineJSVersion:String = psychEngineJSVersionNumber #if commit + ' (Commit $gitCommit)' #end; //This is also used for Discord RPC
3131
public static var psychEngineVersion:String = '0.6.3'; //This is also used for Discord RPC
3232
public static var curSelected:Int = 0;

source/options/MiscSettingsSubState.hx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ class MiscSettingsSubState extends BaseOptionsMenu
3838
false); //Default value
3939
addOption(option);
4040

41-
var option:Option = new Option('Self Awareness Mode', //Name
42-
'If checked, the two lua user functions doesnt take your username/userpath', //Description
43-
'SAM', //Save data variable name
44-
'bool', //Variable type
45-
false); //Default value
46-
addOption(option);
47-
4841
var option:Option = new Option('Always Play Cutscenes', //Name
4942
'If checked, cutscenes will always play even if you\nenter the song through Freeplay.', //Description
5043
'alwaysTriggerCutscene', //Save data variable name

0 commit comments

Comments
 (0)