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

Merge branch 'gtk_unix_fixes' of git://github.com/megari/snes9x

This commit is contained in:
OV2 2017-09-11 23:42:13 +02:00
parent cb3ace471e d7394bc7b9
commit 7bd06fda13
7 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apu/bapu/smp/core.cpp
View File

@ -51,8 +51,8 @@ void SMP::op_write(uint16 addr, uint8 data) {
void SMP::op_step() { void SMP::op_step() {
#define op_readpc() op_read(regs.pc++) #define op_readpc() op_read(regs.pc++)
#define op_readdp(addr) op_read((regs.p.p << 8) + (addr & 0xff)) #define op_readdp(addr) op_read((regs.p.p << 8) + ((addr) & 0xff))
#define op_writedp(addr, data) op_write((regs.p.p << 8) + (addr & 0xff), data) #define op_writedp(addr, data) op_write((regs.p.p << 8) + ((addr) & 0xff), data)
#define op_readaddr(addr) op_read(addr) #define op_readaddr(addr) op_read(addr)
#define op_writeaddr(addr, data) op_write(addr, data) #define op_writeaddr(addr, data) op_write(addr, data)
#define op_readstack() op_read(0x0100 | ++regs.sp) #define op_readstack() op_read(0x0100 | ++regs.sp)

2
apu/resampler.h
View File

@ -17,7 +17,7 @@ class Resampler : public ring_buffer
{ {
} }
~Resampler () virtual ~Resampler ()
{ {
} }

6
controls.cpp
View File

@ -2879,8 +2879,9 @@ void S9xSetJoypadLatch (bool latch)
switch (i = curcontrollers[n]) switch (i = curcontrollers[n])
{ {
case MP5: case MP5:
for (int j = 0, k = mp5[n].pads[j]; j < 4; k = mp5[n].pads[++j]) for (int j = 0, k; j < 4; ++j)
{ {
k = mp5[n].pads[j];
if (k == NONE) if (k == NONE)
continue; continue;
do_polling(k); do_polling(k);
@ -3170,8 +3171,9 @@ void S9xControlEOF (void)
switch (i = curcontrollers[n]) switch (i = curcontrollers[n])
{ {
case MP5: case MP5:
for (j = 0, i = mp5[n].pads[j]; j < 4; i = mp5[n].pads[++j]) for (j = 0; j < 4; ++j)
{ {
i = mp5[n].pads[j];
if (i == NONE) if (i == NONE)
continue; continue;

4
loadzip.cpp
View File

@ -270,7 +270,7 @@ bool8 LoadZip (const char *zipname, uint32 *TotalFileSize, uint8 *buffer)
uint8 *ptr = buffer; uint8 *ptr = buffer;
bool8 more = FALSE; bool8 more = FALSE;
unzLocateFile(file, filename, NULL); unzLocateFile(file, filename, 0);
unzGetCurrentFileInfo(file, &info, filename, 128, NULL, 0, NULL, 0); unzGetCurrentFileInfo(file, &info, filename, 128, NULL, 0, NULL, 0);
if (unzOpenCurrentFile(file) != UNZ_OK) if (unzOpenCurrentFile(file) != UNZ_OK)
@ -330,7 +330,7 @@ bool8 LoadZip (const char *zipname, uint32 *TotalFileSize, uint8 *buffer)
if (more) if (more)
{ {
if (unzLocateFile(file, filename, NULL) != UNZ_OK || if (unzLocateFile(file, filename, 0) != UNZ_OK ||
unzGetCurrentFileInfo(file, &info, filename, 128, NULL, 0, NULL, 0) != UNZ_OK || unzGetCurrentFileInfo(file, &info, filename, 128, NULL, 0, NULL, 0) != UNZ_OK ||
unzOpenCurrentFile(file) != UNZ_OK) unzOpenCurrentFile(file) != UNZ_OK)
break; break;

5
memmap.cpp
View File

@ -4054,7 +4054,10 @@ static bool8 ReadBPSPatch (Stream *r, long, int32 &rom_size)
switch((int)mode) { switch((int)mode) {
case SourceRead: case SourceRead:
while(length--) patched_rom[outputOffset++] = Memory.ROM[outputOffset]; while(length--) {
patched_rom[outputOffset] = Memory.ROM[outputOffset];
outputOffset++;
}
break; break;
case TargetRead: case TargetRead:
while(length--) patched_rom[outputOffset++] = data[addr++]; while(length--) patched_rom[outputOffset++] = data[addr++];

4
msu1.cpp
View File

@ -240,7 +240,7 @@ static int unzFindExtension(unzFile &file, const char *ext, bool restart = TRUE,
} }
#endif #endif
STREAM S9xMSU1OpenFile(char *msu_ext, bool skip_unpacked) STREAM S9xMSU1OpenFile(const char *msu_ext, bool skip_unpacked)
{ {
const char *filename = S9xGetFilename(msu_ext, ROMFILENAME_DIR); const char *filename = S9xGetFilename(msu_ext, ROMFILENAME_DIR);
STREAM file = 0; STREAM file = 0;
@ -388,7 +388,7 @@ bool S9xMSU1ROMExists(void)
} }
#ifdef UNZIP_SUPPORT #ifdef UNZIP_SUPPORT
char ext[_MAX_EXT + 1]; char ext[_MAX_EXT + 1];
_splitpath(Memory.ROMFilename, nullptr, nullptr, nullptr, ext); _splitpath(Memory.ROMFilename, NULL, NULL, NULL, ext);
if (!strcasecmp(ext, ".msu1")) if (!strcasecmp(ext, ".msu1"))
return true; return true;

2
msu1.h
View File

@ -229,7 +229,7 @@ extern struct SMSU1 MSU1;
void S9xResetMSU(void); void S9xResetMSU(void);
void S9xMSU1Init(void); void S9xMSU1Init(void);
bool S9xMSU1ROMExists(void); bool S9xMSU1ROMExists(void);
STREAM S9xMSU1OpenFile(char *msu_ext, bool skip_unpacked = FALSE); STREAM S9xMSU1OpenFile(const char *msu_ext, bool skip_unpacked = FALSE);
void S9xMSU1Init(void); void S9xMSU1Init(void);
void S9xMSU1Generate(size_t sample_count); void S9xMSU1Generate(size_t sample_count);
uint8 S9xMSU1ReadPort(uint8 port); uint8 S9xMSU1ReadPort(uint8 port);