adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed old FAR_PTR_ADD.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@48 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2002-09-20 15:52:43 +00:00
parent 113533834c
commit 58bb41a494
6 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/compiler.h
-2
View File
@@ -49,8 +49,6 @@ typedef unsigned char UNICODE;
typedef PVOID PTR_DESC; typedef PVOID PTR_DESC;
#define FAR_PTR_ADD(fp,val) (*((PBYTE *) (fp)) += (val))
#define PARAGRAPH_SIZE (1 << PARAGRAPH_SHIFT) #define PARAGRAPH_SIZE (1 << PARAGRAPH_SHIFT)
#define NULL_PTR 0L #define NULL_PTR 0L
sc2/src/sc2code/libs/decomp/lzdecode.c
-5
View File
@@ -409,11 +409,6 @@ ReenterRun:
} }
} while (size); } while (size);
if (_StreamType == MEMORY_STREAM)
{
FAR_PTR_ADD (&_Stream, 0);
}
lpCodeDesc->buf_index = r; lpCodeDesc->buf_index = r;
lpCodeDesc->Stream = _Stream; lpCodeDesc->Stream = _Stream;
lpCodeDesc->workbuf = _workbuf; lpCodeDesc->workbuf = _workbuf;
sc2/src/sc2code/libs/decomp/lzencode.c
+2 -6
View File
@@ -60,9 +60,9 @@ InitTree (void)
*(MEM_HANDLE *)lson = h; *(MEM_HANDLE *)lson = h;
lson = (PSWORD)((PBYTE)lson + sizeof (h)); lson = (PSWORD)((PBYTE)lson + sizeof (h));
rson = lson; rson = lson;
FAR_PTR_ADD (&rson, (N + 1) * sizeof (lson[0])); ((BYTE *) rson) += (N + 1) * sizeof (lson[0]);
dad = rson; dad = rson;
FAR_PTR_ADD (&dad, (N + 257) * sizeof (rson[0])); ((BYTE *) dad) += (N + 257) * sizeof (rson[0]);
for (i = N + 1; i <= N + 256; i++) for (i = N + 1; i <= N + 256; i++)
rson[i] = NIL; /* root */ rson[i] = NIL; /* root */
@@ -463,10 +463,6 @@ EncodeRestart:
} }
} while (last_match_length == 0); } while (last_match_length == 0);
if (_StreamType == MEMORY_STREAM)
{
FAR_PTR_ADD (&_Stream, 0);
}
EncodeExit: EncodeExit:
lpCodeDesc->buf_index = r; lpCodeDesc->buf_index = r;
lpCodeDesc->restart_index = s; lpCodeDesc->restart_index = s;
sc2/src/sc2code/libs/graphics/drawable.c
+2 -2
View File
@@ -157,8 +157,8 @@ CopyDrawable (DRAWABLE Drawable)
num_bytes = size >= 0x7FFF ? 0x7FFF : (COUNT)size; num_bytes = size >= 0x7FFF ? 0x7FFF : (COUNT)size;
memcpy (lpDst, lpSrc, num_bytes); memcpy (lpDst, lpSrc, num_bytes);
FAR_PTR_ADD (&lpDst, num_bytes); lpDst += num_bytes;
FAR_PTR_ADD (&lpSrc, num_bytes); lpSrc += num_bytes;
size -= num_bytes; size -= num_bytes;
} while (size); } while (size);
CopyDrawablePtr->hDrawable = (MEM_HANDLE)CopyDrawable; CopyDrawablePtr->hDrawable = (MEM_HANDLE)CopyDrawable;
sc2/src/sc2code/libs/resource/loadres.c
+1 -1
View File
@@ -62,7 +62,7 @@ GetResourceData (FILE *fp, DWORD length, MEM_FLAGS mem_flags)
if ((int)(ReadResFile (RDPtr, 1, num_read, fp)) != (int)num_read) if ((int)(ReadResFile (RDPtr, 1, num_read, fp)) != (int)num_read)
break; break;
} }
FAR_PTR_ADD (&RDPtr, num_read); ((BYTE *) RDPtr) += num_read;
} while (length -= num_read); } while (length -= num_read);
UnlockResourceData (RData); UnlockResourceData (RData);
sc2/src/sc2code/libs/strings/strings.c
+2 -2
View File
@@ -177,7 +177,7 @@ GetStringSoundClip (STRING String)
else else
{ {
StringAddr = (STRINGPTR)StringTablePtr; StringAddr = (STRINGPTR)StringTablePtr;
FAR_PTR_ADD (&StringAddr, StringTablePtr->StringOffsets[StringIndex]); ((BYTE *) StringAddr) += StringTablePtr->StringOffsets[StringIndex];
} }
UnlockStringTable (StringTable); UnlockStringTable (StringTable);
} }
@@ -201,7 +201,7 @@ GetStringAddress (STRING String)
StringIndex = STRING_INDEX (String); StringIndex = STRING_INDEX (String);
LockStringTable (StringTable, &StringTablePtr); LockStringTable (StringTable, &StringTablePtr);
StringAddr = (STRINGPTR)StringTablePtr; StringAddr = (STRINGPTR)StringTablePtr;
FAR_PTR_ADD (&StringAddr, StringTablePtr->StringOffsets[StringIndex]); ((BYTE *) StringAddr) += StringTablePtr->StringOffsets[StringIndex];
UnlockStringTable (StringTable); UnlockStringTable (StringTable);
} }