notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #453 from pjft/dual-guncon
[pcsx_rearmed.git]
/
frontend
/
main.c
diff --git
a/frontend/main.c
b/frontend/main.c
index
b6b5411
..
51cb7bf
100644
(file)
--- a/
frontend/main.c
+++ b/
frontend/main.c
@@
-140,6
+140,7
@@
void emu_set_default_config(void)
pl_rearmed_cbs.gpu_unai.abe_hack =
pl_rearmed_cbs.gpu_unai.no_light =
pl_rearmed_cbs.gpu_unai.no_blend = 0;
pl_rearmed_cbs.gpu_unai.abe_hack =
pl_rearmed_cbs.gpu_unai.no_light =
pl_rearmed_cbs.gpu_unai.no_blend = 0;
+ pl_rearmed_cbs.gpu_unai.scale_hires = 0;
memset(&pl_rearmed_cbs.gpu_peopsgl, 0, sizeof(pl_rearmed_cbs.gpu_peopsgl));
pl_rearmed_cbs.gpu_peopsgl.iVRamSize = 64;
pl_rearmed_cbs.gpu_peopsgl.iTexGarbageCollection = 1;
memset(&pl_rearmed_cbs.gpu_peopsgl, 0, sizeof(pl_rearmed_cbs.gpu_peopsgl));
pl_rearmed_cbs.gpu_peopsgl.iVRamSize = 64;
pl_rearmed_cbs.gpu_peopsgl.iTexGarbageCollection = 1;
@@
-151,7
+152,7
@@
void emu_set_default_config(void)
spu_config.iVolume = 768;
spu_config.iTempo = 0;
spu_config.iUseThread = 1; // no effect if only 1 core is detected
spu_config.iVolume = 768;
spu_config.iTempo = 0;
spu_config.iUseThread = 1; // no effect if only 1 core is detected
-#if
def HAVE_PRE_ARMV7
/* XXX GPH hack */
+#if
defined(HAVE_PRE_ARMV7) && !defined(_3DS)
/* XXX GPH hack */
spu_config.iUseReverb = 0;
spu_config.iUseInterpolation = 0;
spu_config.iTempo = 1;
spu_config.iUseReverb = 0;
spu_config.iUseInterpolation = 0;
spu_config.iTempo = 1;
@@
-307,7
+308,7
@@
static int cdidcmp(const char *id1, const char *id2)
static void parse_cwcheat(void)
{
static void parse_cwcheat(void)
{
- char line[256], buf[
64], name[64
], *p;
+ char line[256], buf[
256], name[256
], *p;
int newcheat = 1;
u32 a, v;
FILE *f;
int newcheat = 1;
u32 a, v;
FILE *f;
@@
-780,7
+781,7
@@
int emu_save_state(int slot)
return ret;
ret = SaveState(fname);
return ret;
ret = SaveState(fname);
-#if defined(HAVE_PRE_ARMV7) && !defined(_3DS) /* XXX GPH hack */
+#if defined(HAVE_PRE_ARMV7) && !defined(_3DS)
&& !defined(__SWITCH__)
/* XXX GPH hack */
sync();
#endif
SysPrintf("* %s \"%s\" [%d]\n",
sync();
#endif
SysPrintf("* %s \"%s\" [%d]\n",
@@
-877,14
+878,15
@@
static int _OpenPlugins(void) {
if (Config.UseNet && !NetOpened) {
netInfo info;
if (Config.UseNet && !NetOpened) {
netInfo info;
- char path[MAXPATHLEN];
+ char path[MAXPATHLEN
* 2
];
char dotdir[MAXPATHLEN];
MAKE_PATH(dotdir, "/.pcsx/plugins/", NULL);
strcpy(info.EmuName, "PCSX");
char dotdir[MAXPATHLEN];
MAKE_PATH(dotdir, "/.pcsx/plugins/", NULL);
strcpy(info.EmuName, "PCSX");
- strncpy(info.CdromID, CdromId, 9);
- strncpy(info.CdromLabel, CdromLabel, 9);
+ memcpy(info.CdromID, CdromId, 9); /* no \0 trailing character? */
+ memcpy(info.CdromLabel, CdromLabel, 9);
+ info.CdromLabel[9] = '\0';
info.psxMem = psxM;
info.GPU_showScreenPic = GPU_showScreenPic;
info.GPU_displayText = GPU_displayText;
info.psxMem = psxM;
info.GPU_showScreenPic = GPU_showScreenPic;
info.GPU_displayText = GPU_displayText;