Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Whoops

Browse Source
This commit is contained in:
Lior Halphon 2018-06-16 14:36:06 +03:00
parent 45c73e0175
commit bc876ec30c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cocoa/Document.m
View File

@ -141,17 +141,17 @@ static void printImage(GB_gameboy_t *gb, uint32_t *image, uint8_t height,
return self; return self;
} }
/* Todo: Unify the 3 init functions */
- (void) initDMG - (void) initDMG
{ {
current_model = MODEL_DMG; current_model = MODEL_DMG;
GB_init(&gb, cocoa_to_internal_model[current_model]); GB_init(&gb, cocoa_to_internal_model[current_model]);
[self initCommon];
GB_load_boot_rom(&gb, [[[NSBundle mainBundle] pathForResource:@"dmg_boot" ofType:@"bin"] UTF8String]); GB_load_boot_rom(&gb, [[[NSBundle mainBundle] pathForResource:@"dmg_boot" ofType:@"bin"] UTF8String]);
[self initCommon];
} }
- (void) initCGB - (void) initCGB
{ {
[self initCommon];
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"EmulateAGB"]) { if ([[NSUserDefaults standardUserDefaults] boolForKey:@"EmulateAGB"]) {
current_model = MODEL_AGB; current_model = MODEL_AGB;
GB_init(&gb, cocoa_to_internal_model[current_model]); GB_init(&gb, cocoa_to_internal_model[current_model]);
@ -162,6 +162,7 @@ static void printImage(GB_gameboy_t *gb, uint32_t *image, uint8_t height,
GB_init(&gb, cocoa_to_internal_model[current_model]); GB_init(&gb, cocoa_to_internal_model[current_model]);
GB_load_boot_rom(&gb, [[[NSBundle mainBundle] pathForResource:@"cgb_boot" ofType:@"bin"] UTF8String]); GB_load_boot_rom(&gb, [[[NSBundle mainBundle] pathForResource:@"cgb_boot" ofType:@"bin"] UTF8String]);
} }
[self initCommon];
} }
- (void) initCommon - (void) initCommon