The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2024-09-21 13:49:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #73 from ekeeke/master

Browse Source 
Sync with upstream
This commit is contained in:
Twinaphex 2017-03-19 03:23:00 +01:00 committed by GitHub
commit a8ac6adc59
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -1 +0,0 @@
include Makefile.libretro

1
core/vdp_ctrl.c
View File

@ -6,7 +6,6 @@
* *
* Copyright (C) 1998-2003 Charles Mac Donald (original code) * Copyright (C) 1998-2003 Charles Mac Donald (original code)
* Copyright (C) 2007-2016 Eke-Eke (Genesis Plus GX) * Copyright (C) 2007-2016 Eke-Eke (Genesis Plus GX)
* Copyright (C) 2016 Michael Lelli (Emscripten changes)
* *
* Redistribution and use of this code or any derivative works are permitted * Redistribution and use of this code or any derivative works are permitted
* provided that the following conditions are met: * provided that the following conditions are met:

1
core/vdp_render.c
View File

@ -6,7 +6,6 @@
* *
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Charles Mac Donald (original code) * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Charles Mac Donald (original code)
* Copyright (C) 2007-2016 Eke-Eke (Genesis Plus GX) * Copyright (C) 2007-2016 Eke-Eke (Genesis Plus GX)
* Copyright (C) 2016 Michael Lelli (Emscripten changes)
* *
* Redistribution and use of this code or any derivative works are permitted * Redistribution and use of this code or any derivative works are permitted
* provided that the following conditions are met: * provided that the following conditions are met:

8
libretro/libretro.c
View File

@ -1146,7 +1146,7 @@ static void check_variables(void)
var.key = "genesis_plus_gx_gun_cursor"; var.key = "genesis_plus_gx_gun_cursor";
environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var); environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var);
{ {
if (strcmp(var.value, "no") == 0) if (strcmp(var.value, "disabled") == 0)
config.gun_cursor = 0; config.gun_cursor = 0;
else else
config.gun_cursor = 1; config.gun_cursor = 1;
@ -1155,7 +1155,7 @@ static void check_variables(void)
var.key = "genesis_plus_gx_invert_mouse"; var.key = "genesis_plus_gx_invert_mouse";
environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var); environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var);
{ {
if (strcmp(var.value, "no") == 0) if (strcmp(var.value, "disabled") == 0)
config.invert_mouse = 0; config.invert_mouse = 0;
else else
config.invert_mouse = 1; config.invert_mouse = 1;
@ -1535,8 +1535,8 @@ void retro_set_environment(retro_environment_t cb)
{ "genesis_plus_gx_gg_extra", "Game Gear extended screen; disabled|enabled" }, { "genesis_plus_gx_gg_extra", "Game Gear extended screen; disabled|enabled" },
{ "genesis_plus_gx_aspect_ratio", "Core-provided aspect ratio; auto|NTSC PAR|PAL PAR" }, { "genesis_plus_gx_aspect_ratio", "Core-provided aspect ratio; auto|NTSC PAR|PAL PAR" },
{ "genesis_plus_gx_render", "Interlaced mode 2 output; single field|double field" }, { "genesis_plus_gx_render", "Interlaced mode 2 output; single field|double field" },
{ "genesis_plus_gx_gun_cursor", "Show Lightgun crosshair; no|yes" }, { "genesis_plus_gx_gun_cursor", "Show Lightgun crosshair; disabled|enabled" },
{ "genesis_plus_gx_invert_mouse", "Invert Mouse Y-axis; no|yes" }, { "genesis_plus_gx_invert_mouse", "Invert Mouse Y-axis; disabled|enabled" },
{ NULL, NULL }, { NULL, NULL },
}; };