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

SAGA: replace Scene::_resourceList, Interface::_inventory malloc arrays with Common::Array

Browse source 
svn-id: r53773
This commit is contained in:
Andrew Kurushin 2010-10-24 20:22:21 +00:00
parent 25e1af837a
commit e3ea3b5b7e
11 changed files with 76 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engines/saga/interface.cpp
View file

@ -317,16 +317,12 @@ Interface::Interface(SagaEngine *vm) : _vm(vm) {
_inventoryStart = 0;
_inventoryEnd = 0;
_inventoryBox = 0;
_inventorySize = ITE_INVENTORY_SIZE;
_saveReminderState = 0;
_optionSaveFileTop = 0;
_optionSaveFileTitleNumber = 0;
_inventory = (uint16 *)calloc(_inventorySize, sizeof(uint16));
if (_inventory == NULL) {
error("Interface::Interface(): not enough memory");
}
_inventory.resize(ITE_INVENTORY_SIZE);
_textInput = false;
_statusTextInput = false;
@ -339,7 +335,6 @@ Interface::Interface(SagaEngine *vm) : _vm(vm) {
}
Interface::~Interface() {
free(_inventory);
}
void Interface::saveReminderCallback(void *refCon) {
@ -2040,7 +2035,7 @@ void Interface::updateInventory(int pos) {
}
void Interface::addToInventory(int objectId) {
if (_inventoryCount >= _inventorySize) {
if (uint(_inventoryCount) >= _inventory.size()) {
return;
}