From 0f0a64819e925772d39ece6ca91ebd9323c5c8ee Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Fri, 18 May 2012 15:15:03 +0200 Subject: [PATCH] Add --fused command line argument, to override fused game detection (Designed to make launchers work for 'fake-fused' games, for example ones you'd easily distribute on linux.) --- src/scripts/boot.lua | 4 ++++ src/scripts/boot.lua.h | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/scripts/boot.lua b/src/scripts/boot.lua index 1ce894fe5..85f910ad6 100644 --- a/src/scripts/boot.lua +++ b/src/scripts/boot.lua @@ -112,6 +112,7 @@ end love.arg.options = { console = { a = 0 }, + fused = {a = 0 }, game = { a = 1 } } @@ -206,6 +207,9 @@ function love.boot() -- Is this one of those fancy "fused" games? local can_has_game = pcall(love.filesystem.setSource, arg0) is_fused_game = can_has_game + if love.arg.options.fused.set then + is_fused_game = true + end if not can_has_game and o.game.set and o.game.arg[1] then local full_source = love.path.getfull(o.game.arg[1]) diff --git a/src/scripts/boot.lua.h b/src/scripts/boot.lua.h index 7853bef9b..b4b9141d6 100644 --- a/src/scripts/boot.lua.h +++ b/src/scripts/boot.lua.h @@ -207,6 +207,7 @@ const unsigned char boot_lua[] = 0x20, 0x7b, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x7b, 0x20, 0x61, 0x20, 0x3d, 0x20, 0x30, 0x20, 0x7d, 0x2c, 0x0a, + 0x09, 0x66, 0x75, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x7b, 0x61, 0x20, 0x3d, 0x20, 0x30, 0x20, 0x7d, 0x2c, 0x0a, 0x09, 0x67, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x7b, 0x20, 0x61, 0x20, 0x3d, 0x20, 0x31, 0x20, 0x7d, 0x0a, 0x7d, 0x0a,0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x61, 0x72, 0x67, 0x2e, @@ -345,7 +346,12 @@ const unsigned char boot_lua[] = 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x73, 0x65, 0x74, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x30, 0x29, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x66, 0x75, 0x73, 0x65, 0x64, 0x5f, 0x67, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x63, - 0x61, 0x6e, 0x5f, 0x68, 0x61, 0x73, 0x5f, 0x67, 0x61, 0x6d, 0x65, 0x0a,0x0a, + 0x61, 0x6e, 0x5f, 0x68, 0x61, 0x73, 0x5f, 0x67, 0x61, 0x6d, 0x65, 0x0a, + 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x61, 0x72, 0x67, 0x2e, 0x6f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x2e, 0x66, 0x75, 0x73, 0x65, 0x64, 0x2e, 0x73, 0x65, 0x74, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, + 0x09, 0x09, 0x69, 0x73, 0x5f, 0x66, 0x75, 0x73, 0x65, 0x64, 0x5f, 0x67, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, + 0x74, 0x72, 0x75, 0x65, 0x0a, + 0x09, 0x65, 0x6e, 0x64, 0x0a,0x0a, 0x09, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x63, 0x61, 0x6e, 0x5f, 0x68, 0x61, 0x73, 0x5f, 0x67, 0x61, 0x6d, 0x65, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x2e, 0x73, 0x65, 0x74, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x2e, 0x61, 0x72, 0x67, 0x5b, 0x31, 0x5d, 0x20,