m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change Load_picture() prototype to allow loading of palette

Browse Source 
the change matches what is done with Save_picture()
This commit is contained in:
Thomas Bernard 2017-12-20 13:48:39 +01:00
parent f3bf217bb6
commit ccf3e6a77f
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/buttons.c
View File

@ -3105,9 +3105,7 @@ int Best_video_mode(void)
return best_mode; return best_mode;
} }
void Load_picture(byte image) void Load_picture(enum CONTEXT_TYPE type)
// Image=1 => On charge/sauve une image
// Image=0 => On charge/sauve une brosse
{ {
byte confirm; byte confirm;
byte old_cursor_shape; byte old_cursor_shape;
@ -3116,23 +3114,33 @@ void Load_picture(byte image)
static char filename [MAX_PATH_CHARACTERS]; static char filename [MAX_PATH_CHARACTERS];
static char directory[MAX_PATH_CHARACTERS]; static char directory[MAX_PATH_CHARACTERS];
if (image) switch (type)
{ {
case CONTEXT_MAIN_IMAGE:
strcpy(filename, Main.backups->Pages->Filename); strcpy(filename, Main.backups->Pages->Filename);
strcpy(directory, Main.backups->Pages->File_directory); strcpy(directory, Main.backups->Pages->File_directory);
Init_context_layered_image(&context, filename, directory); Init_context_layered_image(&context, filename, directory);
} break;
else case CONTEXT_BRUSH:
{
strcpy(filename, Brush_filename); strcpy(filename, Brush_filename);
strcpy(directory, Brush_file_directory); strcpy(directory, Brush_file_directory);
Init_context_brush(&context, filename, directory); Init_context_brush(&context, filename, directory);
break;
case CONTEXT_PALETTE:
strcpy(filename, "");
strcpy(directory, Main_backups->Pages->File_directory);
Init_context_layered_image(&context, filename, directory);
context.Type = CONTEXT_PALETTE;
context.Format = FORMAT_PAL;
break;
default:
return; // DO NOTHING
} }
confirm=Button_Load_or_Save(image?&Main.selector:&Brush_selector, 1, &context); confirm=Button_Load_or_Save((type==CONTEXT_MAIN_IMAGE)?&Main.selector:&Brush_selector, 1, &context);
if (confirm) if (confirm)
{ {
if (image) if (type==CONTEXT_MAIN_IMAGE)
{ {
if (Main.image_is_modified) if (Main.image_is_modified)
confirm=Confirmation_box("Discard unsaved changes?"); confirm=Confirmation_box("Discard unsaved changes?");
@ -3148,7 +3156,7 @@ void Load_picture(byte image)
Cursor_shape=CURSOR_SHAPE_HOURGLASS; Cursor_shape=CURSOR_SHAPE_HOURGLASS;
Display_cursor(); Display_cursor();
if (image) if (type==CONTEXT_MAIN_IMAGE)
{ {
Original_screen_X=0; Original_screen_X=0;
Original_screen_Y=0; Original_screen_Y=0;
@ -3156,7 +3164,7 @@ void Load_picture(byte image)
Load_image(&context); Load_image(&context);
if (!image) if (type==CONTEXT_BRUSH)
{ {
strcpy(Brush_filename, context.File_name); strcpy(Brush_filename, context.File_name);
strcpy(Brush_file_directory, context.File_directory); strcpy(Brush_file_directory, context.File_directory);
@ -3193,7 +3201,7 @@ void Load_picture(byte image)
} }
else else
{ {
if (image) if (type==CONTEXT_MAIN_IMAGE)
{ {
if (Main.magnifier_mode) if (Main.magnifier_mode)
{ {
@ -3263,7 +3271,7 @@ void Button_Load(void)
// restituer en cas d'erreur n'affectant pas l'image // restituer en cas d'erreur n'affectant pas l'image
Upload_infos_page(&Main); Upload_infos_page(&Main);
Load_picture(1); Load_picture(CONTEXT_MAIN_IMAGE);
Tilemap_update(); Tilemap_update();
} }
@ -4016,7 +4024,7 @@ void Button_Brush_FX(void)
break; break;
case 18 : // Load case 18 : // Load
Display_cursor(); Display_cursor();
Load_picture(0); Load_picture(CONTEXT_BRUSH);
Hide_cursor(); Hide_cursor();
break; break;
case 19 : // Save case 19 : // Save

2
src/buttons.h
View File

@ -650,7 +650,7 @@ void Button_Toggle_all_toolbars(void);
/*! /*!
Load picture from file. Load picture from file.
*/ */
void Load_picture(byte image); void Load_picture(enum CONTEXT_TYPE type);
/*! /*!
Save picture to file. Save picture to file.

2
src/engine.c
View File

@ -1025,7 +1025,7 @@ void Main_handler(void)
action++; action++;
break; break;
case SPECIAL_LOAD_BRUSH : case SPECIAL_LOAD_BRUSH :
Load_picture(0); Load_picture(CONTEXT_BRUSH);
action++; action++;
break; break;
case SPECIAL_SAVE_BRUSH : case SPECIAL_SAVE_BRUSH :