From a4798602d7a025dc13fd253d584dbf29dbec488d Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Wed, 15 Feb 2012 09:53:31 -0600 Subject: JANITORIAL: Fix missing whitespace in pointer cast find -name '*.h' -or -name '*.cpp' | xargs sed -r -i 's@\(([A-Za-z0-9]+)\*\)@(\1 *)@g' This seems to have caught some params as well which is not undesirable IMO. It also caught some strings containing this which is undesirable so I excluded them manually. (engines/sci/engine/kernel_tables.h) --- engines/lastexpress/entities/alexei.cpp | 2 +- engines/lastexpress/entities/entity_intern.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/lastexpress/entities') diff --git a/engines/lastexpress/entities/alexei.cpp b/engines/lastexpress/entities/alexei.cpp index 073ca3f175..54c2d87b89 100644 --- a/engines/lastexpress/entities/alexei.cpp +++ b/engines/lastexpress/entities/alexei.cpp @@ -355,7 +355,7 @@ IMPLEMENT_FUNCTION_IS(16, Alexei, function16, TimeValue) break; case kActionDefault: - getEntities()->drawSequenceLeft(kEntityAlexei, (char*)¶ms->seq); + getEntities()->drawSequenceLeft(kEntityAlexei, (char *)¶ms->seq); getObjects()->update(kObjectCompartment2, kEntityAlexei, kObjectLocation1, kCursorHandKnock, kCursorHand); getObjects()->update(kObjectHandleInsideBathroom, kEntityAlexei, kObjectLocation1, kCursorHandKnock, kCursorHand); break; diff --git a/engines/lastexpress/entities/entity_intern.h b/engines/lastexpress/entities/entity_intern.h index bf75e022de..2da0da15b3 100644 --- a/engines/lastexpress/entities/entity_intern.h +++ b/engines/lastexpress/entities/entity_intern.h @@ -94,7 +94,7 @@ void class::setup_##name() { \ // Expose parameters and check validity #define EXPOSE_PARAMS(type) \ - type *params = (type*)_data->getCurrentParameters(); \ + type *params = (type *)_data->getCurrentParameters(); \ if (!params) \ error("[EXPOSE_PARAMS] Trying to call an entity function with invalid parameters"); \ @@ -307,7 +307,7 @@ void class::setup_##name() { \ ////////////////////////////////////////////////////////////////////////// #define RESET_ENTITY_STATE(entity, class, function) \ getEntities()->resetState(entity); \ - ((class*)getEntities()->get(entity))->function(); + ((class *)getEntities()->get(entity))->function(); ////////////////////////////////////////////////////////////////////////// // Parameters macros (for default IIII parameters) -- cgit v1.2.3 From 75efdd2d84e21f5d3d01afcc89d61289ae87e4a2 Mon Sep 17 00:00:00 2001 From: Christoph Mallon Date: Tue, 13 Mar 2012 10:40:41 +0100 Subject: JANITORIAL: Replace (x ? false : true) by !(x). --- engines/lastexpress/entities/chapters.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/lastexpress/entities') diff --git a/engines/lastexpress/entities/chapters.cpp b/engines/lastexpress/entities/chapters.cpp index 96e08ba808..4ef2dc50e8 100644 --- a/engines/lastexpress/entities/chapters.cpp +++ b/engines/lastexpress/entities/chapters.cpp @@ -1805,7 +1805,7 @@ void Chapters::enterExitHelper(bool isEnteringStation) { getObjects()->update(kObjectHandleOutsideLeft, kEntityPlayer, kObjectLocation1, kCursorNormal, isEnteringStation ? kCursorNormal : kCursorHand); getObjects()->update(kObjectHandleOutsideRight, kEntityPlayer, kObjectLocation1, kCursorNormal, isEnteringStation ? kCursorNormal : kCursorHand); - getProgress().isTrainRunning = isEnteringStation ? false : true; + getProgress().isTrainRunning = !isEnteringStation; if (isEnteringStation) { ENTITY_PARAM(0, 2) = 1; -- cgit v1.2.3