dan/TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no message

Browse Source
This commit is contained in:
BADIM-PC\Vadim
2017-11-23 17:25:33 +03:00
parent 6241d94108
commit 16b15ba1fd
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/console.c
View File

@@ -53,7 +53,6 @@ static struct
char prefix[32]; char prefix[32];
bool yes; bool yes;
bool fast; bool fast;
bool cmd;
bool menu; bool menu;
tic_cartridge file; tic_cartridge file;
} embed = } embed =
@@ -61,7 +60,6 @@ static struct
.prefix = "C8B39163816B47209E721136D37B8031", .prefix = "C8B39163816B47209E721136D37B8031",
.yes = false, .yes = false,
.fast = false, .fast = false,
.cmd = false,
}; };
static const char DefaultLuaTicPath[] = TIC_LOCAL "default.tic"; static const char DefaultLuaTicPath[] = TIC_LOCAL "default.tic";
@@ -2581,7 +2579,7 @@ static void tick(Console* console)
{ {
if(console->tickCounter >= (u32)(embed.fast ? 1 : TIC_FRAMERATE)) if(console->tickCounter >= (u32)(embed.fast ? 1 : TIC_FRAMERATE))
{ {
if(!embed.fast && !embed.cmd) if(!embed.fast)
console->showGameMenu = true; console->showGameMenu = true;
memcpy(&console->tic->cart, &embed.file, sizeof(tic_cartridge)); memcpy(&console->tic->cart, &embed.file, sizeof(tic_cartridge));
@@ -2629,14 +2627,11 @@ static void cmdLoadCart(Console* console, const char* name)
if(hasProjectExt(name)) if(hasProjectExt(name))
{ {
loadProject(console, name, data, size, &embed.file); loadProject(console, name, data, size, &embed.file);
embed.cmd = true; embed.fast = true;
} }
else else
#endif #endif
{
loadCart(console->tic, &embed.file, data, size, true); loadCart(console->tic, &embed.file, data, size, true);
embed.cmd = false;
}
strcpy(console->romName, fsFilename(name)); strcpy(console->romName, fsFilename(name));