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-10-20 11:48:04 +03:00
parent 3a1493942c
commit 99f1a912a6
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/start.c
View File

@@ -100,7 +100,4 @@ void initStart(Start* start, tic_mem* tic)
.tick = tick, .tick = tick,
.play = false, .play = false,
}; };
memcpy(tic->cart.palette.data, tic->config.palette.data, sizeof(tic_palette));
tic->api.reset(tic);
} }

8
src/studio.c
View File

@@ -815,9 +815,11 @@ EditorMode getStudioMode()
return studio.mode; return studio.mode;
} }
void showGameMenu() static void showGameMenu()
{ {
studio.tic->api.pause(studio.tic); studio.tic->api.pause(studio.tic);
studio.tic->api.reset(studio.tic);
initMenuMode(); initMenuMode();
studio.mode = TIC_MENU_MODE; studio.mode = TIC_MENU_MODE;
} }
@@ -2005,7 +2007,7 @@ static void renderCursor()
blitCursor(studio.tic->config.gfx.tiles[getConfig()->theme.cursor.sprite].data); blitCursor(studio.tic->config.gfx.tiles[getConfig()->theme.cursor.sprite].data);
} }
void useSystemPalette() static void useSystemPalette()
{ {
memcpy(studio.tic->ram.vram.palette.data, studio.tic->config.palette.data, sizeof(tic_palette)); memcpy(studio.tic->ram.vram.palette.data, studio.tic->config.palette.data, sizeof(tic_palette));
} }
@@ -2272,7 +2274,7 @@ static void setWindowIcon()
u32* pixels = SDL_malloc(Size * Size * sizeof(u32)); u32* pixels = SDL_malloc(Size * Size * sizeof(u32));
const u32* pal = paletteBlit(); const u32* pal = srcPaletteBlit(studio.tic->config.palette.data);
for(s32 j = 0, index = 0; j < Size; j++) for(s32 j = 0, index = 0; j < Size; j++)
for(s32 i = 0; i < Size; i++, index++) for(s32 i = 0; i < Size; i++, index++)

2
src/studio.h
View File

@@ -183,7 +183,6 @@ typedef void(*DialogCallback)(bool yes, void* data);
void showDialog(const char** text, s32 rows, DialogCallback callback, void* data); void showDialog(const char** text, s32 rows, DialogCallback callback, void* data);
void hideDialog(); void hideDialog();
void showGameMenu();
void hideGameMenu(); void hideGameMenu();
bool studioCartChanged(); bool studioCartChanged();
@@ -193,4 +192,3 @@ void runGameFromSurf();
void gotoSurf(); void gotoSurf();
void exitFromGameMenu(); void exitFromGameMenu();
void runProject(); void runProject();
void useSystemPalette();

2
src/surf.c
View File

@@ -482,7 +482,7 @@ static void updateMenuItemCover(Surf* surf, const u8* cover, s32 size)
{ {
const gif_color* c = &image->palette[image->buffer[i]]; const gif_color* c = &image->palette[image->buffer[i]];
tic_rgb rgb = { c->r, c->g, c->b }; tic_rgb rgb = { c->r, c->g, c->b };
u8 color = tic_tool_find_closest_color(tic->cart.palette.colors, &rgb); u8 color = tic_tool_find_closest_color(tic->config.palette.colors, &rgb);
tic_tool_poke4(item->cover->data, i, color); tic_tool_poke4(item->cover->data, i, color);
} }
} }