aboutsummaryrefslogtreecommitdiff
path: root/engines/pegasus/ai
diff options
context:
space:
mode:
Diffstat (limited to 'engines/pegasus/ai')
-rwxr-xr-xengines/pegasus/ai/ai_action.cpp2
-rwxr-xr-xengines/pegasus/ai/ai_action.h4
-rwxr-xr-xengines/pegasus/ai/ai_area.cpp12
-rwxr-xr-xengines/pegasus/ai/ai_area.h18
-rwxr-xr-xengines/pegasus/ai/ai_condition.cpp30
-rwxr-xr-xengines/pegasus/ai/ai_condition.h40
6 files changed, 53 insertions, 53 deletions
diff --git a/engines/pegasus/ai/ai_action.cpp b/engines/pegasus/ai/ai_action.cpp
index 36367eb1d6..38d639038f 100755
--- a/engines/pegasus/ai/ai_action.cpp
+++ b/engines/pegasus/ai/ai_action.cpp
@@ -38,7 +38,7 @@ void AICompoundAction::performAIAction(AIRule *rule) {
(*it)->performAIAction(rule);
}
-AIPlayMessageAction::AIPlayMessageAction(const Common::String &movieName, bool keepLastFrame, const tInputBits interruptionFilter) {
+AIPlayMessageAction::AIPlayMessageAction(const Common::String &movieName, bool keepLastFrame, const InputBits interruptionFilter) {
_movieName = movieName;
_keepLastFrame = keepLastFrame;
_interruptionFilter = interruptionFilter;
diff --git a/engines/pegasus/ai/ai_action.h b/engines/pegasus/ai/ai_action.h
index 09a1d13699..9ac30782a9 100755
--- a/engines/pegasus/ai/ai_action.h
+++ b/engines/pegasus/ai/ai_action.h
@@ -79,13 +79,13 @@ protected:
class AIPlayMessageAction : public AIAction {
public:
- AIPlayMessageAction(const Common::String &movieName, bool keepLastFrame, const tInputBits = kWarningInterruption);
+ AIPlayMessageAction(const Common::String &movieName, bool keepLastFrame, const InputBits = kWarningInterruption);
virtual void performAIAction(AIRule *);
protected:
Common::String _movieName;
- tInputBits _interruptionFilter;
+ InputBits _interruptionFilter;
bool _keepLastFrame;
};
diff --git a/engines/pegasus/ai/ai_area.cpp b/engines/pegasus/ai/ai_area.cpp
index 923df41cf1..6203843087 100755
--- a/engines/pegasus/ai/ai_area.cpp
+++ b/engines/pegasus/ai/ai_area.cpp
@@ -135,7 +135,7 @@ void AIArea::setAIVolume(const uint16 volume) {
// If this function is called while a sequence is playing, it will just "remember"
// the time value, so that when the sequence finishes, the new time is asserted.
-void AIArea::setAIAreaToTime(const tLowerClientSignature client, const tLowerAreaSignature area, const TimeValue time) {
+void AIArea::setAIAreaToTime(const LowerClientSignature client, const LowerAreaSignature area, const TimeValue time) {
switch (area) {
case kLeftAreaSignature:
// Only support kInventorySignature client, since AI never calls SetAIAreaToTime.
@@ -199,7 +199,7 @@ void AIArea::setAIAreaToTime(const tLowerClientSignature client, const tLowerAre
// kBiochipSignature kRightAreaSignature
// kInventorySignature kMiddleAreaSignature
-void AIArea::playAIAreaSequence(const tLowerClientSignature, const tLowerAreaSignature area, const TimeValue start, const TimeValue stop) {
+void AIArea::playAIAreaSequence(const LowerClientSignature, const LowerAreaSignature area, const TimeValue start, const TimeValue stop) {
PegasusEngine *vm = (PegasusEngine *)g_engine;
lockAIOut();
@@ -260,7 +260,7 @@ void AIArea::playAIAreaSequence(const tLowerClientSignature, const tLowerAreaSig
unlockAI();
}
-bool AIArea::playAIMovie(const tLowerAreaSignature area, const Common::String &movieName, bool keepLastFrame, const tInputBits interruptFilter) {
+bool AIArea::playAIMovie(const LowerAreaSignature area, const Common::String &movieName, bool keepLastFrame, const InputBits interruptFilter) {
PegasusEngine *vm = (PegasusEngine *)g_engine;
lockAIOut();
@@ -337,7 +337,7 @@ bool AIArea::playAIMovie(const tLowerAreaSignature area, const Common::String &m
}
// Only implemented for kMiddleAreaSignature, kInventorySignature
-void AIArea::loopAIAreaSequence(const tLowerClientSignature owner, const tLowerAreaSignature area, const TimeValue start, const TimeValue stop) {
+void AIArea::loopAIAreaSequence(const LowerClientSignature owner, const LowerAreaSignature area, const TimeValue start, const TimeValue stop) {
if (area == kMiddleAreaSignature && owner == kInventorySignature && owner == _middleAreaOwner) {
_middleAreaMovie.stop();
_middleAreaMovie.setFlags(0);
@@ -361,7 +361,7 @@ void AIArea::setLeftMovieTime(const TimeValue time) {
_leftInventoryTime = time;
}
-void AIArea::setMiddleMovieTime(const tLowerClientSignature client, const TimeValue time) {
+void AIArea::setMiddleMovieTime(const LowerClientSignature client, const TimeValue time) {
if (client == kInventorySignature) {
_middleInventoryTime = time;
if (_middleAreaOwner == kBiochipSignature) {
@@ -594,7 +594,7 @@ void AIArea::getSmallInfoSegment(TimeValue &start, TimeValue &stop) {
}
}
-tLowerClientSignature AIArea::getMiddleAreaOwner() {
+LowerClientSignature AIArea::getMiddleAreaOwner() {
return _middleAreaOwner;
}
diff --git a/engines/pegasus/ai/ai_area.h b/engines/pegasus/ai/ai_area.h
index 7387b4081b..10bfc933a1 100755
--- a/engines/pegasus/ai/ai_area.h
+++ b/engines/pegasus/ai/ai_area.h
@@ -108,18 +108,18 @@ public:
// kAISignature kLeftAreaSignature
// Further, the kAISignature never sets a static frame time in the left area,
// but only plays a sequence from the AI movie.
- void setAIAreaToTime(const tLowerClientSignature, const tLowerAreaSignature, const TimeValue);
+ void setAIAreaToTime(const LowerClientSignature, const LowerAreaSignature, const TimeValue);
// The "Play" functions play the requested sequence synchronously.
- void playAIAreaSequence(const tLowerClientSignature, const tLowerAreaSignature, const TimeValue, const TimeValue);
+ void playAIAreaSequence(const LowerClientSignature, const LowerAreaSignature, const TimeValue, const TimeValue);
// For PlayAIMovie, it is assumed that the client is the AI itself.
// This is used to play AI messages as well as Optical Memory video.
// Returns true if the movie played all the way through, false if it was interrupted.
- bool playAIMovie(const tLowerAreaSignature, const Common::String &movieName, bool keepLastFrame, const tInputBits);
+ bool playAIMovie(const LowerAreaSignature, const Common::String &movieName, bool keepLastFrame, const InputBits);
// Loop the requested sequence indefinitely.
- void loopAIAreaSequence(const tLowerClientSignature, const tLowerAreaSignature, const TimeValue, const TimeValue);
+ void loopAIAreaSequence(const LowerClientSignature, const LowerAreaSignature, const TimeValue, const TimeValue);
void addAIRule(AIRule *);
@@ -133,7 +133,7 @@ public:
void checkMiddleArea();
void checkRules();
- tLowerClientSignature getMiddleAreaOwner();
+ LowerClientSignature getMiddleAreaOwner();
void toggleMiddleAreaOwner();
TimeValue getBigInfoTime();
@@ -143,7 +143,7 @@ protected:
void useIdleTime();
void setLeftMovieTime(const TimeValue);
- void setMiddleMovieTime(const tLowerClientSignature, const TimeValue);
+ void setMiddleMovieTime(const LowerClientSignature, const TimeValue);
void setRightMovieTime(const TimeValue);
Movie _leftAreaMovie;
@@ -151,9 +151,9 @@ protected:
Movie _rightAreaMovie;
Movie _AIMovie;
- tLowerClientSignature _leftAreaOwner;
- tLowerClientSignature _middleAreaOwner;
- tLowerClientSignature _rightAreaOwner;
+ LowerClientSignature _leftAreaOwner;
+ LowerClientSignature _middleAreaOwner;
+ LowerClientSignature _rightAreaOwner;
TimeValue _leftInventoryTime;
TimeValue _middleInventoryTime;
diff --git a/engines/pegasus/ai/ai_condition.cpp b/engines/pegasus/ai/ai_condition.cpp
index 8b77d723c6..df6d3227e5 100755
--- a/engines/pegasus/ai/ai_condition.cpp
+++ b/engines/pegasus/ai/ai_condition.cpp
@@ -149,20 +149,20 @@ bool AITimerCondition::fireCondition() {
AILocationCondition::AILocationCondition(uint32 maxLocations) {
_numLocations = 0;
_maxLocations = maxLocations;
- _locations = new tRoomViewID[maxLocations];
+ _locations = new RoomViewID[maxLocations];
}
AILocationCondition::~AILocationCondition() {
delete[] _locations;
}
-void AILocationCondition::addLocation(const tRoomViewID location) {
+void AILocationCondition::addLocation(const RoomViewID location) {
if (_numLocations < _maxLocations)
_locations[_numLocations++] = location;
}
bool AILocationCondition::fireCondition() {
- tRoomViewID test = GameState.getCurrentRoomAndView(), *p;
+ RoomViewID test = GameState.getCurrentRoomAndView(), *p;
uint32 i;
for (i = 0, p = _locations; i < _numLocations; i++, p++) {
@@ -180,7 +180,7 @@ void AILocationCondition::writeAICondition(Common::WriteStream *stream) {
stream->writeUint32BE(_numLocations);
uint32 i;
- tRoomViewID *p;
+ RoomViewID *p;
for (i = 0, p = _locations; i < _numLocations; i++, p++)
stream->writeUint32BE(*p);
}
@@ -190,19 +190,19 @@ void AILocationCondition::readAICondition(Common::ReadStream *stream) {
if (_maxLocations != maxLocations) {
delete[] _locations;
- _locations = new tRoomViewID[maxLocations];
+ _locations = new RoomViewID[maxLocations];
_maxLocations = maxLocations;
}
_numLocations = stream->readUint32BE();
uint32 i;
- tRoomViewID *p;
+ RoomViewID *p;
for (i = 0, p = _locations; i < _numLocations; i++, p++)
*p = stream->readUint32BE();
}
-AIDoorOpenedCondition::AIDoorOpenedCondition(tRoomViewID doorLocation) {
+AIDoorOpenedCondition::AIDoorOpenedCondition(RoomViewID doorLocation) {
_doorLocation = doorLocation;
}
@@ -210,7 +210,7 @@ bool AIDoorOpenedCondition::fireCondition() {
return GameState.getCurrentRoomAndView() == _doorLocation && GameState.isCurrentDoorOpen();
}
-AIHasItemCondition::AIHasItemCondition(const tItemID item) {
+AIHasItemCondition::AIHasItemCondition(const ItemID item) {
_item = item;
}
@@ -218,7 +218,7 @@ bool AIHasItemCondition::fireCondition() {
return _item == kNoItemID || GameState.isTakenItemID(_item);
}
-AIDoesntHaveItemCondition::AIDoesntHaveItemCondition(const tItemID item) {
+AIDoesntHaveItemCondition::AIDoesntHaveItemCondition(const ItemID item) {
_item = item;
}
@@ -226,7 +226,7 @@ bool AIDoesntHaveItemCondition::fireCondition() {
return _item == kNoItemID || !GameState.isTakenItemID(_item);
}
-AICurrentItemCondition::AICurrentItemCondition(const tItemID item) {
+AICurrentItemCondition::AICurrentItemCondition(const ItemID item) {
_item = item;
}
@@ -239,7 +239,7 @@ bool AICurrentItemCondition::fireCondition() {
return item != 0 && item->getObjectID() == _item;
}
-AICurrentBiochipCondition::AICurrentBiochipCondition(const tItemID biochip) {
+AICurrentBiochipCondition::AICurrentBiochipCondition(const ItemID biochip) {
_biochip = biochip;
}
@@ -252,7 +252,7 @@ bool AICurrentBiochipCondition::fireCondition() {
return biochip != 0 && biochip->getObjectID() == _biochip;
}
-AIItemStateCondition::AIItemStateCondition(const tItemID item, const tItemState state) {
+AIItemStateCondition::AIItemStateCondition(const ItemID item, const ItemState state) {
_item = item;
_state = state;
}
@@ -270,15 +270,15 @@ bool AIEnergyMonitorCondition::fireCondition() {
return g_energyMonitor != 0 && g_energyMonitor->getCurrentEnergy() < _energyThreshold;
}
-AILastExtraCondition::AILastExtraCondition(const tExtraID lastExtra) {
+AILastExtraCondition::AILastExtraCondition(const ExtraID lastExtra) {
_lastExtra = lastExtra;
}
bool AILastExtraCondition::fireCondition() {
- return g_neighborhood && (tExtraID)g_neighborhood->getLastExtra() == _lastExtra;
+ return g_neighborhood && (ExtraID)g_neighborhood->getLastExtra() == _lastExtra;
}
-AICondition *makeLocationAndDoesntHaveItemCondition(const tRoomID room, const tDirectionConstant direction, const tItemID item) {
+AICondition *makeLocationAndDoesntHaveItemCondition(const RoomID room, const DirectionConstant direction, const ItemID item) {
AILocationCondition *location = new AILocationCondition(1);
location->addLocation(MakeRoomView(room, direction));
diff --git a/engines/pegasus/ai/ai_condition.h b/engines/pegasus/ai/ai_condition.h
index 559ec55c80..ba4f41108c 100755
--- a/engines/pegasus/ai/ai_condition.h
+++ b/engines/pegasus/ai/ai_condition.h
@@ -151,15 +151,15 @@ public:
AILocationCondition(uint32);
virtual ~AILocationCondition();
- void addLocation(tRoomViewID);
+ void addLocation(RoomViewID);
virtual bool fireCondition();
- virtual void writeAICondition(Common::WriteStream *);
- virtual void readAICondition(Common::ReadStream *);
+ virtual void writeAICondition(Common::WriteStream *);
+ virtual void readAICondition(Common::ReadStream *);
protected:
uint32 _numLocations, _maxLocations;
- tRoomViewID *_locations;
+ RoomViewID *_locations;
};
/////////////////////////////////////////////
@@ -168,13 +168,13 @@ protected:
class AIDoorOpenedCondition : public AICondition {
public:
- AIDoorOpenedCondition(tRoomViewID);
+ AIDoorOpenedCondition(RoomViewID);
virtual ~AIDoorOpenedCondition() {}
virtual bool fireCondition();
protected:
- tRoomViewID _doorLocation;
+ RoomViewID _doorLocation;
};
/////////////////////////////////////////////
@@ -183,12 +183,12 @@ protected:
class AIHasItemCondition : public AICondition {
public:
- AIHasItemCondition(const tItemID);
+ AIHasItemCondition(const ItemID);
virtual bool fireCondition();
protected:
- tItemID _item;
+ ItemID _item;
};
/////////////////////////////////////////////
@@ -197,12 +197,12 @@ protected:
class AIDoesntHaveItemCondition : public AICondition {
public:
- AIDoesntHaveItemCondition(const tItemID);
+ AIDoesntHaveItemCondition(const ItemID);
virtual bool fireCondition();
protected:
- tItemID _item;
+ ItemID _item;
};
/////////////////////////////////////////////
@@ -211,12 +211,12 @@ protected:
class AICurrentItemCondition : public AICondition {
public:
- AICurrentItemCondition(const tItemID);
+ AICurrentItemCondition(const ItemID);
virtual bool fireCondition();
protected:
- tItemID _item;
+ ItemID _item;
};
/////////////////////////////////////////////
@@ -225,12 +225,12 @@ protected:
class AICurrentBiochipCondition : public AICondition {
public:
- AICurrentBiochipCondition(const tItemID);
+ AICurrentBiochipCondition(const ItemID);
virtual bool fireCondition();
protected:
- tItemID _biochip;
+ ItemID _biochip;
};
/////////////////////////////////////////////
@@ -239,13 +239,13 @@ protected:
class AIItemStateCondition : public AICondition {
public:
- AIItemStateCondition(const tItemID, const tItemState);
+ AIItemStateCondition(const ItemID, const ItemState);
virtual bool fireCondition();
protected:
- tItemID _item;
- tItemState _state;
+ ItemID _item;
+ ItemState _state;
};
/////////////////////////////////////////////
@@ -268,19 +268,19 @@ protected:
class AILastExtraCondition : public AICondition {
public:
- AILastExtraCondition(const tExtraID);
+ AILastExtraCondition(const ExtraID);
virtual bool fireCondition();
protected:
- tExtraID _lastExtra;
+ ExtraID _lastExtra;
};
/////////////////////////////////////////////
//
// Helper functions
-AICondition *makeLocationAndDoesntHaveItemCondition(const tRoomID room, const tDirectionConstant direction, const tItemID item);
+AICondition *makeLocationAndDoesntHaveItemCondition(const RoomID room, const DirectionConstant direction, const ItemID item);
} // End of namespace Pegasus
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 13:14:46 +0000