From d59c856fbf576daa91fa4a8bade38d97b4edbbe4 Mon Sep 17 00:00:00 2001 From: João Silva Date: Sat, 14 Jan 2017 21:09:57 +0000 Subject: Moved copyright information to copyright file. --- libretro.c | 91 +------------------------------------------------------------- 1 file changed, 1 insertion(+), 90 deletions(-) (limited to 'libretro.c') diff --git a/libretro.c b/libretro.c index 65163f5..e850032 100644 --- a/libretro.c +++ b/libretro.c @@ -1,93 +1,4 @@ -/******************************************************************************* - Snes9x - Portable Super Nintendo Entertainment System (TM) emulator. - - (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com) and - Jerremy Koot (jkoot@snes9x.com) - - (c) Copyright 2001 - 2004 John Weidman (jweidman@slip.net) - - (c) Copyright 2002 - 2004 Brad Jorsch (anomie@users.sourceforge.net), - funkyass (funkyass@spam.shaw.ca), - Joel Yliluoma (http://iki.fi/bisqwit/) - Kris Bleakley (codeviolation@hotmail.com), - Matthew Kendora, - Nach (n-a-c-h@users.sourceforge.net), - Peter Bortas (peter@bortas.org) and - zones (kasumitokoduck@yahoo.com) - - C4 x86 assembler and some C emulation code - (c) Copyright 2000 - 2003 zsKnight (zsknight@zsnes.com), - _Demo_ (_demo_@zsnes.com), and Nach - - C4 C++ code - (c) Copyright 2003 Brad Jorsch - - DSP-1 emulator code - (c) Copyright 1998 - 2004 Ivar (ivar@snes9x.com), _Demo_, Gary Henderson, - John Weidman, neviksti (neviksti@hotmail.com), - Kris Bleakley, Andreas Naive - - DSP-2 emulator code - (c) Copyright 2003 Kris Bleakley, John Weidman, neviksti, Matthew Kendora, and - Lord Nightmare (lord_nightmare@users.sourceforge.net - - OBC1 emulator code - (c) Copyright 2001 - 2004 zsKnight, pagefault (pagefault@zsnes.com) and - Kris Bleakley - Ported from x86 assembler to C by sanmaiwashi - - SPC7110 and RTC C++ emulator code - (c) Copyright 2002 Matthew Kendora with research by - zsKnight, John Weidman, and Dark Force - - S-DD1 C emulator code - (c) Copyright 2003 Brad Jorsch with research by - Andreas Naive and John Weidman - - S-RTC C emulator code - (c) Copyright 2001 John Weidman - - ST010 C++ emulator code - (c) Copyright 2003 Feather, Kris Bleakley, John Weidman and Matthew Kendora - - Super FX x86 assembler emulator code - (c) Copyright 1998 - 2003 zsKnight, _Demo_, and pagefault - - Super FX C emulator code - (c) Copyright 1997 - 1999 Ivar, Gary Henderson and John Weidman - - - SH assembler code partly based on x86 assembler code - (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) - - (c) Copyright 2014 - 2016 Daniel De Matteis. (UNDER NO CIRCUMSTANCE - WILL COMMERCIAL RIGHTS EVER BE APPROPRIATED TO ANY PARTY) - - Specific ports contains the works of other authors. See headers in - individual files. - - Snes9x homepage: http://www.snes9x.com - - Permission to use, copy, modify and distribute Snes9x in both binary and - source form, for non-commercial purposes, is hereby granted without fee, - providing that this license information and copyright notice appear with - all copies and any derived work. - - This software is provided 'as-is', without any express or implied - warranty. In no event shall the authors be held liable for any damages - arising from the use of this software. - - Snes9x is freeware for PERSONAL USE only. Commercial users should - seek permission of the copyright holders first. Commercial use includes - charging money for Snes9x or software derived from Snes9x. - - The copyright holders request that bug fixes and improvements to the code - should be forwarded to them so everyone can benefit from the modifications - in future versions. - - Super NES and Super Nintendo Entertainment System are trademarks of - Nintendo Co., Limited and its subsidiary companies. -*******************************************************************************/ +#include "copyright" #include -- cgit v1.2.3 From 3b8323853f4eeddb61398e77c51bb2349f430227 Mon Sep 17 00:00:00 2001 From: João Silva Date: Sat, 14 Jan 2017 23:08:50 +0000 Subject: Removed a LOT of useless stuff. --- libretro.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'libretro.c') diff --git a/libretro.c b/libretro.c index e850032..3512013 100644 --- a/libretro.c +++ b/libretro.c @@ -715,7 +715,6 @@ bool retro_serialize(void* data, size_t size) memcpy(buffer, &s7r, sizeof(s7r)); buffer += sizeof(s7r); memcpy(buffer, &rtc_f9, sizeof(rtc_f9)); - buffer += sizeof(rtc_f9); return true; } @@ -770,7 +769,6 @@ bool retro_unserialize(const void* data, size_t size) memcpy(&s7r, buffer, sizeof(s7r)); buffer += sizeof(s7r); memcpy(&rtc_f9, buffer, sizeof(rtc_f9)); - buffer += sizeof(rtc_f9); S9xFixSA1AfterSnapshotLoad(); FixROMSpeed(); -- cgit v1.2.3 From bc7474392a91fa9838e6ecb5b16ccebdd97ab9ec Mon Sep 17 00:00:00 2001 From: João Silva Date: Sun, 15 Jan 2017 01:08:40 +0000 Subject: Fixed input for games like SMAS and removed joypad swapping option. --- libretro.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'libretro.c') diff --git a/libretro.c b/libretro.c index 3512013..eb67db4 100644 --- a/libretro.c +++ b/libretro.c @@ -195,7 +195,10 @@ void _makepath(char* path, const char* drive, const char* dir, } else *path = 0; - strcat(path, fname); + + if (fname) + strcat(path, fname); + if (ext && *ext) { strcat(path, "."); @@ -322,7 +325,6 @@ void retro_init(void) struct retro_log_callback log; enum retro_pixel_format rgb565; static const struct retro_variable vars[] = { - { "catsfc_SwapJoypads", "Swap Joypads; disabled|enabled" }, { "catsfc_VideoMode", "Video Mode; auto|NTSC|PAL" }, { NULL, NULL }, }; @@ -410,11 +412,6 @@ static void check_variables(void) { struct retro_variable var; - var.key = "catsfc_SwapJoypads"; - var.value = NULL; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) - Settings.SwapJoypads = strcmp(var.value, "disabled"); - var.key = "catsfc_VideoMode"; var.value = NULL; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) -- cgit v1.2.3