fix after rebase
This commit is contained in:
@@ -2613,13 +2613,13 @@ void Button_Palette(void)
|
||||
}
|
||||
|
||||
case 26: // Load palette
|
||||
memcpy(backup_palette, Main_palette, sizeof(T_Palette));
|
||||
memcpy(Main_palette, working_palette, sizeof(T_Palette));
|
||||
memcpy(backup_palette, Main.palette, sizeof(T_Palette));
|
||||
memcpy(Main.palette, working_palette, sizeof(T_Palette));
|
||||
Load_picture(CONTEXT_PALETTE);
|
||||
memcpy(working_palette, Main_palette, sizeof(T_Palette));
|
||||
memcpy(working_palette, Main.palette, sizeof(T_Palette));
|
||||
Set_palette(working_palette);
|
||||
memcpy(temp_palette,working_palette,sizeof(T_Palette));
|
||||
memcpy(Main_palette, backup_palette, sizeof(T_Palette));
|
||||
memcpy(Main.palette, backup_palette, sizeof(T_Palette));
|
||||
need_to_remap=1;
|
||||
break;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user