thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: cleanup

Browse source 
svn-id: r43982
This commit is contained in:
Max Horn 2009-09-06 12:58:43 +00:00
parent fdbb167ea3
commit b51e9988e6
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/console.cpp
View file

@ -1948,7 +1948,7 @@ bool Console::cmdViewReference(int argc, const char **argv) {
break; break;
case KSIG_REF: { case KSIG_REF: {
int size; int size;
unsigned char *block = _vm->_gamestate->segMan->dereference(reg, &size); byte *block = _vm->_gamestate->segMan->dereference(reg, &size);
DebugPrintf("raw data\n"); DebugPrintf("raw data\n");

4
engines/sci/engine/seg_manager.cpp
View file

@ -920,7 +920,7 @@ byte *SegManager::dereference(reg_t pointer, int *size) {
return mobj->dereference(pointer, size); return mobj->dereference(pointer, size);
} }
unsigned char *SegManager::allocDynmem(int size, const char *descr, reg_t *addr) { byte *SegManager::allocDynmem(int size, const char *descr, reg_t *addr) {
SegmentId seg; SegmentId seg;
MemObject *mobj = allocNonscriptSegment(MEM_OBJ_DYNMEM, &seg); MemObject *mobj = allocNonscriptSegment(MEM_OBJ_DYNMEM, &seg);
*addr = make_reg(seg, 0); *addr = make_reg(seg, 0);
@ -936,7 +936,7 @@ unsigned char *SegManager::allocDynmem(int size, const char *descr, reg_t *addr)
d._description = strdup(descr); d._description = strdup(descr);
return (unsigned char *)(d._buf); return (byte *)(d._buf);
} }
const char *SegManager::getDescription(reg_t addr) { const char *SegManager::getDescription(reg_t addr) {

2
engines/sci/engine/seg_manager.h
View file

@ -310,7 +310,7 @@ public:
* @return Raw pointer into the allocated dynamic * @return Raw pointer into the allocated dynamic
* memory * memory
*/ */
unsigned char *allocDynmem(int size, const char *description, reg_t *addr); byte *allocDynmem(int size, const char *description, reg_t *addr);
/** /**
* Deallocates a piece of dynamic memory * Deallocates a piece of dynamic memory

1
engines/sci/engine/vm.h
View file

@ -37,7 +37,6 @@ namespace Sci {
class SegManager; class SegManager;
struct EngineState; struct EngineState;
struct IntMapper;
struct Object; struct Object;
class ResourceManager; class ResourceManager;