claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conflict resolution.

Browse Source
This commit is contained in:
OBattler
2025-03-13 21:21:25 +01:00
parent d406395935 8722fe0080
commit c79844a889
12 changed files with 217 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/86box/86box.h
View File

@@ -107,6 +107,7 @@ extern uint64_t instru_run_ms;
#define window_y monitor_settings[0].mon_window_y
#define window_w monitor_settings[0].mon_window_w
#define window_h monitor_settings[0].mon_window_h
extern int inhibit_multimedia_keys; /* (C) Inhibit multimedia keys on Windows. */
extern int window_remember;
extern int vid_resize; /* (C) allow resizing */
extern int invert_display; /* (C) invert the display */

5
src/include/86box/cdrom.h
View File

@@ -348,6 +348,9 @@ typedef struct cdrom {
int32_t c2_first;
int32_t cur_buf;
/* Only used on Windows hosts for disc change notifications. */
uint8_t host_letter;
} cdrom_t;
extern cdrom_t cdrom[CDROM_NUM];
@@ -443,6 +446,8 @@ extern int cdrom_is_empty(const uint8_t id);
extern void cdrom_eject(const uint8_t id);
extern void cdrom_reload(const uint8_t id);
extern int cdrom_assigned_letters;
#ifdef __cplusplus
}
#endif