diff options
| author | Simon Howard | 2012-12-24 00:03:41 +0000 |
|---|---|---|
| committer | Simon Howard | 2012-12-24 00:03:41 +0000 |
| commit | f1934e990d7c6d8034650fa09b8a175b542330ba (patch) | |
| tree | 2f7a6c1079f98ab9f3a54a6d6354fc7675e4c39e /src/doom/r_data.c | |
| parent | ea5b5f171623740a74f1b2bef80527c044373502 (diff) | |
| parent | adbfa3216cf3ef6f71cc5b6b22c25a04ae737212 (diff) | |
| download | chocolate-doom-f1934e990d7c6d8034650fa09b8a175b542330ba.tar.gz chocolate-doom-f1934e990d7c6d8034650fa09b8a175b542330ba.tar.bz2 chocolate-doom-f1934e990d7c6d8034650fa09b8a175b542330ba.zip | |
Merge from trunk.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2553
Diffstat (limited to 'src/doom/r_data.c')
| -rw-r--r-- | src/doom/r_data.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/doom/r_data.c b/src/doom/r_data.c index 505f1ff7..13c9eb98 100644 --- a/src/doom/r_data.c +++ b/src/doom/r_data.c @@ -199,10 +199,7 @@ R_DrawColumnInCache int count; int position; byte* source; - byte* dest; - - dest = (byte *)cache + 3; - + while (patch->topdelta != 0xff) { source = (byte *)patch + 3; @@ -694,12 +691,11 @@ void R_InitSpriteLumps (void) // void R_InitColormaps (void) { - int lump, length; - + int lump; + // Load in the light tables, // 256 byte align tables. lump = W_GetNumForName(DEH_String("COLORMAP")); - length = W_LumpLength (lump); colormaps = W_CacheLumpNum(lump, PU_STATIC); } |