diff options
author | Won Star | 2006-06-29 12:31:52 +0000 |
---|---|---|
committer | Won Star | 2006-06-29 12:31:52 +0000 |
commit | 221afd715a0806405de3e86bc30323a208096cc7 (patch) | |
tree | 696f15e308dc1c23213ff65b86fea387fac9abd6 /backends/gp32 | |
parent | 7169e90fadd2f6929cf6b599db3afe531175cf9b (diff) | |
download | scummvm-rg350-221afd715a0806405de3e86bc30323a208096cc7.tar.gz scummvm-rg350-221afd715a0806405de3e86bc30323a208096cc7.tar.bz2 scummvm-rg350-221afd715a0806405de3e86bc30323a208096cc7.zip |
Whoops. Correct varible name.
svn-id: r23344
Diffstat (limited to 'backends/gp32')
-rw-r--r-- | backends/gp32/gp32std_memory.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/backends/gp32/gp32std_memory.cpp b/backends/gp32/gp32std_memory.cpp index 3d5a11b6cb..f42982587f 100644 --- a/backends/gp32/gp32std_memory.cpp +++ b/backends/gp32/gp32std_memory.cpp @@ -56,7 +56,7 @@ protected: // Linked list is slow for this task. :) static MemBlock *block; - byte *block; + byte *blockData; size_t size; // MemBlock *next; @@ -68,7 +68,7 @@ public: static void deinit(); static void *addBlock(size_t size); - static void deleteBlock(void *block); + static void deleteBlock(void *dstBlock); }; byte *MemBlock::userMem = NULL; @@ -129,7 +129,7 @@ void *MemBlock::addBlock(size_t size) byte *ptr = userMem + (i * USER_BLOCK_SIZE); blk->size = size; - blk->block = ptr; + blk->blockData = ptr; blk->used = 1; prevBlock = i; @@ -137,17 +137,17 @@ void *MemBlock::addBlock(size_t size) return (void *) ptr; } -void MemBlock::deleteBlock(void *block) +void MemBlock::deleteBlock(void *dstBlock) { - uint32 np = (uint32) block - (uint32) userMem; + uint32 np = (uint32) dstBlock - (uint32) userMem; if ((np / USER_BLOCK_SIZE) * USER_BLOCK_SIZE != np) { - gm_free(block); + gm_free(dstBlock); // warning("wrong block! (%d / %d)", (np / USER_BLOCK_SIZE) * USER_BLOCK_SIZE, np); } int i = np / USER_BLOCK_SIZE; if (i > NUM_BLOCK) { - gm_free(block); + gm_free(dstBlock); return; } block[i].used = 0; @@ -155,11 +155,11 @@ void MemBlock::deleteBlock(void *block) /* int i = 0; for (i = 0; i < NUM_BLOCK; i++) { - if (block[i].block == block) + if (block[i].blockData == dstBlock) break; } if (i == NUM_BLOCK) { - gm_free(block); //fixme? + gm_free(dstBlock); //fixme? //warning("wrong block! %x", (uint32)block - (uint32)userMem); } else { GPDEBUG("deleteing block %d", i); |