Skip to content

Commit 4a6c31f

Browse files
committed
Merge branch 'Archipelago' of https://github.com/Z11Coding/Mixtape-Engine-Rework into Archipelago
2 parents 238b903 + f48a502 commit 4a6c31f

File tree

5 files changed

+559
-9
lines changed

5 files changed

+559
-9
lines changed

source/Main.hx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,12 @@ class Main extends Sprite
157157
trace(testArray.get("test2"));
158158
trace(testArray["test"]);
159159

160+
// 'You can\'t put variable expressions in COMMENTS, silly!'.NativeComment(true);
161+
// trace('testArray: $testArray');
162+
// 'testArray = $testArray'.NativeTrace(true, false);
163+
// "NativeTrace works with double quotes too!".NativeTrace(true);
164+
// testArray.NativeTrace(true, false);
165+
160166
yutautil.Threader.runInThread(commandPrompt.start());
161167
#if HSCRIPT_ALLOWED
162168
Iris.warn = function(x, ?pos:haxe.PosInfos) {
@@ -315,9 +321,6 @@ class Main extends Sprite
315321
// This is a test to see if the GoToTag and GoTo string extensions work correctly.
316322

317323

318-
// trace("E tag woooooorks!!!");
319-
320-
321324
#if android
322325
FlxG.android.preventDefaultKeys = [flixel.input.android.FlxAndroidKey.BACK];
323326
#end
@@ -409,6 +412,7 @@ class Main extends Sprite
409412
#if CRASH_HANDLER
410413
public static function onCrash(e:UncaughtErrorEvent):Void
411414
{
415+
"Crash Handler Code for Mixtape Engine Rework.".NativeComment();
412416
// Prevent further propagation of the error to avoid crashing the application
413417
e.preventDefault();
414418
var errMsg:String = "";

source/states/PlayState.hx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,13 @@ class PlayState extends MusicBeatState
176176
var raveLightsColors:Array<Int>;
177177
var ravemode:Bool;
178178

179+
// public static function testSpeedEvent(input:Dynamic):Null<SpeedEvent>
180+
// {
181+
// // Checks if the input is a LuaScript instance.
182+
// return yutautil.CUMacroTools.createNullStruct();
183+
// }
184+
185+
179186
@:noCompletion
180187
static function set_stageUI(value:String):String
181188
{

0 commit comments

Comments
 (0)