Skip to content

Commit

Permalink
mupen core feature updates
Browse files Browse the repository at this point in the history
Signed-off-by: Joseph Mattello <mail@joemattiello.com>
  • Loading branch information
JoeMatt committed Nov 23, 2021
1 parent ad50c17 commit 21acdd6
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
7 changes: 6 additions & 1 deletion Cores/Mupen64Plus/Compatibility/eventloop.m
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#import "osd/osd.h"
#import "main/screenshot.h"
#import "../MupenGameCore.h"

int event_set_core_defaults(void)
{
Expand All @@ -46,9 +47,13 @@ void event_sdl_keyup(int keysym, int keymod)

int event_gameshark_active(void)
{
return 0;
GET_CURRENT_OR_RETURN(0);

return current.isGamesharkActive;
}

void event_set_gameshark(int active)
{
GET_CURRENT_OR_RETURN();
current.isGamesharkActive = active;
}
2 changes: 1 addition & 1 deletion Cores/Mupen64Plus/Compatibility/osd.m
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@

osd_message_t * osd_message_valid(osd_message_t *m)
{
return NULL;
return m;
}
1 change: 1 addition & 0 deletions Cores/Mupen64Plus/MupenGameCore.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ __attribute__((visibility("default")))
@property (nonatomic, assign) int videoWidth;
@property (nonatomic, assign) int videoHeight;
@property (nonatomic, assign) int videoBitDepth;
@property (nonatomic, assign) BOOL isGamesharkActive;

- (void) videoInterrupt;
- (void) swapBuffers;
Expand Down

0 comments on commit 21acdd6

Please sign in to comment.