summaryrefslogtreecommitdiff
path: root/libpcsxcore/misc.c
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-05-07 04:31:29 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-05-07 04:31:29 +0000
commit2d5a9a02425951f4efed764d135be96867eb532f (patch)
treed94be7649ef8ccb627df551ac69f5d4a6a941cb6 /libpcsxcore/misc.c
parent6a4fd490f8c754883bee9468be8d35dc7a651cee (diff)
downloadpcsxr-2d5a9a02425951f4efed764d135be96867eb532f.tar.gz
preparing for refactor/cleanup, moved all definations into .c files, other minor cleanups. (Breaks Mac OS X and maybe windows as well for now, will fix later.)
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47542 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore/misc.c')
-rw-r--r--libpcsxcore/misc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index c40723c1..5022d803 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -27,6 +27,7 @@
#include "ppf.h"
int Log = 0;
+FILE *emuLog = NULL;
char CdromId[10] = "";
char CdromLabel[33] = "";
@@ -374,7 +375,6 @@ static int PSXGetFileType(FILE *f) {
return INVALID_EXE;
}
-/* TODO Error handling - return integer for each error case below, defined in an enum. Pass variable on return */
int Load(char *ExePath) {
FILE *tmpFile;
EXE_HEADER tmpHead;
@@ -469,10 +469,10 @@ int SaveState(char *file) {
gzwrite(f, (void*)PcsxHeader, 32);
- pMem = (unsigned char *) malloc(128*96*3);
+ pMem = (unsigned char *)malloc(128 * 96 * 3);
if (pMem == NULL) return -1;
GPU_getScreenPic(pMem);
- gzwrite(f, pMem, 128*96*3);
+ gzwrite(f, pMem, 128 * 96 * 3);
free(pMem);
if (Config.HLE)