aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/ad
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute/ad')
-rw-r--r--engines/wintermute/ad/ad_actor.cpp4
-rw-r--r--engines/wintermute/ad/ad_entity.cpp2
-rw-r--r--engines/wintermute/ad/ad_game.cpp28
-rw-r--r--engines/wintermute/ad/ad_inventory_box.cpp2
-rw-r--r--engines/wintermute/ad/ad_item.cpp2
-rw-r--r--engines/wintermute/ad/ad_layer.cpp2
-rw-r--r--engines/wintermute/ad/ad_object.cpp4
-rw-r--r--engines/wintermute/ad/ad_region.cpp2
-rw-r--r--engines/wintermute/ad/ad_response_box.cpp2
-rw-r--r--engines/wintermute/ad/ad_rot_level.cpp2
-rw-r--r--engines/wintermute/ad/ad_scale_level.cpp2
-rw-r--r--engines/wintermute/ad/ad_scene.cpp2
-rw-r--r--engines/wintermute/ad/ad_sentence.cpp6
-rw-r--r--engines/wintermute/ad/ad_sprite_set.cpp2
-rw-r--r--engines/wintermute/ad/ad_talk_def.cpp2
-rw-r--r--engines/wintermute/ad/ad_waypoint_group.cpp2
16 files changed, 33 insertions, 33 deletions
diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp
index bfc21c6ccc..fc28293ac8 100644
--- a/engines/wintermute/ad/ad_actor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -132,7 +132,7 @@ bool AdActor::loadFile(const char *filename) {
if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing ACTOR file '%s'", filename);
- delete [] buffer;
+ delete[] buffer;
return ret;
}
@@ -1287,7 +1287,7 @@ bool AdActor::mergeAnims(const char *animsFilename) {
break;
}
}
- delete [] fileBuffer;
+ delete[] fileBuffer;
return Ret;
}
diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp
index 80c52de71a..a4b94d062f 100644
--- a/engines/wintermute/ad/ad_entity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -97,7 +97,7 @@ bool AdEntity::loadFile(const char *filename) {
if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing ENTITY file '%s'", filename);
- delete [] buffer;
+ delete[] buffer;
return ret;
}
diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index d75f41e38e..1df34e74bd 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -128,12 +128,12 @@ bool AdGame::cleanup() {
for (i = 0; i < _dlgPendingBranches.getSize(); i++) {
- delete [] _dlgPendingBranches[i];
+ delete[] _dlgPendingBranches[i];
}
_dlgPendingBranches.removeAll();
for (i = 0; i < _speechDirs.getSize(); i++) {
- delete [] _speechDirs[i];
+ delete[] _speechDirs[i];
}
_speechDirs.removeAll();
@@ -1117,7 +1117,7 @@ bool AdGame::loadFile(const char *filename) {
if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing GAME file '%s'", filename);
- delete [] buffer;
+ delete[] buffer;
return ret;
}
@@ -1387,7 +1387,7 @@ bool AdGame::loadItemsFile(const char *filename, bool merge) {
if (DID_FAIL(ret = loadItemsBuffer(buffer, merge))) _gameRef->LOG(0, "Error parsing ITEMS file '%s'", filename);
- delete [] buffer;
+ delete[] buffer;
return ret;
}
@@ -1451,7 +1451,7 @@ AdSceneState *AdGame::getSceneState(const char *filename, bool saving) {
for (int i = 0; i < _sceneStates.getSize(); i++) {
if (scumm_stricmp(_sceneStates[i]->_filename, filenameCor) == 0) {
- delete [] filenameCor;
+ delete[] filenameCor;
return _sceneStates[i];
}
}
@@ -1462,10 +1462,10 @@ AdSceneState *AdGame::getSceneState(const char *filename, bool saving) {
_sceneStates.add(ret);
- delete [] filenameCor;
+ delete[] filenameCor;
return ret;
} else {
- delete [] filenameCor;
+ delete[] filenameCor;
return NULL;
}
}
@@ -1563,7 +1563,7 @@ bool AdGame::endDlgBranch(const char *branchName, const char *scriptName, const
if (startIndex >= 0) {
for (int i = startIndex; i < _dlgPendingBranches.getSize(); i++) {
//ClearBranchResponses(_dlgPendingBranches[i]);
- delete [] _dlgPendingBranches[i];
+ delete[] _dlgPendingBranches[i];
_dlgPendingBranches[i] = NULL;
}
_dlgPendingBranches.removeAt(startIndex, _dlgPendingBranches.getSize() - startIndex);
@@ -1575,7 +1575,7 @@ bool AdGame::endDlgBranch(const char *branchName, const char *scriptName, const
_responsesBranch.removeAll();
}
- if (deleteName) delete [] name;
+ if (deleteName) delete[] name;
return STATUS_OK;
}
@@ -1795,7 +1795,7 @@ bool AdGame::addItem(AdItem *item) {
bool AdGame::resetContent() {
// clear pending dialogs
for (int i = 0; i < _dlgPendingBranches.getSize(); i++) {
- delete [] _dlgPendingBranches[i];
+ delete[] _dlgPendingBranches[i];
}
_dlgPendingBranches.removeAll();
@@ -1862,7 +1862,7 @@ bool AdGame::addSpeechDir(const char *dir) {
for (int i = 0; i < _speechDirs.getSize(); i++) {
if (scumm_stricmp(_speechDirs[i], temp) == 0) {
- delete [] temp;
+ delete[] temp;
return STATUS_OK;
}
}
@@ -1884,13 +1884,13 @@ bool AdGame::removeSpeechDir(const char *dir) {
bool Found = false;
for (int i = 0; i < _speechDirs.getSize(); i++) {
if (scumm_stricmp(_speechDirs[i], temp) == 0) {
- delete [] _speechDirs[i];
+ delete[] _speechDirs[i];
_speechDirs.removeAt(i);
Found = true;
break;
}
}
- delete [] temp;
+ delete[] temp;
if (Found) return STATUS_OK;
else return STATUS_FAILED;
@@ -1910,7 +1910,7 @@ char *AdGame::findSpeechFile(char *stringID) {
if (_fileManager->hasFile(ret))
return ret;
}
- delete [] ret;
+ delete[] ret;
return NULL;
}
diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
index 38e06535d9..60607c71c6 100644
--- a/engines/wintermute/ad/ad_inventory_box.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -169,7 +169,7 @@ bool AdInventoryBox::loadFile(const char *filename) {
if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing INVENTORY_BOX file '%s'", filename);
- delete [] buffer;
+ delete[] buffer;
return ret;
}
diff --git a/engines/wintermute/ad/ad_item.cpp b/engines/wintermute/ad/ad_item.cpp
index ec9fa3c14c..e9a1bb4353 100644
--- a/engines/wintermute/ad/ad_item.cpp
+++ b/engines/wintermute/ad/ad_item.cpp
@@ -97,7 +97,7 @@ bool AdItem::loadFile(const char *filename) {
if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing ITEM file '%s'", filename);
- delete [] buffer;
+ delete[] buffer;
return ret;
}
diff --git a/engines/wintermute/ad/ad_layer.cpp b/engines/wintermute/ad/ad_layer.cpp
index 38894a0e88..0a93edfb35 100644
--- a/engines/wintermute/ad/ad_layer.cpp
+++ b/engines/wintermute/ad/ad_layer.cpp
@@ -73,7 +73,7 @@ bool AdLayer::loadFile(const char *filename) {
if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing LAYER file '%s'", filename);
- delete [] buffer;
+ delete[] buffer;
return ret;
}
diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp
index 84f13dc989..fdbc987158 100644
--- a/engines/wintermute/ad/ad_object.cpp
+++ b/engines/wintermute/ad/ad_object.cpp
@@ -853,7 +853,7 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const
char *key = _gameRef->_stringTable->getKey(text);
if (key) {
sound = ((AdGame *)_gameRef)->findSpeechFile(key);
- delete [] key;
+ delete[] key;
if (sound) deleteSound = true;
}
@@ -931,7 +931,7 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const
_state = STATE_TALKING;
- if (deleteSound) delete [] sound;
+ if (deleteSound) delete[] sound;
}
diff --git a/engines/wintermute/ad/ad_region.cpp b/engines/wintermute/ad/ad_region.cpp
index a23c000137..eec25b2aaa 100644
--- a/engines/wintermute/ad/ad_region.cpp
+++ b/engines/wintermute/ad/ad_region.cpp
@@ -67,7 +67,7 @@ bool AdRegion::loadFile(const char *filename) {
if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing REGION file '%s'", filename);
- delete [] buffer;
+ delete[] buffer;
return ret;
}
diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index 90582ce811..22b40f3ea4 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -200,7 +200,7 @@ bool AdResponseBox::loadFile(const char *filename) {
if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing RESPONSE_BOX file '%s'", filename);
- delete [] buffer;
+ delete[] buffer;
return ret;
}
diff --git a/engines/wintermute/ad/ad_rot_level.cpp b/engines/wintermute/ad/ad_rot_level.cpp
index 6f3ffdaeb5..72fcaeff28 100644
--- a/engines/wintermute/ad/ad_rot_level.cpp
+++ b/engines/wintermute/ad/ad_rot_level.cpp
@@ -66,7 +66,7 @@ bool AdRotLevel::loadFile(const char *filename) {
if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing ROTATION_LEVEL file '%s'", filename);
- delete [] buffer;
+ delete[] buffer;
return ret;
}
diff --git a/engines/wintermute/ad/ad_scale_level.cpp b/engines/wintermute/ad/ad_scale_level.cpp
index 1adf4266b2..c390c6dc08 100644
--- a/engines/wintermute/ad/ad_scale_level.cpp
+++ b/engines/wintermute/ad/ad_scale_level.cpp
@@ -64,7 +64,7 @@ bool AdScaleLevel::loadFile(const char *filename) {
if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing SCALE_LEVEL file '%s'", filename);
- delete [] buffer;
+ delete[] buffer;
return ret;
}
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index a802039550..dd69db3d68 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -514,7 +514,7 @@ bool AdScene::loadFile(const char *filename) {
setFilename(filename);
- delete [] buffer;
+ delete[] buffer;
return ret;
}
diff --git a/engines/wintermute/ad/ad_sentence.cpp b/engines/wintermute/ad/ad_sentence.cpp
index 452c2587d4..a011db3f02 100644
--- a/engines/wintermute/ad/ad_sentence.cpp
+++ b/engines/wintermute/ad/ad_sentence.cpp
@@ -91,7 +91,7 @@ AdSentence::~AdSentence() {
//////////////////////////////////////////////////////////////////////////
void AdSentence::setText(const char *text) {
- if (_text) delete [] _text;
+ if (_text) delete[] _text;
_text = new char[strlen(text) + 1];
if (_text) strcpy(_text, text);
}
@@ -99,7 +99,7 @@ void AdSentence::setText(const char *text) {
//////////////////////////////////////////////////////////////////////////
void AdSentence::setStances(const char *stances) {
- if (_stances) delete [] _stances;
+ if (_stances) delete[] _stances;
if (stances) {
_stances = new char[strlen(stances) + 1];
if (_stances) strcpy(_stances, stances);
@@ -124,7 +124,7 @@ char *AdSentence::getNextStance() {
char *AdSentence::getStance(int stance) {
if (_stances == NULL) return NULL;
- if (_tempStance) delete [] _tempStance;
+ if (_tempStance) delete[] _tempStance;
_tempStance = NULL;
char *start;
diff --git a/engines/wintermute/ad/ad_sprite_set.cpp b/engines/wintermute/ad/ad_sprite_set.cpp
index e158b6115a..fcbf9af4eb 100644
--- a/engines/wintermute/ad/ad_sprite_set.cpp
+++ b/engines/wintermute/ad/ad_sprite_set.cpp
@@ -69,7 +69,7 @@ bool AdSpriteSet::loadFile(const char *filename, int lifeTime, TSpriteCacheType
if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing SPRITESET file '%s'", filename);
- delete [] buffer;
+ delete[] buffer;
return ret;
}
diff --git a/engines/wintermute/ad/ad_talk_def.cpp b/engines/wintermute/ad/ad_talk_def.cpp
index cfbefd39d4..2b0c6c6c1b 100644
--- a/engines/wintermute/ad/ad_talk_def.cpp
+++ b/engines/wintermute/ad/ad_talk_def.cpp
@@ -81,7 +81,7 @@ bool AdTalkDef::loadFile(const char *filename) {
if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing TALK file '%s'", filename);
- delete [] buffer;
+ delete[] buffer;
return ret;
}
diff --git a/engines/wintermute/ad/ad_waypoint_group.cpp b/engines/wintermute/ad/ad_waypoint_group.cpp
index 28ce2967dd..7e5d8d29c6 100644
--- a/engines/wintermute/ad/ad_waypoint_group.cpp
+++ b/engines/wintermute/ad/ad_waypoint_group.cpp
@@ -78,7 +78,7 @@ bool AdWaypointGroup::loadFile(const char *filename) {
if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing WAYPOINTS file '%s'", filename);
- delete [] buffer;
+ delete[] buffer;
return ret;
}