aboutsummaryrefslogtreecommitdiff
path: root/engines/lastexpress/game
diff options
context:
space:
mode:
Diffstat (limited to 'engines/lastexpress/game')
-rw-r--r--engines/lastexpress/game/action.cpp4
-rw-r--r--engines/lastexpress/game/action.h2
-rw-r--r--engines/lastexpress/game/beetle.h4
-rw-r--r--engines/lastexpress/game/entities.cpp8
-rw-r--r--engines/lastexpress/game/entities.h10
-rw-r--r--engines/lastexpress/game/fight.h4
-rw-r--r--engines/lastexpress/game/menu.h20
-rw-r--r--engines/lastexpress/game/object.h2
-rw-r--r--engines/lastexpress/game/savegame.cpp2
-rw-r--r--engines/lastexpress/game/savegame.h4
-rw-r--r--engines/lastexpress/game/savepoint.cpp4
-rw-r--r--engines/lastexpress/game/savepoint.h6
-rw-r--r--engines/lastexpress/game/sound.cpp6
-rw-r--r--engines/lastexpress/game/sound.h4
14 files changed, 40 insertions, 40 deletions
diff --git a/engines/lastexpress/game/action.cpp b/engines/lastexpress/game/action.cpp
index b90ee40c6a..0c478ed9b4 100644
--- a/engines/lastexpress/game/action.cpp
+++ b/engines/lastexpress/game/action.cpp
@@ -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;
diff --git a/engines/lastexpress/game/action.h b/engines/lastexpress/game/action.h
index d8f81abfde..6a2e3eb597 100644
--- a/engines/lastexpress/game/action.h
+++ b/engines/lastexpress/game/action.h
@@ -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)
diff --git a/engines/lastexpress/game/beetle.h b/engines/lastexpress/game/beetle.h
index ece5866b85..3341e92270 100644
--- a/engines/lastexpress/game/beetle.h
+++ b/engines/lastexpress/game/beetle.h
@@ -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;
diff --git a/engines/lastexpress/game/entities.cpp b/engines/lastexpress/game/entities.cpp
index 0ef5b1b740..9d5315671a 100644
--- a/engines/lastexpress/game/entities.cpp
+++ b/engines/lastexpress/game/entities.cpp
@@ -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);
diff --git a/engines/lastexpress/game/entities.h b/engines/lastexpress/game/entities.h
index 40d7025b85..980e26a6e8 100644
--- a/engines/lastexpress/game/entities.h
+++ b/engines/lastexpress/game/entities.h
@@ -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;
diff --git a/engines/lastexpress/game/fight.h b/engines/lastexpress/game/fight.h
index 32d734d57c..4484017184 100644
--- a/engines/lastexpress/game/fight.h
+++ b/engines/lastexpress/game/fight.h
@@ -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;
diff --git a/engines/lastexpress/game/menu.h b/engines/lastexpress/game/menu.h
index 54d1eb65ec..006aecc5ef 100644
--- a/engines/lastexpress/game/menu.h
+++ b/engines/lastexpress/game/menu.h
@@ -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;
diff --git a/engines/lastexpress/game/object.h b/engines/lastexpress/game/object.h
index 3417e9bfcf..70eb69446e 100644
--- a/engines/lastexpress/game/object.h
+++ b/engines/lastexpress/game/object.h
@@ -73,7 +73,7 @@ public:
Common::String toString();
private:
- LastExpressEngine* _engine;
+ LastExpressEngine *_engine;
Object _objects[kObjectMax];
};
diff --git a/engines/lastexpress/game/savegame.cpp b/engines/lastexpress/game/savegame.cpp
index 1bd3d8239b..6ba54fbe45 100644
--- a/engines/lastexpress/game/savegame.cpp
+++ b/engines/lastexpress/game/savegame.cpp
@@ -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) {
diff --git a/engines/lastexpress/game/savegame.h b/engines/lastexpress/game/savegame.h
index 739e6a1798..a5af760846 100644
--- a/engines/lastexpress/game/savegame.h
+++ b/engines/lastexpress/game/savegame.h
@@ -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);
diff --git a/engines/lastexpress/game/savepoint.cpp b/engines/lastexpress/game/savepoint.cpp
index e7bae494ed..9a93c975ba 100644
--- a/engines/lastexpress/game/savepoint.cpp
+++ b/engines/lastexpress/game/savepoint.cpp
@@ -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);
diff --git a/engines/lastexpress/game/savepoint.h b/engines/lastexpress/game/savepoint.h
index da1c9b8ed1..83fe2a6517 100644
--- a/engines/lastexpress/game/savepoint.h
+++ b/engines/lastexpress/game/savepoint.h
@@ -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);
diff --git a/engines/lastexpress/game/sound.cpp b/engines/lastexpress/game/sound.cpp
index c8d8809bc3..f082c5f636 100644
--- a/engines/lastexpress/game/sound.cpp
+++ b/engines/lastexpress/game/sound.cpp
@@ -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)
diff --git a/engines/lastexpress/game/sound.h b/engines/lastexpress/game/sound.h
index 3f3941f207..85dfcc2e66 100644
--- a/engines/lastexpress/game/sound.h
+++ b/engines/lastexpress/game/sound.h
@@ -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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-22 02:03:24 +0000