Skip to content

Commit

Permalink
bugfix: reverted some of the changes after merging master
Browse files Browse the repository at this point in the history
Some changes broke the compilation, so reverting those
  • Loading branch information
midwan committed Oct 28, 2023
1 parent c7fc693 commit c4b5fd1
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/gfxutil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ void alloc_colors64k(int monid, int rw, int gw, int bw, int rs, int gs, int bs,
xcolors[i] |= xcolors[i] * 0x00010001;
}
}
//fullblack = 0;
fullblack = 0;
//if (gfx_hdr) {
// fullblack = doAlpha(1, aw, as);
//}
Expand Down
2 changes: 0 additions & 2 deletions src/include/memory.h
Original file line number Diff line number Diff line change
Expand Up @@ -468,8 +468,6 @@ extern uaecptr expamem_z3_pointer_real, expamem_z3_pointer_uae;
extern uae_u32 expamem_z3_highram_real, expamem_z3_highram_uae;
extern uae_u32 expamem_board_size;

extern uae_u32 last_custom_value1;

/* Default memory access functions */

extern void dummy_put (uaecptr addr, int size, uae_u32 val);
Expand Down
2 changes: 1 addition & 1 deletion src/osdep/amiberry_gfx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ int graphics_setup(void)

void updatedisplayarea(int monid)
{
set_custom_limits(-1, -1, -1, -1);
set_custom_limits(-1, -1, -1, -1, false);
show_screen(monid, 0);
}

Expand Down

0 comments on commit c4b5fd1

Please sign in to comment.