Crash on TIC-80 Pro #470
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -48,18 +48,6 @@
|
|||||||
static const char* ExeExt = ".exe";
|
static const char* ExeExt = ".exe";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// static struct
|
|
||||||
// {
|
|
||||||
// char prefix[32];
|
|
||||||
// bool yes;
|
|
||||||
// bool menu;
|
|
||||||
// tic_cartridge file;
|
|
||||||
// } embed =
|
|
||||||
// {
|
|
||||||
// .prefix = "C8B39163816B47209E721136D37B8031",
|
|
||||||
// .yes = false,
|
|
||||||
// };
|
|
||||||
|
|
||||||
static const char DefaultLuaTicPath[] = TIC_LOCAL "default.tic";
|
static const char DefaultLuaTicPath[] = TIC_LOCAL "default.tic";
|
||||||
static const char DefaultMoonTicPath[] = TIC_LOCAL "default_moon.tic";
|
static const char DefaultMoonTicPath[] = TIC_LOCAL "default_moon.tic";
|
||||||
static const char DefaultJSTicPath[] = TIC_LOCAL "default_js.tic";
|
static const char DefaultJSTicPath[] = TIC_LOCAL "default_js.tic";
|
||||||
@@ -2698,7 +2686,7 @@ static void tick(Console* console)
|
|||||||
if(!console->skipStart)
|
if(!console->skipStart)
|
||||||
console->showGameMenu = true;
|
console->showGameMenu = true;
|
||||||
|
|
||||||
// memcpy(&console->tic->cart, &embed.file, sizeof(tic_cartridge));
|
memcpy(&console->tic->cart, console->embed.file, sizeof(tic_cartridge));
|
||||||
setStudioMode(TIC_RUN_MODE);
|
setStudioMode(TIC_RUN_MODE);
|
||||||
console->embed.yes = false;
|
console->embed.yes = false;
|
||||||
console->skipStart = false;
|
console->skipStart = false;
|
||||||
@@ -2944,7 +2932,7 @@ void initConsole(Console* console, tic_mem* tic, FileSystem* fs, Config* config,
|
|||||||
{
|
{
|
||||||
.yes = false,
|
.yes = false,
|
||||||
.menu = false,
|
.menu = false,
|
||||||
.file = NULL,
|
.file = console->embed.file,
|
||||||
},
|
},
|
||||||
.inputPosition = 0,
|
.inputPosition = 0,
|
||||||
.history = NULL,
|
.history = NULL,
|
||||||
|
|||||||
Reference in New Issue
Block a user