Merge branch 'master' of https://github.com/86Box/86Box

2025-06-19 01:52:31 +02:00
parent 30ae882263 dd305a174c
commit 23131a515f
27 changed files with 583 additions and 211 deletions
--- a/src/include/86box/video.h
+++ b/src/include/86box/video.h
@@ -188,6 +188,10 @@ extern bitmap_t *buffer32;
 #define efscrnsz_y           (monitors[monitor_index_global].mon_efscrnsz_y)
 #define unscaled_size_x      (monitors[monitor_index_global].mon_unscaled_size_x)
 #define unscaled_size_y      (monitors[monitor_index_global].mon_unscaled_size_y)
+
+#define CGAPAL_CGA_START    16            // Where the 16-color cga text/composite starts
+
+
 extern PALETTE      cgapal;
 extern PALETTE      cgapal_mono[6];
 #if 0