From: sparky4 Date: Fri, 9 Sep 2016 19:49:49 +0000 (-0500) Subject: wwww X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=43af6abf05c5464d3ebc89235d7702e954fbc15b;p=proj16%2F16.git wwww --- diff --git a/16.BAK b/16.BAK new file mode 100755 index 00000000..aee7ace5 Binary files /dev/null and b/16.BAK differ diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c index 55dca2cd..27e2d7ee 100755 --- a/src/lib/16_ca.c +++ b/src/lib/16_ca.c @@ -437,7 +437,7 @@ boolean CA_LoadFile(char *filename, memptr *ptr, global_game_variables_t *gvar) if((handle = open(filename,O_RDONLY | O_BINARY, S_IREAD)) == -1) return false; - size = filelength (handle); + size = filelength(handle); MM_GetPtr(ptr,size, &(gvar->mm), &(gvar->mmi)); //TODO: gvar parameters if(!CA_FarRead(handle,*ptr,size, gvar)) { diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index e4a76833..66271124 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -962,9 +962,11 @@ void MM_GetPtr (memptr *baseptr, dword size, mminfo_t *mm, mminfotype *mmi) mm->mmnew->length = needed; mm->mmnew->useptr = baseptr; //if(mm->mmnew->useptr==NULL){ - printf("baseptr=%04x ", baseptr); printf("useptr=%04x\n", mm->mmnew->useptr); - printf("*baseptr=%04x ", *baseptr); printf("*useptr=%04x\n", *(mm->mmnew->useptr)); - //printf("*baseptr=%Fp ", *baseptr); printf("*useptr=%Fp\n", *(mm->mmnew->useptr)); +#ifdef __DEBUG__ + printf("baseptr=%04x ", baseptr); printf("useptr=%04x\n", mm->mmnew->useptr); + printf("*baseptr=%04x ", *baseptr); printf("*useptr=%04x\n", *(mm->mmnew->useptr)); + printf("*baseptr=%Fp ", *baseptr); printf("*useptr=%Fp\n", *(mm->mmnew->useptr)); +#endif //exit(-5); } mm->mmnew->attributes = BASEATTRIBUTES;