diff options
author | Max Horn | 2009-05-12 23:30:10 +0000 |
---|---|---|
committer | Max Horn | 2009-05-12 23:30:10 +0000 |
commit | 0255cd0213a219fba69860200a987a0d837493a0 (patch) | |
tree | 1dd1ce850fc46e468e1d00a0ed86f5686630b7be /engines/sci/scicore/vocab_debug.cpp | |
parent | 8d8e9d3aaa717616c001083913d0c1e6fff2c580 (diff) | |
download | scummvm-rg350-0255cd0213a219fba69860200a987a0d837493a0.tar.gz scummvm-rg350-0255cd0213a219fba69860200a987a0d837493a0.tar.bz2 scummvm-rg350-0255cd0213a219fba69860200a987a0d837493a0.zip |
SCI: Removed sci_memory.h/.cpp
svn-id: r40514
Diffstat (limited to 'engines/sci/scicore/vocab_debug.cpp')
-rw-r--r-- | engines/sci/scicore/vocab_debug.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/scicore/vocab_debug.cpp b/engines/sci/scicore/vocab_debug.cpp index 058c81c337..d626983058 100644 --- a/engines/sci/scicore/vocab_debug.cpp +++ b/engines/sci/scicore/vocab_debug.cpp @@ -289,7 +289,7 @@ int *vocabulary_get_classes(ResourceManager *resmgr, int* count) { if ((r = resmgr->findResource(kResourceTypeVocab, 996, 0)) == NULL) return 0; - c = (int *)sci_malloc(sizeof(int) * r->size / 2); + c = (int *)malloc(sizeof(int) * r->size / 2); for (i = 2; i < r->size; i += 4) { c[i/4] = READ_LE_UINT16(r->data + i); } @@ -356,13 +356,13 @@ opcode* vocabulary_get_opcodes(ResourceManager *resmgr) { count = READ_LE_UINT16(r->data); - o = (opcode*)sci_malloc(sizeof(opcode) * 256); + o = (opcode*)malloc(sizeof(opcode) * 256); for (i = 0; i < count; i++) { int offset = READ_LE_UINT16(r->data + 2 + i * 2); int len = READ_LE_UINT16(r->data + offset) - 2; o[i].type = READ_LE_UINT16(r->data + offset + 2); o[i].number = i; - o[i].name = (char *)sci_malloc(len + 1); + o[i].name = (char *)malloc(len + 1); memcpy(o[i].name, r->data + offset + 4, len); o[i].name[len] = '\0'; #ifdef VOCABULARY_DEBUG @@ -372,7 +372,7 @@ opcode* vocabulary_get_opcodes(ResourceManager *resmgr) { for (i = count; i < 256; i++) { o[i].type = 0; o[i].number = i; - o[i].name = (char *)sci_malloc(strlen("undefined") + 1); + o[i].name = (char *)malloc(strlen("undefined") + 1); strcpy(o[i].name, "undefined"); } return o; |