CPC mode 5 : replaced the global Constraint_mode by a state (Image_mode) in each versioned T_Page: This allows keeping it sane when swapping to Spare, and when Undo/Redoing. Also fixed the first page when program starts, it was unnecessarily allocating pointers for the maximum number of layers(16)/frames(999)

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1907 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud
2012-02-27 00:47:18 +00:00
parent 55d0889bc8
commit d38f5ee981
9 changed files with 30 additions and 20 deletions

View File

@@ -3009,7 +3009,7 @@ byte Read_pixel_from_current_screen (word x,word y)
byte depth;
byte color;
if (Constraint_mode)
if (Main_backups->Pages->Image_mode == IMAGE_MODE_MODE5)
if (Main_current_layer==4)
return *(Main_backups->Pages->Image[Main_current_layer].Pixels + x+y*Main_image_width);
@@ -3163,12 +3163,13 @@ byte Read_pixel_from_current_layer(word x,word y)
void Update_pixel_renderer(void)
{
#ifndef NOLAYERS
if (!Constraint_mode)
if (Main_backups->Pages->Image_mode == IMAGE_MODE_LAYERED)
{
// layered
Pixel_in_current_screen = Pixel_in_screen_layered;
Pixel_in_current_screen_with_preview = Pixel_in_screen_layered_with_preview;
}
// Implicit else : Image_mode must be IMAGE_MODE_MODE5
else if ( Main_current_layer == 4)
{
// overlay