Skip to content

Commit

Permalink
LASTEXPRESS: Fix some formatting issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@Templier
Templier committed Jul 28, 2012
1 parent d8acba2 commit 839ad13
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
26 changes: 13 additions & 13 deletions engines/lastexpress/entities/entity.h
View file
Expand Up @@ -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;

Expand Down Expand Up @@ -1079,7 +1079,7 @@ class Entity : Common::Serializable {
_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);
Expand All @@ -1093,7 +1093,7 @@ class Entity : Common::Serializable {
_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;

Expand All @@ -1108,7 +1108,7 @@ class Entity : Common::Serializable {
_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;
Expand All @@ -1124,7 +1124,7 @@ class Entity : Common::Serializable {
_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;

Expand All @@ -1139,7 +1139,7 @@ class Entity : Common::Serializable {
_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;
Expand All @@ -1155,7 +1155,7 @@ class Entity : Common::Serializable {
_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;
Expand All @@ -1172,7 +1172,7 @@ class Entity : Common::Serializable {
_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;
Expand All @@ -1189,7 +1189,7 @@ class Entity : Common::Serializable {
_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;
Expand All @@ -1205,7 +1205,7 @@ class Entity : Common::Serializable {
_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);

Expand All @@ -1220,7 +1220,7 @@ class Entity : Common::Serializable {
_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);
Expand All @@ -1236,7 +1236,7 @@ class Entity : Common::Serializable {
_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);
Expand All @@ -1252,7 +1252,7 @@ class Entity : Common::Serializable {
_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);
Expand Down
2 changes: 1 addition & 1 deletion engines/lastexpress/game/entities.cpp
View file
Expand Up @@ -2278,7 +2278,7 @@ bool Entities::updateEntity(EntityIndex entity, CarIndex car, EntityPosition pos

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))
Expand Down
2 changes: 1 addition & 1 deletion engines/lastexpress/game/scenes.cpp
View file
Expand Up @@ -489,7 +489,7 @@ bool SceneManager::checkCurrentPosition(bool doCheckOtherCars) const {
if (position == 99)
return true;

switch (car){
switch (car) {
default:
break;

Expand Down
2 changes: 1 addition & 1 deletion engines/lastexpress/sound/sound.cpp
View file
Expand Up @@ -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;

Expand Down

0 comments on commit 839ad13

Please sign in to comment.