libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LASTEXPRESS: Fix some space formatting.

Browse Source 
svn-id: r53629
This commit is contained in:
Jordi Vilalta Prat 2010-10-19 22:34:26 +00:00
parent e4029f6f0e
commit 59c054938a
53 changed files with 180 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/lastexpress/data/scene.cpp
View File

@ -51,7 +51,7 @@ SceneHotspot *SceneHotspot::load(Common::SeekableReadStream *stream) {
hs->cursor = stream->readByte();
hs->next = stream->readUint32LE();
debugC(10, kLastExpressDebugScenes, "\thotspot: scene=%d location=%02d action=%d param1=%02d param2=%02d param3=%02d cursor=%02d rect=(%d, %d)x(%d,%d)",
debugC(10, kLastExpressDebugScenes, "\thotspot: scene=%d location=%02d action=%d param1=%02d param2=%02d param3=%02d cursor=%02d rect=(%d, %d)x(%d, %d)",
hs->scene, hs->location, hs->action, hs->param1, hs->param2, hs->param3, hs->cursor, hs->rect.left, hs->rect.top, hs->rect.right, hs->rect.bottom);
debugC(10, kLastExpressDebugScenes, "\t coords=%d next=%d ", hs->coordsOffset, hs->next);
@ -79,7 +79,7 @@ SceneHotspot *SceneHotspot::load(Common::SeekableReadStream *stream) {
Common::String SceneHotspot::toString() const {
Common::String output = "";
output += Common::String::printf(" hotspot: scene=%d location=%02d action=%d param1=%02d param2=%02d param3=%02d cursor=%02d rect=(%d, %d)x(%d,%d)",
output += Common::String::printf(" hotspot: scene=%d location=%02d action=%d param1=%02d param2=%02d param3=%02d cursor=%02d rect=(%d, %d)x(%d, %d)",
scene, location, action, param1, param2, param3, cursor, rect.left, rect.top, rect.right, rect.bottom);
return output;

3
engines/lastexpress/data/subtitle.cpp
View File

@ -72,8 +72,7 @@ void Subtitle::reset() {
}
template<typename T>
T *newArray(size_t n)
{
T *newArray(size_t n) {
if (n <= (size_t)-1 / sizeof(T))
return new T[n];

14
engines/lastexpress/entities/abbot.h
View File

@ -48,7 +48,7 @@ public:
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Handles entering/exiting a compartment.
@ -56,7 +56,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Handles entering/exiting a compartment and updates position/play animation
@ -64,7 +64,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment2, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment2, const char *sequence, ObjectIndex compartment)
/**
* Process callback action when the entity direction is not kDirectionRight
@ -78,7 +78,7 @@ public:
* @param sequence2 The sequence to draw for the second entity
* @param entity The EntityIndex of the second entity
*/
DECLARE_FUNCTION_3(draw2, const char* sequence1, const char* sequence2, EntityIndex entity)
DECLARE_FUNCTION_3(draw2, const char *sequence1, const char *sequence2, EntityIndex entity)
/**
* Updates parameter 2 using time value
@ -99,7 +99,7 @@ public:
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Saves the game
@ -125,7 +125,7 @@ public:
* @param action The action
* @param sequence2 The sequence name for the savepoint
*/
DECLARE_FUNCTION_4(callSavepoint, const char* sequence1, EntityIndex entity, ActionIndex action, const char* sequence2)
DECLARE_FUNCTION_4(callSavepoint, const char *sequence1, EntityIndex entity, ActionIndex action, const char *sequence2)
/**
* Updates the position
@ -134,7 +134,7 @@ public:
* @param car The car
* @param position The position
*/
DECLARE_FUNCTION_3(updatePosition, const char* sequence1, CarIndex car, Position position)
DECLARE_FUNCTION_3(updatePosition, const char *sequence1, CarIndex car, Position position)
/**
* Process callback action when somebody is standing in the restaurant or salon.

2
engines/lastexpress/entities/alexei.cpp
View File

@ -555,7 +555,7 @@ IMPLEMENT_FUNCTION(18, Alexei, chapter1Handler)
}
//////////////////////////////////////////////////////////////////////////
IMPLEMENT_FUNCTION(19 ,Alexei, function19)
IMPLEMENT_FUNCTION(19, Alexei, function19)
switch (savepoint.action) {
default:
break;

12
engines/lastexpress/entities/alexei.h
View File

@ -48,7 +48,7 @@ public:
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Updates parameter 2 using ticks value
@ -62,7 +62,7 @@ public:
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Updates the position
@ -71,7 +71,7 @@ public:
* @param car The car
* @param position The position
*/
DECLARE_FUNCTION_3(updatePosition, const char* sequence1, CarIndex car, Position position)
DECLARE_FUNCTION_3(updatePosition, const char *sequence1, CarIndex car, Position position)
/**
* Handles entering/exiting a compartment.
@ -79,7 +79,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Process callback action when the entity direction is not kDirectionRight
@ -94,7 +94,7 @@ public:
* @param action The action
* @param sequence2 The sequence name for the savepoint
*/
DECLARE_FUNCTION_4(callSavepoint, const char* sequence1, EntityIndex entity, ActionIndex action, const char* sequence2)
DECLARE_FUNCTION_4(callSavepoint, const char *sequence1, EntityIndex entity, ActionIndex action, const char *sequence2)
/**
* Saves the game
@ -137,7 +137,7 @@ public:
* @param timeValue The time value
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_2(function16, TimeValue timeValue, const char* sequence)
DECLARE_FUNCTION_2(function16, TimeValue timeValue, const char *sequence)
/**
* Setup Chapter 1

4
engines/lastexpress/entities/alouan.h
View File

@ -49,14 +49,14 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Plays sound
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Updates parameter 2 using time value

2
engines/lastexpress/entities/anna.cpp
View File

@ -1794,7 +1794,7 @@ IMPLEMENT_FUNCTION(42, Anna, chapter2)
}
//////////////////////////////////////////////////////////////////////////
IMPLEMENT_FUNCTION(43 ,Anna, chapter2Handler)
IMPLEMENT_FUNCTION(43, Anna, chapter2Handler)
switch (savepoint.action) {
default:
break;

12
engines/lastexpress/entities/anna.h
View File

@ -48,7 +48,7 @@ public:
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Updates the position
@ -57,7 +57,7 @@ public:
* @param car The car
* @param position The position
*/
DECLARE_FUNCTION_3(updatePosition, const char* sequence1, CarIndex car, Position position)
DECLARE_FUNCTION_3(updatePosition, const char *sequence1, CarIndex car, Position position)
/**
* Handles entering/exiting a compartment.
@ -65,7 +65,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Process callback action when the entity direction is not kDirectionRight
@ -80,14 +80,14 @@ public:
* @param action The action
* @param sequence2 The sequence name for the savepoint
*/
DECLARE_FUNCTION_4(callSavepoint, const char* sequence1, EntityIndex entity, ActionIndex action, const char* sequence2)
DECLARE_FUNCTION_4(callSavepoint, const char *sequence1, EntityIndex entity, ActionIndex action, const char *sequence2)
/**
* Plays sound
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Process callback action when somebody is standing in the restaurant or salon.
@ -126,7 +126,7 @@ public:
* @param sequence2 The sequence to draw for the second entity
* @param entity The EntityIndex of the second entity
*/
DECLARE_FUNCTION_3(draw2, const char* sequence1, const char* sequence2, EntityIndex entity)
DECLARE_FUNCTION_3(draw2, const char *sequence1, const char *sequence2, EntityIndex entity)
/**
* Updates parameter 2 using ticks value

20
engines/lastexpress/entities/august.h
View File

@ -55,7 +55,7 @@ public:
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Updates the position
@ -64,7 +64,7 @@ public:
* @param car The car
* @param position The position
*/
DECLARE_FUNCTION_3(updatePosition, const char* sequence1, CarIndex car, Position position)
DECLARE_FUNCTION_3(updatePosition, const char *sequence1, CarIndex car, Position position)
/**
* Handles entering/exiting a compartment.
@ -72,7 +72,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Handles entering/exiting a compartment and updates position/play animation
@ -80,7 +80,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment2, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment2, const char *sequence, ObjectIndex compartment)
/**
* Handles entering/exiting a compartment.
@ -88,7 +88,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment3, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment3, const char *sequence, ObjectIndex compartment)
/**
* Process callback action when the entity direction is not kDirectionRight
@ -103,7 +103,7 @@ public:
* @param action The action
* @param sequence2 The sequence name for the savepoint
*/
DECLARE_FUNCTION_4(callSavepoint, const char* sequence1, EntityIndex entity, ActionIndex action, const char* sequence2)
DECLARE_FUNCTION_4(callSavepoint, const char *sequence1, EntityIndex entity, ActionIndex action, const char *sequence2)
/**
* Call a savepoint
@ -112,7 +112,7 @@ public:
* @param param2 The action
* @param seq The sequence name for the savepoint
*/
DECLARE_FUNCTION_3(callSavepointNoDrawing, EntityIndex entity, ActionIndex action, const char* sequence)
DECLARE_FUNCTION_3(callSavepointNoDrawing, EntityIndex entity, ActionIndex action, const char *sequence)
/**
* Draws the entity along with another one
@ -121,21 +121,21 @@ public:
* @param sequence2 The sequence to draw for the second entity
* @param entity The EntityIndex of the second entity
*/
DECLARE_FUNCTION_3(draw2, const char* sequence1, const char* sequence2, EntityIndex entity)
DECLARE_FUNCTION_3(draw2, const char *sequence1, const char *sequence2, EntityIndex entity)
/**
* Plays sound
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Plays sound
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound16, const char* filename)
DECLARE_FUNCTION_1(playSound16, const char *filename)
/**
* Process callback action when somebody is standing in the restaurant or salon.

10
engines/lastexpress/entities/boutarel.h
View File

@ -48,14 +48,14 @@ public:
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Draws the entity
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Updates parameter 2 using time value
@ -71,7 +71,7 @@ public:
* @param car The car
* @param position The position
*/
DECLARE_FUNCTION_3(updatePosition, const char* sequence1, CarIndex car, Position position)
DECLARE_FUNCTION_3(updatePosition, const char *sequence1, CarIndex car, Position position)
/**
* Handles entering/exiting a compartment.
@ -79,7 +79,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Handles entering/exiting a compartment and updates position/play animation
@ -87,7 +87,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment2, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment2, const char *sequence, ObjectIndex compartment)
/**
* Process callback action when the entity direction is not kDirectionRight

2
engines/lastexpress/entities/chapters.cpp
View File

@ -156,7 +156,7 @@ IMPLEMENT_FUNCTION(5, Chapters, resetMainEntities)
}
//////////////////////////////////////////////////////////////////////////
IMPLEMENT_FUNCTION(6,Chapters, chapter1End)
IMPLEMENT_FUNCTION(6, Chapters, chapter1End)
switch (savepoint.action) {
default:
break;

4
engines/lastexpress/entities/cooks.h
View File

@ -43,14 +43,14 @@ public:
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Plays sound
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
DECLARE_FUNCTION(function3)

2
engines/lastexpress/entities/coudert.cpp
View File

@ -3550,7 +3550,7 @@ IMPLEMENT_NULL_FUNCTION(63, Coudert)
//////////////////////////////////////////////////////////////////////////
// Private functions
//////////////////////////////////////////////////////////////////////////
void Coudert::visitCompartment(const SavePoint &savepoint, EntityPosition position, const char* seq1, ObjectIndex compartment, const char* seq2, const char* seq3, EntityPosition sittingPosition, ObjectIndex object, const char* seq4) {
void Coudert::visitCompartment(const SavePoint &savepoint, EntityPosition position, const char *seq1, ObjectIndex compartment, const char *seq2, const char *seq3, EntityPosition sittingPosition, ObjectIndex object, const char *seq4) {
EXPOSE_PARAMS(EntityData::EntityParametersIIII)
switch (savepoint.action) {

8
engines/lastexpress/entities/coudert.h
View File

@ -56,7 +56,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Process callback action when the entity direction is not kDirectionRight
@ -71,14 +71,14 @@ public:
* @param entityPosition1 The entity position 1
* @param entityPosition2 The entity position 2
*/
DECLARE_FUNCTION_4(enterExitCompartment2, const char* sequence, ObjectIndex compartment, EntityPosition entityPosition1, EntityPosition entityPosition2)
DECLARE_FUNCTION_4(enterExitCompartment2, const char *sequence, ObjectIndex compartment, EntityPosition entityPosition1, EntityPosition entityPosition2)
/**
* Plays sound
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Plays sound
@ -221,7 +221,7 @@ public:
DECLARE_NULL_FUNCTION()
private:
void visitCompartment(const SavePoint &savepoint, EntityPosition position, const char* seq1, ObjectIndex compartment, const char* seq2, const char* seq3, EntityPosition sittingPosition, ObjectIndex object, const char* seq4);
void visitCompartment(const SavePoint &savepoint, EntityPosition position, const char *seq1, ObjectIndex compartment, const char *seq2, const char *seq3, EntityPosition sittingPosition, ObjectIndex object, const char *seq4);
};
} // End of namespace LastExpress

30
engines/lastexpress/entities/entity_intern.h
View File

@ -157,9 +157,9 @@ void class::setup_##name() { \
EXPOSE_PARAMS(EntityData::EntityParametersIIII) \
debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %d, %d) - action: %s", params->param1, params->param2, params->param3, ACTION_NAME(savepoint.action));
// setup with on char* parameter
// setup with one char *parameter
#define IMPLEMENT_FUNCTION_S(index, class, name) \
void class::setup_##name(const char* seq1) { \
void class::setup_##name(const char *seq1) { \
BEGIN_SETUP(class, name, index, EntityData::EntityParametersSIIS) \
EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS*)_data->getCurrentParameters(); \
strncpy((char *)&params->seq1, seq1, 12); \
@ -169,9 +169,9 @@ void class::setup_##name() { \
EXPOSE_PARAMS(EntityData::EntityParametersSIIS) \
debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s) - action: %s", (char *)&params->seq1, ACTION_NAME(savepoint.action));
// setup with on char* parameter and one uint
// setup with one char *parameter and one uint
#define IMPLEMENT_FUNCTION_SI(index, class, name, paramType2) \
void class::setup_##name(const char* seq1, paramType2 param4) { \
void class::setup_##name(const char *seq1, paramType2 param4) { \
BEGIN_SETUP(class, name, index, EntityData::EntityParametersSIIS) \
EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS*)_data->getCurrentParameters(); \
strncpy((char *)&params->seq1, seq1, 12); \
@ -182,9 +182,9 @@ void class::setup_##name() { \
EXPOSE_PARAMS(EntityData::EntityParametersSIIS) \
debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %d) - action: %s", (char *)&params->seq1, params->param4, ACTION_NAME(savepoint.action));
// setup with on char* parameter and two uints
// setup with one char *parameter and two uints
#define IMPLEMENT_FUNCTION_SII(index, class, name, paramType2, paramType3) \
void class::setup_##name(const char* seq1, paramType2 param4, paramType3 param5) { \
void class::setup_##name(const char *seq1, paramType2 param4, paramType3 param5) { \
BEGIN_SETUP(class, name, index, EntityData::EntityParametersSIIS) \
EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS*)_data->getCurrentParameters(); \
strncpy((char *)&params->seq1, seq1, 12); \
@ -196,9 +196,9 @@ void class::setup_##name() { \
EXPOSE_PARAMS(EntityData::EntityParametersSIIS) \
debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %d, %d) - action: %s", (char *)&params->seq1, params->param4, params->param5, ACTION_NAME(savepoint.action));
// setup with on char* parameter and three uints
// setup with one char *parameter and three uints
#define IMPLEMENT_FUNCTION_SIII(index, class, name, paramType2, paramType3, paramType4) \
void class::setup_##name(const char* seq, paramType2 param4, paramType3 param5, paramType4 param6) { \
void class::setup_##name(const char *seq, paramType2 param4, paramType3 param5, paramType4 param6) { \
BEGIN_SETUP(class, name, index, EntityData::EntityParametersSIII) \
EntityData::EntityParametersSIII *params = (EntityData::EntityParametersSIII*)_data->getCurrentParameters(); \
strncpy((char *)&params->seq, seq, 12); \
@ -212,7 +212,7 @@ void class::setup_##name() { \
debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %d, %d, %d) - action: %s", (char *)&params->seq, params->param4, params->param5, params->param6, ACTION_NAME(savepoint.action));
#define IMPLEMENT_FUNCTION_SIIS(index, class, name, paramType2, paramType3) \
void class::setup_##name(const char* seq1, paramType2 param4, paramType3 param5, const char* seq2) { \
void class::setup_##name(const char *seq1, paramType2 param4, paramType3 param5, const char *seq2) { \
BEGIN_SETUP(class, name, index, EntityData::EntityParametersSIIS) \
EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS*)_data->getCurrentParameters(); \
strncpy((char *)&params->seq1, seq1, 12); \
@ -226,7 +226,7 @@ void class::setup_##name() { \
debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %d, %d, %s) - action: %s", (char *)&params->seq1, params->param4, params->param5, (char *)&params->seq2, ACTION_NAME(savepoint.action));
#define IMPLEMENT_FUNCTION_SS(index, class, name) \
void class::setup_##name(const char* seq1, const char* seq2) { \
void class::setup_##name(const char *seq1, const char *seq2) { \
BEGIN_SETUP(class, name, index, EntityData::EntityParametersSSII) \
EntityData::EntityParametersSSII *params = (EntityData::EntityParametersSSII*)_data->getCurrentParameters(); \
strncpy((char *)&params->seq1, seq1, 12); \
@ -238,7 +238,7 @@ void class::setup_##name() { \
debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %s) - action: %s", (char *)&params->seq1, (char *)&params->seq2, ACTION_NAME(savepoint.action));
#define IMPLEMENT_FUNCTION_SSI(index, class, name, paramType3) \
void class::setup_##name(const char* seq1, const char* seq2, paramType3 param7) { \
void class::setup_##name(const char *seq1, const char *seq2, paramType3 param7) { \
BEGIN_SETUP(class, name, index, EntityData::EntityParametersSSII) \
EntityData::EntityParametersSSII *params = (EntityData::EntityParametersSSII*)_data->getCurrentParameters(); \
strncpy((char *)&params->seq1, seq1, 12); \
@ -251,7 +251,7 @@ void class::setup_##name() { \
debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %s, %d) - action: %s", (char *)&params->seq1, (char *)&params->seq2, params->param7, ACTION_NAME(savepoint.action));
#define IMPLEMENT_FUNCTION_IS(index, class, name, paramType) \
void class::setup_##name(paramType param1, const char* seq) { \
void class::setup_##name(paramType param1, const char *seq) { \
BEGIN_SETUP(class, name, index, EntityData::EntityParametersISII) \
EntityData::EntityParametersISII *params = (EntityData::EntityParametersISII*)_data->getCurrentParameters(); \
params->param1 = (unsigned int)param1; \
@ -263,7 +263,7 @@ void class::setup_##name() { \
debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %s) - action: %s", params->param1, (char *)&params->seq, ACTION_NAME(savepoint.action));
#define IMPLEMENT_FUNCTION_ISS(index, class, name, paramType) \
void class::setup_##name(paramType param1, const char* seq1, const char* seq2) { \
void class::setup_##name(paramType param1, const char *seq1, const char *seq2) { \
BEGIN_SETUP(class, name, index, EntityData::EntityParametersISSI) \
EntityData::EntityParametersISSI *params = (EntityData::EntityParametersISSI*)_data->getCurrentParameters(); \
params->param1 = param1; \
@ -276,7 +276,7 @@ void class::setup_##name() { \
debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %s, %s) - action: %s", params->param1, (char *)&params->seq1, (char *)&params->seq2, ACTION_NAME(savepoint.action));
#define IMPLEMENT_FUNCTION_IIS(index, class, name, paramType1, paramType2) \
void class::setup_##name(paramType1 param1, paramType2 param2, const char* seq) { \
void class::setup_##name(paramType1 param1, paramType2 param2, const char *seq) { \
BEGIN_SETUP(class, name, index, EntityData::EntityParametersIISI) \
EntityData::EntityParametersIISI *params = (EntityData::EntityParametersIISI*)_data->getCurrentParameters(); \
params->param1 = param1; \
@ -289,7 +289,7 @@ void class::setup_##name() { \
debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %d, %s) - action: %s", params->param1, params->param2, (char *)&params->seq, ACTION_NAME(savepoint.action));
#define IMPLEMENT_FUNCTION_IISS(index, class, name, paramType1, paramType2) \
void class::setup_##name(paramType1 param1, paramType2 param2, const char* seq1, const char* seq2) { \
void class::setup_##name(paramType1 param1, paramType2 param2, const char *seq1, const char *seq2) { \
BEGIN_SETUP(class, name, index, EntityData::EntityParametersIISS) \
EntityData::EntityParametersIISS *params = (EntityData::EntityParametersIISS*)_data->getCurrentParameters(); \
params->param1 = param1; \

2
engines/lastexpress/entities/francois.cpp
View File

@ -733,7 +733,7 @@ IMPLEMENT_FUNCTION(20, Francois, function20)
}
//////////////////////////////////////////////////////////////////////////
IMPLEMENT_FUNCTION(21 ,Francois, chapter2)
IMPLEMENT_FUNCTION(21, Francois, chapter2)
switch (savepoint.action) {
default:
break;

10
engines/lastexpress/entities/francois.h
View File

@ -55,7 +55,7 @@ public:
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Handles entering/exiting a compartment.
@ -63,7 +63,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Handles entering/exiting a compartment and updates position/play animation
@ -71,14 +71,14 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment2, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment2, const char *sequence, ObjectIndex compartment)
/**
* Plays sound
Plays sound
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Saves the game

4
engines/lastexpress/entities/hadija.h
View File

@ -49,14 +49,14 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Plays sound
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Updates parameter 2 using time value

4
engines/lastexpress/entities/ivo.h
View File

@ -48,7 +48,7 @@ public:
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Handles entering/exiting a compartment.
@ -56,7 +56,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Updates parameter 2 using time value

2
engines/lastexpress/entities/kahina.cpp
View File

@ -192,7 +192,7 @@ IMPLEMENT_FUNCTION_I(6, Kahina, function6, TimeValue)
}
//////////////////////////////////////////////////////////////////////////
IMPLEMENT_FUNCTION_II(7 ,Kahina, updateEntity2, CarIndex, EntityPosition)
IMPLEMENT_FUNCTION_II(7, Kahina, updateEntity2, CarIndex, EntityPosition)
switch (savepoint.action) {
default:
break;

4
engines/lastexpress/entities/kahina.h
View File

@ -48,7 +48,7 @@ public:
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Saves the game
@ -97,7 +97,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Setup Chapter 1

2
engines/lastexpress/entities/kronos.cpp
View File

@ -330,7 +330,7 @@ IMPLEMENT_FUNCTION(15, Kronos, function15)
}
//////////////////////////////////////////////////////////////////////////
IMPLEMENT_FUNCTION(16 ,Kronos, function16)
IMPLEMENT_FUNCTION(16, Kronos, function16)
switch (savepoint.action) {
default:
break;

8
engines/lastexpress/entities/mahmud.h
View File

@ -57,7 +57,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Handles entering/exiting a compartment.
@ -67,21 +67,21 @@ public:
* @param ticks The time ticks
* @param object The object for loading the scene
*/
DECLARE_FUNCTION_4(enterExitCompartment2, const char* sequence, ObjectIndex compartment, uint32 ticks, ObjectIndex object)
DECLARE_FUNCTION_4(enterExitCompartment2, const char *sequence, ObjectIndex compartment, uint32 ticks, ObjectIndex object)
/**
* Plays sound
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Plays sound
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSoundMertens, const char* filename)
DECLARE_FUNCTION_1(playSoundMertens, const char *filename)
/**
* Updates parameter 2 using time value

4
engines/lastexpress/entities/max.h
View File

@ -48,7 +48,7 @@ public:
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Draws the entity
@ -64,7 +64,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Saves the game

10
engines/lastexpress/entities/mertens.h
View File

@ -65,7 +65,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Handles entering/exiting a compartment and updates position/play animation
@ -73,7 +73,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment2, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment2, const char *sequence, ObjectIndex compartment)
/**
* Handles entering/exiting a compartment.
@ -85,7 +85,7 @@ public:
*
* @note We are not using the shared function due to too many differences
*/
DECLARE_FUNCTION_4(enterExitCompartment3, const char* sequence, ObjectIndex compartment, EntityPosition entityPosition1, EntityPosition entityPosition2)
DECLARE_FUNCTION_4(enterExitCompartment3, const char *sequence, ObjectIndex compartment, EntityPosition entityPosition1, EntityPosition entityPosition2)
/**
* Process callback action when the entity direction is not kDirectionRight
@ -97,14 +97,14 @@ public:
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Plays sound
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound16, const char* filename)
DECLARE_FUNCTION_1(playSound16, const char *filename)
/**
* Saves the game

10
engines/lastexpress/entities/milos.h
View File

@ -48,7 +48,7 @@ public:
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Handles entering/exiting a compartment.
@ -56,7 +56,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Handles entering/exiting a compartment and updates position/play animation
@ -64,7 +64,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment2, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment2, const char *sequence, ObjectIndex compartment)
/**
* Process callback action when the entity direction is not kDirectionRight
@ -76,14 +76,14 @@ public:
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Plays sound
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound16, const char* filename)
DECLARE_FUNCTION_1(playSound16, const char *filename)
/**
* Saves the game

8
engines/lastexpress/entities/mmeboutarel.h
View File

@ -48,14 +48,14 @@ public:
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Draws the entity
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Updates parameter 2 using time value
@ -70,7 +70,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Handles entering/exiting a compartment and updates position/play animation
@ -78,7 +78,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment2, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment2, const char *sequence, ObjectIndex compartment)
/**
* Updates the entity

4
engines/lastexpress/entities/pascale.h
View File

@ -43,7 +43,7 @@ public:
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Process callback action when somebody is standing in the restaurant or salon.
@ -77,7 +77,7 @@ public:
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Draws the entity along with another one

18
engines/lastexpress/entities/rebecca.h
View File

@ -55,14 +55,14 @@ public:
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Plays sound
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound16, const char* filename)
DECLARE_FUNCTION_1(playSound16, const char *filename)
/**
* Call a savepoint (or draw sequence in default case)
@ -72,14 +72,14 @@ public:
* @param action The action
* @param sequence2 The sequence name for the savepoint
*/
DECLARE_FUNCTION_4(callSavepoint, const char* sequence1, EntityIndex entity, ActionIndex action, const char* sequence2)
DECLARE_FUNCTION_4(callSavepoint, const char *sequence1, EntityIndex entity, ActionIndex action, const char *sequence2)
/**
* Draws the entity
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Handles entering/exiting a compartment.
@ -87,7 +87,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Handles entering/exiting a compartment and updates position/play animation
@ -95,7 +95,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment2, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment2, const char *sequence, ObjectIndex compartment)
/**
* Handles entering/exiting a compartment.
@ -103,7 +103,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment3, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment3, const char *sequence, ObjectIndex compartment)
/**
* Process callback action when the entity direction is not kDirectionRight
@ -131,7 +131,7 @@ public:
* @param car The car
* @param position The position
*/
DECLARE_FUNCTION_3(updatePosition, const char* sequence1, CarIndex car, Position position)
DECLARE_FUNCTION_3(updatePosition, const char *sequence1, CarIndex car, Position position)
/**
* Draws the entity along with another one
@ -140,7 +140,7 @@ public:
* @param sequence2 The sequence to draw for the second entity
* @param entity The EntityIndex of the second entity
*/
DECLARE_FUNCTION_3(draw2, const char* sequence1, const char* sequence2, EntityIndex entity)
DECLARE_FUNCTION_3(draw2, const char *sequence1, const char *sequence2, EntityIndex entity)
DECLARE_FUNCTION(function15)
DECLARE_FUNCTION_1(function16, bool)

2
engines/lastexpress/entities/salko.h
View File

@ -49,7 +49,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Draws the entity

4
engines/lastexpress/entities/servers0.cpp
View File

@ -950,7 +950,7 @@ IMPLEMENT_NULL_FUNCTION(38, Servers0)
//////////////////////////////////////////////////////////////////////////
// Private functions
//////////////////////////////////////////////////////////////////////////
void Servers0::handleServer(const SavePoint &savepoint, const char* name, EntityIndex entity, ActionIndex action, uint *parameter, const char* name2) {
void Servers0::handleServer(const SavePoint &savepoint, const char *name, EntityIndex entity, ActionIndex action, uint *parameter, const char *name2) {
switch (savepoint.action) {
default:
break;
@ -981,7 +981,7 @@ void Servers0::handleServer(const SavePoint &savepoint, const char* name, Entity
}
//////////////////////////////////////////////////////////////////////////
void Servers0::serveTable(const SavePoint &savepoint, const char* seq1, EntityIndex entity, const char* seq2, const char* seq3, const char* seq4, uint *parameter, bool shouldUpdatePosition, bool pushSavepoint, Position position) {
void Servers0::serveTable(const SavePoint &savepoint, const char *seq1, EntityIndex entity, const char *seq2, const char *seq3, const char *seq4, uint *parameter, bool shouldUpdatePosition, bool pushSavepoint, Position position) {
switch (savepoint.action) {
default:
break;

12
engines/lastexpress/entities/servers0.h
View File

@ -46,7 +46,7 @@ public:
* @param action The action
* @param sequence2 The sequence name for the savepoint
*/
DECLARE_FUNCTION_4(callSavepoint, const char* sequence1, EntityIndex entity, ActionIndex action, const char* sequence2)
DECLARE_FUNCTION_4(callSavepoint, const char *sequence1, EntityIndex entity, ActionIndex action, const char *sequence2)
/**
* Updates parameter 2 using time value
@ -61,7 +61,7 @@ public:
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Updates the position
@ -70,7 +70,7 @@ public:
* @param car The car
* @param position The position
*/
DECLARE_FUNCTION_3(updatePosition, const char* sequence1, CarIndex car, Position position)
DECLARE_FUNCTION_3(updatePosition, const char *sequence1, CarIndex car, Position position)
/**
* Process callback action when the entity direction is not kDirectionRight
@ -82,7 +82,7 @@ public:
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
DECLARE_FUNCTION(function7)
DECLARE_FUNCTION(function8)
@ -163,8 +163,8 @@ public:
DECLARE_NULL_FUNCTION()
private:
void handleServer(const SavePoint &savepoint, const char* name, EntityIndex entity, ActionIndex action, uint *parameter, const char* name2 = "");
void serveTable(const SavePoint &savepoint, const char* seq1, EntityIndex entity, const char* seq2, const char* seq3, const char* seq4, uint *parameter, bool shouldUpdatePosition = true, bool pushSavepoint = false, Position position = 0);
void handleServer(const SavePoint &savepoint, const char *name, EntityIndex entity, ActionIndex action, uint *parameter, const char *name2 = "");
void serveTable(const SavePoint &savepoint, const char *seq1, EntityIndex entity, const char *seq2, const char *seq3, const char *seq4, uint *parameter, bool shouldUpdatePosition = true, bool pushSavepoint = false, Position position = 0);
};
} // End of namespace LastExpress

4
engines/lastexpress/entities/servers1.cpp
View File

@ -661,7 +661,7 @@ IMPLEMENT_NULL_FUNCTION(32, Servers1)
//////////////////////////////////////////////////////////////////////////
// Private functions
//////////////////////////////////////////////////////////////////////////
void Servers1::serveTable(const SavePoint &savepoint, const char* seq1, EntityIndex entity, const char* seq2, const char* seq3, const char* seq4, uint *parameter, Position position, bool shouldUpdatePosition, uint* parameter2) {
void Servers1::serveTable(const SavePoint &savepoint, const char *seq1, EntityIndex entity, const char *seq2, const char *seq3, const char *seq4, uint *parameter, Position position, bool shouldUpdatePosition, uint *parameter2) {
switch (savepoint.action) {
default:
break;
@ -715,7 +715,7 @@ void Servers1::serveTable(const SavePoint &savepoint, const char* seq1, EntityIn
}
//////////////////////////////////////////////////////////////////////////
void Servers1::serveSalon(const SavePoint &savepoint, const char* seq1, const char* snd1, EntityIndex entity, const char* snd2, const char* seq2, ActionIndex action, const char* seq3, uint *parameter) {
void Servers1::serveSalon(const SavePoint &savepoint, const char *seq1, const char *snd1, EntityIndex entity, const char *snd2, const char *seq2, ActionIndex action, const char *seq3, uint *parameter) {
switch (savepoint.action) {
default:
break;

10
engines/lastexpress/entities/servers1.h
View File

@ -51,7 +51,7 @@ public:
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Updates the position
@ -75,14 +75,14 @@ public:
* @param action The action
* @param sequence2 The sequence name for the savepoint
*/
DECLARE_FUNCTION_4(callSavepoint, const char* sequence1, EntityIndex entity, ActionIndex action, const char* sequence2)
DECLARE_FUNCTION_4(callSavepoint, const char *sequence1, EntityIndex entity, ActionIndex action, const char *sequence2)
/**
* Plays sound
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
DECLARE_FUNCTION(function7)
@ -158,8 +158,8 @@ public:
DECLARE_NULL_FUNCTION()
private:
void serveTable(const SavePoint &savepoint, const char* seq1, EntityIndex entity, const char* seq2, const char* seq3, const char* seq4, uint *parameter, Position position = 0, bool updatePosition = true, uint *parameter2 = NULL);
void serveSalon(const SavePoint &savepoint, const char* seq1, const char* snd1, EntityIndex entity, const char* snd2, const char* seq2, ActionIndex action, const char* seq3, uint *parameter);
void serveTable(const SavePoint &savepoint, const char *seq1, EntityIndex entity, const char *seq2, const char *seq3, const char *seq4, uint *parameter, Position position = 0, bool updatePosition = true, uint *parameter2 = NULL);
void serveSalon(const SavePoint &savepoint, const char *seq1, const char *snd1, EntityIndex entity, const char *snd2, const char *seq2, ActionIndex action, const char *seq3, uint *parameter);
};
} // End of namespace LastExpress

12
engines/lastexpress/entities/tatiana.h
View File

@ -48,14 +48,14 @@ public:
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Draws the entity
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Updates the position
@ -64,7 +64,7 @@ public:
* @param car The car
* @param position The position
*/
DECLARE_FUNCTION_3(updatePosition, const char* sequence1, CarIndex car, Position position)
DECLARE_FUNCTION_3(updatePosition, const char *sequence1, CarIndex car, Position position)
/**
* Handles entering/exiting a compartment.
@ -72,7 +72,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Handles entering/exiting a compartment and updates position/play animation
@ -80,7 +80,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment2, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment2, const char *sequence, ObjectIndex compartment)
/**
* Call a savepoint (or draw sequence in default case)
@ -90,7 +90,7 @@ public:
* @param action The action
* @param sequence2 The sequence name for the savepoint
*/
DECLARE_FUNCTION_4(callSavepoint, const char* sequence1, EntityIndex entity, ActionIndex action, const char* sequence2)
DECLARE_FUNCTION_4(callSavepoint, const char *sequence1, EntityIndex entity, ActionIndex action, const char *sequence2)
/**
* Process callback action when the entity direction is not kDirectionRight

2
engines/lastexpress/entities/vassili.h
View File

@ -48,7 +48,7 @@ public:
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Saves the game

6
engines/lastexpress/entities/verges.h
View File

@ -48,7 +48,7 @@ public:
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Process callback action when the entity direction is not kDirectionRight
@ -60,7 +60,7 @@ public:
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Plays sound
@ -174,7 +174,7 @@ public:
DECLARE_FUNCTION(function42)
private:
void talk(const SavePoint &savepoint, const char* sound1, const char* sound2);
void talk(const SavePoint &savepoint, const char *sound1, const char *sound2);
};
} // End of namespace LastExpress

6
engines/lastexpress/entities/vesna.h
View File

@ -48,7 +48,7 @@ public:
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Handles entering/exiting a compartment.
@ -56,7 +56,7 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
@ -64,7 +64,7 @@ public:
*
* @param sequence The sequence to draw
*/
DECLARE_FUNCTION_1(draw, const char* sequence)
DECLARE_FUNCTION_1(draw, const char *sequence)
/**
* Updates the entity

4
engines/lastexpress/entities/yasmin.h
View File

@ -49,14 +49,14 @@ public:
* @param sequence The sequence to draw
* @param compartment The compartment
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char* sequence, ObjectIndex compartment)
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
/**
* Plays sound
*
* @param filename The sound filename
*/
DECLARE_FUNCTION_1(playSound, const char* filename)
DECLARE_FUNCTION_1(playSound, const char *filename)
/**
* Updates parameter 2 using time value

4
engines/lastexpress/game/action.cpp
View File

@ -637,7 +637,7 @@ IMPLEMENT_ACTION(setItemLocation)
if (item >= kPortraitOriginal)
return kSceneInvalid;
Inventory::InventoryEntry* entry = getInventory()->get(item);
Inventory::InventoryEntry *entry = getInventory()->get(item);
if (entry->isPresent)
return kSceneInvalid;
@ -675,7 +675,7 @@ IMPLEMENT_ACTION(pickItem)
if (item >= kPortraitOriginal)
return kSceneInvalid;
Inventory::InventoryEntry* entry = getInventory()->get(item);
Inventory::InventoryEntry *entry = getInventory()->get(item);
if (!entry->location)
return kSceneInvalid;

2
engines/lastexpress/game/action.h
View File

@ -67,7 +67,7 @@ public:
private:
typedef Common::Functor1<const SceneHotspot &, SceneIndex> ActionFunctor;
LastExpressEngine* _engine;
LastExpressEngine *_engine;
Common::Array<ActionFunctor *> _actions;
// Each action is of the form action_<name>(SceneHotspot *hotspot)

4
engines/lastexpress/game/beetle.h
View File

@ -68,7 +68,7 @@ private:
uint32 indexes[16];
uint32 offset;
SequenceFrame* frame;
SequenceFrame *frame;
bool isLoaded;
uint32 field_D5;
uint32 field_D9;
@ -103,7 +103,7 @@ private:
}
};
LastExpressEngine* _engine;
LastExpressEngine *_engine;
BeetleData *_data;

8
engines/lastexpress/game/entities.cpp
View File

@ -1280,11 +1280,11 @@ void Entities::copySequenceData(EntityIndex entityIndex) const {
//////////////////////////////////////////////////////////////////////////
// Drawing
//////////////////////////////////////////////////////////////////////////
void Entities::drawSequenceLeft(EntityIndex index, const char* sequence) const {
void Entities::drawSequenceLeft(EntityIndex index, const char *sequence) const {
drawSequence(index, sequence, kDirectionLeft);
}
void Entities::drawSequenceRight(EntityIndex index, const char* sequence) const {
void Entities::drawSequenceRight(EntityIndex index, const char *sequence) const {
drawSequence(index, sequence, kDirectionRight);
}
@ -1315,7 +1315,7 @@ void Entities::clearSequences(EntityIndex entityIndex) const {
data->doProcessEntity = true;
}
void Entities::drawSequence(EntityIndex index, const char* sequence, EntityDirection direction) const {
void Entities::drawSequence(EntityIndex index, const char *sequence, EntityDirection direction) const {
debugC(8, kLastExpressDebugLogic, "Drawing sequence %s for entity %s with direction %s", sequence, ENTITY_NAME(index), DIRECTION_NAME(direction));
// Copy sequence name
@ -2329,7 +2329,7 @@ label_process_entity:
return true;
}
bool Entities::changeCar(EntityData::EntityCallData * data, EntityIndex entity, CarIndex car, EntityPosition position, bool increment, EntityPosition newPosition, CarIndex newCar) const {
bool Entities::changeCar(EntityData::EntityCallData *data, EntityIndex entity, CarIndex car, EntityPosition position, bool increment, EntityPosition newPosition, CarIndex newCar) const {
if (getData(kEntityPlayer)->car == data->car) {
getSound()->playSoundEvent(entity, 36);
getSound()->playSoundEvent(entity, 37, 30);

10
engines/lastexpress/game/entities.h
View File

@ -86,8 +86,8 @@ public:
void exitCompartment(EntityIndex entity, ObjectIndex compartment, bool useCompartment1 = false);
// Sequences
void drawSequenceLeft(EntityIndex index, const char* sequence) const;
void drawSequenceRight(EntityIndex index, const char* sequence) const;
void drawSequenceLeft(EntityIndex index, const char *sequence) const;
void drawSequenceRight(EntityIndex index, const char *sequence) const;
void clearSequences(EntityIndex index) const;
bool updateEntity(EntityIndex entity, CarIndex car, EntityPosition position);
@ -347,11 +347,11 @@ private:
void executeCallbacks();
void processEntity(EntityIndex entity);
void drawSequence(EntityIndex entity, const char* sequence, EntityDirection direction) const;
void drawSequence(EntityIndex entity, const char *sequence, EntityDirection direction) const;
void drawSequences(EntityIndex entity, EntityDirection direction, bool loadSequence) const;
void loadSequence2(EntityIndex entity, Common::String sequenceName, Common::String sequenceName2, byte field30, bool loadSequence) const;
void clearEntitySequenceData(EntityData::EntityCallData * data, EntityDirection direction) const;
void clearEntitySequenceData(EntityData::EntityCallData *data, EntityDirection direction) const;
void computeCurrentFrame(EntityIndex entity) const;
int16 getCurrentFrame(EntityIndex entity, Sequence *sequence, EntityPosition position, bool doProcessing) const;
void processFrame(EntityIndex entity, bool keepPreviousFrame, bool dontPlaySound);
@ -359,7 +359,7 @@ private:
void updateEntityPosition(EntityIndex entity) const;
void copySequenceData(EntityIndex entity) const;
bool changeCar(EntityData::EntityCallData * data, EntityIndex entity, CarIndex car, EntityPosition position, bool increment, EntityPosition newPosition, CarIndex newCar) const;
bool changeCar(EntityData::EntityCallData *data, EntityIndex entity, CarIndex car, EntityPosition position, bool increment, EntityPosition newPosition, CarIndex newCar) const;
void getSequenceName(EntityIndex entity, EntityDirection direction, Common::String &sequence1, Common::String &sequence2) const;

4
engines/lastexpress/game/fight.h
View File

@ -118,7 +118,7 @@ private:
Common::Functor2<Fighter *, FightAction, void> *handleAction;
Common::Functor1<Fighter *, void> *update;
Common::Functor2<Fighter const *, FightAction, bool> *canInteract;
Fighter* opponent;
Fighter *opponent;
Common::Array<Sequence *> sequences;
uint32 sequenceIndex;
Sequence *sequence;
@ -186,7 +186,7 @@ private:
}
};
LastExpressEngine* _engine;
LastExpressEngine *_engine;
FightData *_data;
FightEndType _endType;
int _state;

20
engines/lastexpress/game/menu.h
View File

@ -107,14 +107,14 @@ private:
LastExpressEngine *_engine;
// Sequences
Sequence* _seqTooltips;
Sequence* _seqEggButtons;
Sequence* _seqButtons;
Sequence* _seqAcorn;
Sequence* _seqCity1;
Sequence* _seqCity2;
Sequence* _seqCity3;
Sequence* _seqCredits;
Sequence *_seqTooltips;
Sequence *_seqEggButtons;
Sequence *_seqButtons;
Sequence *_seqAcorn;
Sequence *_seqCity1;
Sequence *_seqCity2;
Sequence *_seqCity3;
Sequence *_seqCredits;
GameId _gameId;
@ -153,11 +153,11 @@ private:
TrainLine *_trainLine;
struct MenuOverlays_EqualTo {
bool operator()(const StartMenuOverlay& x, const StartMenuOverlay& y) const { return x == y; }
bool operator()(const StartMenuOverlay &x, const StartMenuOverlay &y) const { return x == y; }
};
struct MenuOverlays_Hash {
uint operator()(const StartMenuOverlay& x) const { return x; }
uint operator()(const StartMenuOverlay &x) const { return x; }
};
typedef Common::HashMap<StartMenuOverlay, SequenceFrame *, MenuOverlays_Hash, MenuOverlays_EqualTo> MenuFrames;

2
engines/lastexpress/game/object.h
View File

@ -73,7 +73,7 @@ public:
Common::String toString();
private:
LastExpressEngine* _engine;
LastExpressEngine *_engine;
Object _objects[kObjectMax];
};

2
engines/lastexpress/game/savegame.cpp
View File

@ -131,7 +131,7 @@ bool SaveLoad::isSavegameValid(GameId id) {
//////////////////////////////////////////////////////////////////////////
// Headers
//////////////////////////////////////////////////////////////////////////
bool SaveLoad::loadMainHeader(GameId id, SavegameMainHeader* header) {
bool SaveLoad::loadMainHeader(GameId id, SavegameMainHeader *header) {
// Read first 32 bytes of savegame
Common::InSaveFile *save = openForLoading(id);
if (!save) {

4
engines/lastexpress/game/savegame.h
View File

@ -148,7 +148,7 @@ public:
static Common::OutSaveFile *openForSaving(GameId id);
// Headers
static bool loadMainHeader(GameId id, SavegameMainHeader* header);
static bool loadMainHeader(GameId id, SavegameMainHeader *header);
SavegameEntryHeader *getEntry(uint32 index);
void clearEntries();
@ -162,7 +162,7 @@ private:
static Common::String getSavegameName(GameId id);
static void loadEntryHeader(Common::InSaveFile *save, SavegameEntryHeader* header);
static void loadEntryHeader(Common::InSaveFile *save, SavegameEntryHeader *header);
static bool validateMainHeader(const SavegameMainHeader &header);
static bool validateEntryHeader(const SavegameEntryHeader &header);

4
engines/lastexpress/game/savepoint.cpp
View File

@ -61,7 +61,7 @@ void SavePoints::push(EntityIndex entity2, EntityIndex entity1, ActionIndex acti
_savepoints.push_back(point);
}
void SavePoints::push(EntityIndex entity2, EntityIndex entity1, ActionIndex action, const char* param) {
void SavePoints::push(EntityIndex entity2, EntityIndex entity1, ActionIndex action, const char *param) {
if (_savepoints.size() >= _savePointsMaxSize)
return;
@ -129,7 +129,7 @@ void SavePoints::addData(EntityIndex entity, ActionIndex action, uint32 param) {
//////////////////////////////////////////////////////////////////////////
// Callbacks
//////////////////////////////////////////////////////////////////////////
void SavePoints::setCallback(EntityIndex index, Entity::Callback* callback) {
void SavePoints::setCallback(EntityIndex index, Entity::Callback *callback) {
if (index >= 40)
error("SavePoints::setCallback - attempting to use an invalid entity index. Valid values 0-39, was %d", index);

6
engines/lastexpress/game/savepoint.h
View File

@ -106,7 +106,7 @@ public:
// Savepoints
void push(EntityIndex entity2, EntityIndex entity1, ActionIndex action, uint32 param = 0);
void push(EntityIndex entity2, EntityIndex entity1, ActionIndex action, const char* param);
void push(EntityIndex entity2, EntityIndex entity1, ActionIndex action, const char *param);
void pushAll(EntityIndex entity, ActionIndex action, uint32 param = 0);
void process();
void reset();
@ -115,7 +115,7 @@ public:
void addData(EntityIndex entity, ActionIndex action, uint32 param);
// Callbacks
void setCallback(EntityIndex index, Entity::Callback* callback);
void setCallback(EntityIndex index, Entity::Callback *callback);
Callback *getCallback(EntityIndex entity) const;
void call(EntityIndex entity2, EntityIndex entity1, ActionIndex action, uint32 param = 0) const;
void call(EntityIndex entity2, EntityIndex entity1, ActionIndex action, const char *param) const;
@ -138,7 +138,7 @@ private:
Common::List<SavePoint> _savepoints; ///< could be a queue, but we need to be able to iterate on the items
Common::Array<SavePointData> _data;
Callback* _callbacks[40];
Callback *_callbacks[40];
SavePoint pop();
bool updateEntityFromData(const SavePoint &point);

6
engines/lastexpress/game/sound.cpp
View File

@ -337,7 +337,7 @@ void SoundManager::loadSoundData(SoundEntry *entry, Common::String name) {
}
}
void SoundManager::resetEntry(SoundEntry * entry) const {
void SoundManager::resetEntry(SoundEntry *entry) const {
entry->status.status |= kSoundStatusRemoved;
entry->entity = kEntityPlayer;
@ -517,7 +517,7 @@ void SoundManager::playSound(EntityIndex entity, Common::String filename, FlagTy
}
SoundManager::SoundType SoundManager::playSoundWithSubtitles(Common::String filename, FlagType flag, EntityIndex entity, byte a4) {
SoundEntry* entry = new SoundEntry();
SoundEntry *entry = new SoundEntry();
setupEntry(entry, filename, flag, 30);
entry->entity = entity;
@ -1051,7 +1051,7 @@ void SoundManager::readText(int id){
error("Sound::readText - attempting to use invalid id. Valid values [1;8] - [50;64], was %d", id);
// Get proper message file (names are stored in sequence in the array but id is [1;8] - [50;64])
const char* text = messages[id <= 8 ? id : id - 41];
const char *text = messages[id <= 8 ? id : id - 41];
// Check if file is in cache for id [1;8]
if (id <= 8)

4
engines/lastexpress/game/sound.h
View File

@ -197,7 +197,7 @@ public:
void saveLoadWithSerializer(Common::Serializer &ser);
private:
typedef int32* SoundBuffer;
typedef int32 *SoundBuffer;
enum SoundStatus {
kSoundStatus_20 = 0x20,
@ -277,7 +277,7 @@ private:
};
// Engine
LastExpressEngine* _engine;
LastExpressEngine *_engine;
// State flag
int _state;