aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorLittleboy2012-07-27 19:58:51 -0400
committerLittleboy2012-07-27 20:07:03 -0400
commit839ad1303f67b83f4383fb448463363e1e9f64fc (patch)
tree9ccb69a379cfe172ba2dc17055a37cfa9549b84f /engines
parentd8acba294d7898ffff70ea679579cd8ae5eab0a7 (diff)
downloadscummvm-rg350-839ad1303f67b83f4383fb448463363e1e9f64fc.tar.gz
scummvm-rg350-839ad1303f67b83f4383fb448463363e1e9f64fc.tar.bz2
scummvm-rg350-839ad1303f67b83f4383fb448463363e1e9f64fc.zip
LASTEXPRESS: Fix some formatting issues
Diffstat (limited to 'engines')
-rw-r--r--engines/lastexpress/entities/entity.h26
-rw-r--r--engines/lastexpress/game/entities.cpp2
-rw-r--r--engines/lastexpress/game/scenes.cpp2
-rw-r--r--engines/lastexpress/sound/sound.cpp2
4 files changed, 16 insertions, 16 deletions
diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h
index e2514a6146..0b1db137a6 100644
--- a/engines/lastexpress/entities/entity.h
+++ b/engines/lastexpress/entities/entity.h
@@ -275,7 +275,7 @@ struct SavePoint;
class EntityData : Common::Serializable {
public:
- struct EntityParameters : Common::Serializable{
+ struct EntityParameters : Common::Serializable {
virtual ~EntityParameters() {}
virtual Common::String toString() = 0;
@@ -1079,7 +1079,7 @@ protected:
_data->setCurrentCallback(index);
RESET_PARAMS(_data, EntityData::EntityParametersIIII);
- EntityData::EntityParametersIIII *params = (EntityData::EntityParametersIIII*)_data->getCurrentParameters();
+ EntityData::EntityParametersIIII *params = (EntityData::EntityParametersIIII *)_data->getCurrentParameters();
params->param1 = (unsigned int)param1;
_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
@@ -1093,7 +1093,7 @@ protected:
_data->setCurrentCallback(index);
RESET_PARAMS(_data, EntityData::EntityParametersIIII);
- EntityData::EntityParametersIIII *params = (EntityData::EntityParametersIIII*)_data->getCurrentParameters();
+ EntityData::EntityParametersIIII *params = (EntityData::EntityParametersIIII *)_data->getCurrentParameters();
params->param1 = param1;
params->param2 = param2;
@@ -1108,7 +1108,7 @@ protected:
_data->setCurrentCallback(index);
RESET_PARAMS(_data, EntityData::EntityParametersIIII);
- EntityData::EntityParametersIIII *params = (EntityData::EntityParametersIIII*)_data->getCurrentParameters();
+ EntityData::EntityParametersIIII *params = (EntityData::EntityParametersIIII *)_data->getCurrentParameters();
params->param1 = param1;
params->param2 = param2;
params->param3 = param3;
@@ -1124,7 +1124,7 @@ protected:
_data->setCurrentCallback(index);
RESET_PARAMS(_data, EntityData::EntityParametersSIIS);
- EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS*)_data->getCurrentParameters();
+ EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS *)_data->getCurrentParameters();
strncpy((char *)&params->seq1, seq1, 12);
params->param4 = param4;
@@ -1139,7 +1139,7 @@ protected:
_data->setCurrentCallback(index);
RESET_PARAMS(_data, EntityData::EntityParametersSIIS);
- EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS*)_data->getCurrentParameters();
+ EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS *)_data->getCurrentParameters();
strncpy((char *)&params->seq1, seq1, 12);
params->param4 = param4;
params->param5 = param5;
@@ -1155,7 +1155,7 @@ protected:
_data->setCurrentCallback(index);
RESET_PARAMS(_data, EntityData::EntityParametersSIII);
- EntityData::EntityParametersSIII *params = (EntityData::EntityParametersSIII*)_data->getCurrentParameters();
+ EntityData::EntityParametersSIII *params = (EntityData::EntityParametersSIII *)_data->getCurrentParameters();
strncpy((char *)&params->seq, seq, 12);
params->param4 = param4;
params->param5 = param5;
@@ -1172,7 +1172,7 @@ protected:
_data->setCurrentCallback(index);
RESET_PARAMS(_data, EntityData::EntityParametersSIIS);
- EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS*)_data->getCurrentParameters();
+ EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS *)_data->getCurrentParameters();
strncpy((char *)&params->seq1, seq1, 12);
params->param4 = param4;
params->param5 = param5;
@@ -1189,7 +1189,7 @@ protected:
_data->setCurrentCallback(index);
RESET_PARAMS(_data, EntityData::EntityParametersSSII);
- EntityData::EntityParametersSSII *params = (EntityData::EntityParametersSSII*)_data->getCurrentParameters();
+ EntityData::EntityParametersSSII *params = (EntityData::EntityParametersSSII *)_data->getCurrentParameters();
strncpy((char *)&params->seq1, seq1, 12);
strncpy((char *)&params->seq2, seq2, 12);
params->param7 = param7;
@@ -1205,7 +1205,7 @@ protected:
_data->setCurrentCallback(index);
RESET_PARAMS(_data, EntityData::EntityParametersISII);
- EntityData::EntityParametersISII *params = (EntityData::EntityParametersISII*)_data->getCurrentParameters();
+ EntityData::EntityParametersISII *params = (EntityData::EntityParametersISII *)_data->getCurrentParameters();
params->param1 = (unsigned int)param1;
strncpy((char *)&params->seq, seq, 12);
@@ -1220,7 +1220,7 @@ protected:
_data->setCurrentCallback(index);
RESET_PARAMS(_data, EntityData::EntityParametersISSI);
- EntityData::EntityParametersISSI *params = (EntityData::EntityParametersISSI*)_data->getCurrentParameters();
+ EntityData::EntityParametersISSI *params = (EntityData::EntityParametersISSI *)_data->getCurrentParameters();
params->param1 = param1;
strncpy((char *)&params->seq1, seq1, 12);
strncpy((char *)&params->seq2, seq2, 12);
@@ -1236,7 +1236,7 @@ protected:
_data->setCurrentCallback(index);
RESET_PARAMS(_data, EntityData::EntityParametersIISI);
- EntityData::EntityParametersIISI *params = (EntityData::EntityParametersIISI*)_data->getCurrentParameters();
+ EntityData::EntityParametersIISI *params = (EntityData::EntityParametersIISI *)_data->getCurrentParameters();
params->param1 = param1;
params->param2 = param2;
strncpy((char *)&params->seq, seq, 12);
@@ -1252,7 +1252,7 @@ protected:
_data->setCurrentCallback(index);
RESET_PARAMS(_data, EntityData::EntityParametersIISS);
- EntityData::EntityParametersIISS *params = (EntityData::EntityParametersIISS*)_data->getCurrentParameters();
+ EntityData::EntityParametersIISS *params = (EntityData::EntityParametersIISS *)_data->getCurrentParameters();
params->param1 = param1;
params->param2 = param2;
strncpy((char *)&params->seq1, seq1, 12);
diff --git a/engines/lastexpress/game/entities.cpp b/engines/lastexpress/game/entities.cpp
index 29cc7d889c..51db635bed 100644
--- a/engines/lastexpress/game/entities.cpp
+++ b/engines/lastexpress/game/entities.cpp
@@ -2278,7 +2278,7 @@ label_process_entity:
if (getScenes()->checkPosition(kSceneNone, SceneManager::kCheckPositionLookingUp)) {
getSavePoints()->push(kEntityPlayer, entity, kActionExcuseMeCath);
- } else if (getScenes()->checkPosition(kSceneNone, SceneManager::kCheckPositionLookingDown) || getScenes()->checkCurrentPosition(false)){
+ } else if (getScenes()->checkPosition(kSceneNone, SceneManager::kCheckPositionLookingDown) || getScenes()->checkCurrentPosition(false)) {
getSavePoints()->push(kEntityPlayer, entity, kActionExcuseMe);
if (getScenes()->checkCurrentPosition(false))
diff --git a/engines/lastexpress/game/scenes.cpp b/engines/lastexpress/game/scenes.cpp
index 447e8714b0..3cda900757 100644
--- a/engines/lastexpress/game/scenes.cpp
+++ b/engines/lastexpress/game/scenes.cpp
@@ -489,7 +489,7 @@ bool SceneManager::checkCurrentPosition(bool doCheckOtherCars) const {
if (position == 99)
return true;
- switch (car){
+ switch (car) {
default:
break;
diff --git a/engines/lastexpress/sound/sound.cpp b/engines/lastexpress/sound/sound.cpp
index 4f6a7b8f93..319f7cd4f4 100644
--- a/engines/lastexpress/sound/sound.cpp
+++ b/engines/lastexpress/sound/sound.cpp
@@ -674,7 +674,7 @@ const char *SoundManager::getDialogName(EntityIndex entity) const {
//////////////////////////////////////////////////////////////////////////
// Letters & Messages
//////////////////////////////////////////////////////////////////////////
-void SoundManager::readText(int id){
+void SoundManager::readText(int id) {
if (!_queue->isBuffered(kEntityTables4))
return;