ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'TASEmulators:master' into master

This commit is contained in:
Cyneprepou4uk 2022-02-14 14:30:51 +03:00 committed by GitHub
parent 6af49e9a28 8e6d99a1ac
commit f5214f17d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pipelines/debpkg.pl
View File

@ -2,7 +2,7 @@
use strict; use strict;
my $VERSION="2.6.2"; my $VERSION="2.6.3";
my $INSTALL_PREFIX="/tmp/fceux"; my $INSTALL_PREFIX="/tmp/fceux";
my $CTL_FILENAME="$INSTALL_PREFIX/DEBIAN/control"; my $CTL_FILENAME="$INSTALL_PREFIX/DEBIAN/control";
my $ARCH="amd64"; my $ARCH="amd64";

4
pipelines/linux_build.sh
View File

@ -10,8 +10,8 @@ SCRIPT_DIR=$( cd $(dirname $BASH_SOURCE[0]); pwd );
#echo $SCRIPT_DIR; #echo $SCRIPT_DIR;
gcc --version gcc --version
python2 --version #python2 --version
python3 --version #python3 --version
INSTALL_PREFIX=/tmp/fceux INSTALL_PREFIX=/tmp/fceux

4
pipelines/macOS_build.sh
View File

@ -10,8 +10,8 @@ QT_MAJOR=5;
QT_PKGNAME=qt$QT_MAJOR; QT_PKGNAME=qt$QT_MAJOR;
FCEUX_VERSION_MAJOR=2 FCEUX_VERSION_MAJOR=2
FCEUX_VERSION_MINOR=6 FCEUX_VERSION_MINOR=6
FCEUX_VERSION_PATCH=2 FCEUX_VERSION_PATCH=3
SDL2_VERSION=2.0.14 SDL2_VERSION=2.0.20
SCRIPT_DIR=$( cd $(dirname $BASH_SOURCE[0]); pwd ); SCRIPT_DIR=$( cd $(dirname $BASH_SOURCE[0]); pwd );

4
readme.md
View File

@ -28,8 +28,8 @@ Interim builds:
* Win32: [fceux.zip](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux.zip?branch=master&job=Windows%2032) * Win32: [fceux.zip](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux.zip?branch=master&job=Windows%2032)
* Win64: [fceux64.zip](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux64.zip?branch=master&job=Windows%2064) * Win64: [fceux64.zip](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux64.zip?branch=master&job=Windows%2064)
* Win64 Qt/SDL: [qfceux64.zip](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/qfceux64.zip?branch=master&job=Win64%20Qt) * Win64 Qt/SDL: [qfceux64.zip](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/qfceux64.zip?branch=master&job=Win64%20Qt)
* Ubuntu: [fceux-2.6.2-amd64.deb](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux-2.6.2-amd64.deb?branch=master&job=Ubuntu) * Ubuntu: [fceux-2.6.3-amd64.deb](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux-2.6.3-amd64.deb?branch=master&job=Ubuntu)
* MacOSX: [fceux-2.6.2-Darwin.dmg](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux-2.6.2-Darwin.dmg?branch=master&job=MacOS) * MacOSX: [fceux-2.6.3-Darwin.dmg](https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux-2.6.3-Darwin.dmg?branch=master&job=MacOS)
* Status: [Appveyor](https://ci.appveyor.com/project/zeromus/fceux/) * Status: [Appveyor](https://ci.appveyor.com/project/zeromus/fceux/)
But you might like mesen more: https://github.com/SourMesen/Mesen But you might like mesen more: https://github.com/SourMesen/Mesen

3
src/boards/8237.cpp
View File

@ -19,7 +19,6 @@
* *
* Super Game (Sugar Softec) protected mapper * Super Game (Sugar Softec) protected mapper
* Pocahontas 2 (Unl) [U][!], etc. * Pocahontas 2 (Unl) [U][!], etc.
* TODO: 9in1 LION KING HANGS!
*/ */
#include "mapinc.h" #include "mapinc.h"
@ -139,7 +138,7 @@ static DECLFW(UNL8237Write) {
} }
static DECLFW(UNL8237ExWrite) { static DECLFW(UNL8237ExWrite) {
switch (A) { switch (A & 0xF007) {
case 0x5000: EXPREGS[0] = V; FixMMC3PRG(MMC3_cmd); break; case 0x5000: EXPREGS[0] = V; FixMMC3PRG(MMC3_cmd); break;
case 0x5001: EXPREGS[1] = V; FixMMC3PRG(MMC3_cmd); FixMMC3CHR(MMC3_cmd); break; case 0x5001: EXPREGS[1] = V; FixMMC3PRG(MMC3_cmd); FixMMC3CHR(MMC3_cmd); break;
case 0x5007: EXPREGS[2] = V; break; case 0x5007: EXPREGS[2] = V; break;

35
src/drivers/win/input.cpp
View File

@ -222,57 +222,58 @@ uint32 GetGamepadPressedImmediate()
// e.g. do not trigger "F1" if "Ctrl+F1" is pressed // e.g. do not trigger "F1" if "Ctrl+F1" is pressed
int DTestButton(ButtConfig *bc, uint8_t just_down, uint8_t block_meta) int DTestButton(ButtConfig *bc, uint8_t just_down, uint8_t block_meta)
{ {
static unsigned int *keys_data = !just_down ? GetKeyboard_nr() : GetKeyboard_jd(); unsigned int *keys_data = !just_down ? GetKeyboard_nr() : GetKeyboard_jd();
unsigned int *keys_data_nr = GetKeyboard_nr();
for(int x=0; x < bc->NumC; x++) for (int x = 0; x < bc->NumC; x++)
{ {
if(bc->ButtType[x] == BUTTC_KEYBOARD) if (bc->ButtType[x] == BUTTC_KEYBOARD)
{ {
int cmd = bc->ButtonNum[x]; int cmd = bc->ButtonNum[x];
int cmdmask = cmd&CMD_KEY_MASK; int cmdmask = cmd&CMD_KEY_MASK;
/* test CTRL, SHIFT, ALT */ /* test CTRL, SHIFT, ALT, WIN */
if (cmd & CMD_KEY_ALT) if (cmd & CMD_KEY_ALT)
{ {
int ctlstate = (cmd & CMD_KEY_LALT) ? keys_data[SCAN_LEFTALT] : 0; int ctlstate = (cmd & CMD_KEY_LALT) ? keys_data_nr[SCAN_LEFTALT] : 0;
ctlstate |= (cmd & CMD_KEY_RALT) ? keys_data[SCAN_RIGHTALT] : 0; ctlstate |= (cmd & CMD_KEY_RALT) ? keys_data_nr[SCAN_RIGHTALT] : 0;
if (!ctlstate) if (!ctlstate)
continue; continue;
} }
else if (block_meta && ((cmdmask != SCAN_LEFTALT && keys_data[SCAN_LEFTALT]) || (cmdmask != SCAN_RIGHTALT && keys_data[SCAN_RIGHTALT]))) else if (block_meta && ((cmdmask != SCAN_LEFTALT && keys_data_nr[SCAN_LEFTALT]) || (cmdmask != SCAN_RIGHTALT && keys_data_nr[SCAN_RIGHTALT])))
continue; continue;
if (cmd & CMD_KEY_CTRL) if (cmd & CMD_KEY_CTRL)
{ {
int ctlstate = (cmd & CMD_KEY_LCTRL) ? keys_data[SCAN_LEFTCONTROL] : 0; int ctlstate = (cmd & CMD_KEY_LCTRL) ? keys_data_nr[SCAN_LEFTCONTROL] : 0;
ctlstate |= (cmd & CMD_KEY_RCTRL) ? keys_data[SCAN_RIGHTCONTROL] : 0; ctlstate |= (cmd & CMD_KEY_RCTRL) ? keys_data_nr[SCAN_RIGHTCONTROL] : 0;
if (!ctlstate) if (!ctlstate)
continue; continue;
} }
else if (block_meta && ((cmdmask != SCAN_LEFTCONTROL && keys_data[SCAN_LEFTCONTROL]) || (cmdmask != SCAN_RIGHTCONTROL && keys_data[SCAN_RIGHTCONTROL]))) else if (block_meta && ((cmdmask != SCAN_LEFTCONTROL && keys_data_nr[SCAN_LEFTCONTROL]) || (cmdmask != SCAN_RIGHTCONTROL && keys_data_nr[SCAN_RIGHTCONTROL])))
continue; continue;
if (cmd & CMD_KEY_SHIFT) if (cmd & CMD_KEY_SHIFT)
{ {
int ctlstate = (cmd & CMD_KEY_LSHIFT) ? keys_data[SCAN_LEFTSHIFT] : 0; int ctlstate = (cmd & CMD_KEY_LSHIFT) ? keys_data_nr[SCAN_LEFTSHIFT] : 0;
ctlstate |= (cmd & CMD_KEY_RSHIFT) ? keys_data[SCAN_RIGHTSHIFT] : 0; ctlstate |= (cmd & CMD_KEY_RSHIFT) ? keys_data_nr[SCAN_RIGHTSHIFT] : 0;
if (!ctlstate) if (!ctlstate)
continue; continue;
} }
else if (block_meta && ((cmdmask != SCAN_LEFTSHIFT && keys_data[SCAN_LEFTSHIFT]) || (cmdmask != SCAN_RIGHTSHIFT && keys_data[SCAN_RIGHTSHIFT]))) else if (block_meta && ((cmdmask != SCAN_LEFTSHIFT && keys_data_nr[SCAN_LEFTSHIFT]) || (cmdmask != SCAN_RIGHTSHIFT && keys_data_nr[SCAN_RIGHTSHIFT])))
continue; continue;
if (cmd & CMD_KEY_WIN) if (cmd & CMD_KEY_WIN)
{ {
int ctlstate = (cmd & CMD_KEY_LWIN) ? keys_data[SCAN_LEFTWIN] : 0; int ctlstate = (cmd & CMD_KEY_LWIN) ? keys_data_nr[SCAN_LEFTWIN] : 0;
ctlstate |= (cmd & CMD_KEY_RWIN) ? keys_data[SCAN_RIGHTWIN] : 0; ctlstate |= (cmd & CMD_KEY_RWIN) ? keys_data_nr[SCAN_RIGHTWIN] : 0;
if (!ctlstate) if (!ctlstate)
continue; continue;
} }
else if (block_meta && ((cmdmask != SCAN_LEFTWIN && keys_data[SCAN_LEFTWIN]) || (cmdmask != SCAN_RIGHTWIN && keys_data[SCAN_RIGHTWIN]))) else if (block_meta && ((cmdmask != SCAN_LEFTWIN && keys_data_nr[SCAN_LEFTWIN]) || (cmdmask != SCAN_RIGHTWIN && keys_data_nr[SCAN_RIGHTWIN])))
continue; continue;
if(keys_data[cmdmask]) if (keys_data[cmdmask])
{ {
return 1; return 1;
} }

4
src/version.h
View File

@ -62,14 +62,14 @@
#define FCEU_VERSION_MAJOR 2 #define FCEU_VERSION_MAJOR 2
#define FCEU_VERSION_MINOR 6 #define FCEU_VERSION_MINOR 6
#define FCEU_VERSION_PATCH 2 #define FCEU_VERSION_PATCH 3
#define FCEU_VERSION_NUMERIC ( (FCEU_VERSION_MAJOR*10000) + (FCEU_VERSION_MINOR*100) + (FCEU_VERSION_PATCH) ) #define FCEU_VERSION_NUMERIC ( (FCEU_VERSION_MAJOR*10000) + (FCEU_VERSION_MINOR*100) + (FCEU_VERSION_PATCH) )
#define FCEU_VERSION_MAJOR_DECODE(x) ( (x / 10000) ) #define FCEU_VERSION_MAJOR_DECODE(x) ( (x / 10000) )
#define FCEU_VERSION_MINOR_DECODE(x) ( (x / 100) % 100 ) #define FCEU_VERSION_MINOR_DECODE(x) ( (x / 100) % 100 )
#define FCEU_VERSION_PATCH_DECODE(x) (x % 100) #define FCEU_VERSION_PATCH_DECODE(x) (x % 100)
#define FCEU_VERSION_STRING "2.6.2" FCEU_SUBVERSION_STRING FCEU_FEATURE_STRING FCEU_COMPILER #define FCEU_VERSION_STRING "2.6.3" FCEU_SUBVERSION_STRING FCEU_FEATURE_STRING FCEU_COMPILER
#define FCEU_NAME_AND_VERSION FCEU_NAME " " FCEU_VERSION_STRING #define FCEU_NAME_AND_VERSION FCEU_NAME " " FCEU_VERSION_STRING
#endif #endif

4
web/download.html
View File

@ -84,8 +84,8 @@
<li><a href="https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux.zip?branch=master&job=Windows%2032">Windows 32-bit</a></li> <li><a href="https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux.zip?branch=master&job=Windows%2032">Windows 32-bit</a></li>
<li><a href="https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux64.zip?branch=master&job=Windows%2064">Windows 64-bit</a></li> <li><a href="https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux64.zip?branch=master&job=Windows%2064">Windows 64-bit</a></li>
<li><a href="https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/qfceux64.zip?branch=master&job=Win64%20Qt">Win 64 Qt/SDL</a></li> <li><a href="https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/qfceux64.zip?branch=master&job=Win64%20Qt">Win 64 Qt/SDL</a></li>
<li><a href="https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux-2.6.2-amd64.deb?branch=master&job=Ubuntu">Ubuntu Linux</a></li> <li><a href="https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux-2.6.3-amd64.deb?branch=master&job=Ubuntu">Ubuntu Linux</a></li>
<li><a href="https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux-2.6.2-Darwin.dmg?branch=master&job=MacOS">Mac OS X</a></li> <li><a href="https://ci.appveyor.com/api/projects/zeromus/fceux/artifacts/fceux-2.6.3-Darwin.dmg?branch=master&job=MacOS">Mac OS X</a></li>
</ul> </ul>
<h3>Source Code</h3> <h3>Source Code</h3>