16 files changed, 48 insertions, 48 deletions

diff --git a/engines/pegasus/items/biochips/aichip.cpp b/engines/pegasus/items/biochips/aichip.cpp
index d4e425921b..5e9fc9f8c3 100755
--- a/engines/pegasus/items/biochips/aichip.cpp
+++ b/engines/pegasus/items/biochips/aichip.cpp
@@ -33,7 +33,7 @@
 namespace Pegasus {
 
 // indexed by [number of hints][number of solves (0, 1, or 2)][which button to highlight]
-static const tItemState s_highlightState[4][3][7] = {
+static const ItemState s_highlightState[4][3][7] = {
 	{
 		{kAI000,	-1,			-1,			-1,			-1,			kAI005,		kAI006},
 		{kAI010,	-1,			-1,			-1,			-1,			kAI015,		kAI016},
@@ -58,7 +58,7 @@ static const tItemState s_highlightState[4][3][7] = {
 
 AIChip *g_AIChip = 0;
 
-AIChip::AIChip(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+AIChip::AIChip(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		BiochipItem(id, neighborhood, room, direction), _briefingSpot(kAIBriefingSpotID), _scanSpot(kAIScanSpotID),
 		_hint1Spot(kAIHint1SpotID), _hint2Spot(kAIHint2SpotID), _hint3Spot(kAIHint3SpotID), _solveSpot(kAISolveSpotID) {
 	_briefingSpot.setArea(Common::Rect(kAIMiddleAreaLeft + 10, kAIMiddleAreaTop + 27, kAIMiddleAreaLeft + 10 + 81, kAIMiddleAreaTop + 27 + 31));
@@ -186,7 +186,7 @@ void AIChip::showBriefingClicked() {
 		numSolves = 0;
 	}
 
-	tItemState newState = s_highlightState[vm->getNumHints()][numSolves][kAIBriefingSpotID - kAIHint1SpotID + 1];
+	ItemState newState = s_highlightState[vm->getNumHints()][numSolves][kAIBriefingSpotID - kAIHint1SpotID + 1];
 	if (newState != -1)
 		setItemState(newState);
 }
@@ -206,7 +206,7 @@ void AIChip::showEnvScanClicked() {
 		numSolves = 0;
 	}
 
-	tItemState newState = s_highlightState[vm->getNumHints()][numSolves][kAIScanSpotID - kAIHint1SpotID + 1];
+	ItemState newState = s_highlightState[vm->getNumHints()][numSolves][kAIScanSpotID - kAIHint1SpotID + 1];
 
 	if (newState != -1)
 		setItemState(newState);
@@ -217,7 +217,7 @@ void AIChip::clearClicked() {
 	setUpAIChip();
 }
 
-void AIChip::clickInAIHotspot(tHotSpotID id) {
+void AIChip::clickInAIHotspot(HotSpotID id) {
 	PegasusEngine *vm = (PegasusEngine *)g_engine;
 
 	Common::String movieName;
@@ -243,7 +243,7 @@ void AIChip::clickInAIHotspot(tHotSpotID id) {
 		break;
 	}
 
-	tItemState state = getItemState();
+	ItemState state = getItemState();
 
 	if (!movieName.empty()) {
 		_playingMovie = true;
@@ -258,7 +258,7 @@ void AIChip::clickInAIHotspot(tHotSpotID id) {
 			numSolves = 0;
 		}
 
-		tItemState newState = s_highlightState[vm->getNumHints()][numSolves][id - kAIHint1SpotID + 1];
+		ItemState newState = s_highlightState[vm->getNumHints()][numSolves][id - kAIHint1SpotID + 1];
 
 		if (newState != -1)
 			setItemState(newState);
diff --git a/engines/pegasus/items/biochips/aichip.h b/engines/pegasus/items/biochips/aichip.h
index 96d2fb2c01..e0cbd994dd 100755
--- a/engines/pegasus/items/biochips/aichip.h
+++ b/engines/pegasus/items/biochips/aichip.h
@@ -33,7 +33,7 @@ namespace Pegasus {
 
 class AIChip : public BiochipItem {
 public:
-	AIChip(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	AIChip(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~AIChip();
 
 	void select();
@@ -44,7 +44,7 @@ public:
 	// own the center area.
 	void setUpAIChipRude();
 	void activateAIHotspots();
-	void clickInAIHotspot(tHotSpotID);
+	void clickInAIHotspot(HotSpotID);
 
 	void takeSharedArea();
 
diff --git a/engines/pegasus/items/biochips/biochipitem.cpp b/engines/pegasus/items/biochips/biochipitem.cpp
index 99e6050c85..5686948937 100755
--- a/engines/pegasus/items/biochips/biochipitem.cpp
+++ b/engines/pegasus/items/biochips/biochipitem.cpp
@@ -32,7 +32,7 @@
 
 namespace Pegasus {
 
-BiochipItem::BiochipItem(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+BiochipItem::BiochipItem(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		Item(id, neighborhood, room, direction) {
 
 	PegasusEngine *vm = (PegasusEngine *)g_engine;
@@ -59,7 +59,7 @@ BiochipItem::~BiochipItem() {
 	delete[] _rightAreaInfo.entries;
 }
 
-tItemType BiochipItem::getItemType() {
+ItemType BiochipItem::getItemType() {
 	return kBiochipItemType;
 }
 
@@ -68,7 +68,7 @@ TimeValue BiochipItem::getRightAreaTime() const {
 		return 0xffffffff;
 
 	TimeValue time;
-	tItemState state;
+	ItemState state;
 
 	findItemStateEntryByState(_rightAreaInfo, _itemState, time);
 	if (time == 0xffffffff)
diff --git a/engines/pegasus/items/biochips/biochipitem.h b/engines/pegasus/items/biochips/biochipitem.h
index 904c23b392..24b9ae699a 100755
--- a/engines/pegasus/items/biochips/biochipitem.h
+++ b/engines/pegasus/items/biochips/biochipitem.h
@@ -32,10 +32,10 @@ namespace Pegasus {
 
 class BiochipItem : public Item {
 public:
-	BiochipItem(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	BiochipItem(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~BiochipItem();
 	
-	virtual tItemType getItemType();
+	virtual ItemType getItemType();
 	
 	TimeValue getPanelTime() const { return _biochipInfoPanelTime; }
 	TimeValue getRightAreaTime() const;
diff --git a/engines/pegasus/items/biochips/mapchip.cpp b/engines/pegasus/items/biochips/mapchip.cpp
index de6d4e2dfe..69050d5193 100755
--- a/engines/pegasus/items/biochips/mapchip.cpp
+++ b/engines/pegasus/items/biochips/mapchip.cpp
@@ -32,7 +32,7 @@ namespace Pegasus {
 
 MapChip *g_map = 0;
 
-MapChip::MapChip(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+MapChip::MapChip(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		BiochipItem(id, neighborhood, room, direction) {
 	g_map = this;
 	setItemState(kMapUnavailable);
@@ -69,8 +69,8 @@ void MapChip::deselect() {
 	_image.unloadImage();
 }
 
-void MapChip::moveToMapLocation(const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant dir) {
-	tAirQuality airQuality;
+void MapChip::moveToMapLocation(const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant dir) {
+	AirQuality airQuality;
 
 	if (g_neighborhood)
 		airQuality = g_neighborhood->getAirQuality(room);
diff --git a/engines/pegasus/items/biochips/mapchip.h b/engines/pegasus/items/biochips/mapchip.h
index 69bfabc200..6690090aa4 100755
--- a/engines/pegasus/items/biochips/mapchip.h
+++ b/engines/pegasus/items/biochips/mapchip.h
@@ -38,7 +38,7 @@ namespace Pegasus {
 
 class MapChip : public BiochipItem {
 public:
-	MapChip(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	MapChip(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~MapChip();
 
 	void select();
@@ -46,7 +46,7 @@ public:
 	void takeSharedArea();
 	void giveUpSharedArea();
 
-	void moveToMapLocation(const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	void moveToMapLocation(const NeighborhoodID, const RoomID, const DirectionConstant);
 
 	void writeToStream(Common::WriteStream *);
 	void readFromStream(Common::ReadStream *);
diff --git a/engines/pegasus/items/biochips/mapimage.cpp b/engines/pegasus/items/biochips/mapimage.cpp
index 6e4a8ecd12..bd7b8ff910 100755
--- a/engines/pegasus/items/biochips/mapimage.cpp
+++ b/engines/pegasus/items/biochips/mapimage.cpp
@@ -55,20 +55,20 @@ static const int kGearRoomFlagHigh = ROOM_TO_FLAG(kMars39, kWest);
 static const int kMazeFlagLow = ROOM_TO_FLAG(kMars60, kNorth);
 static const int kMazeFlagHigh = ROOM_TO_FLAG(kMarsMaze200, kWest);
 
-static const tCoordType kGearRoomScreenOffsetX = 49;
-static const tCoordType kGearRoomScreenOffsetY = 47;
+static const CoordType kGearRoomScreenOffsetX = 49;
+static const CoordType kGearRoomScreenOffsetY = 47;
 
-static const tCoordType kGearRoomGridOriginX = 1;
-static const tCoordType kGearRoomGridOriginY = 4;
+static const CoordType kGearRoomGridOriginX = 1;
+static const CoordType kGearRoomGridOriginY = 4;
 
-static const tCoordType kMazeScreenOffsetX = 16;
-static const tCoordType kMazeScreenOffsetY = 20;
+static const CoordType kMazeScreenOffsetX = 16;
+static const CoordType kMazeScreenOffsetY = 20;
 
-static const tCoordType kMazeGridOriginX = 6;
-static const tCoordType kMazeGridOriginY = 1;
+static const CoordType kMazeGridOriginX = 6;
+static const CoordType kMazeGridOriginY = 1;
 
-static const tCoordType kGridWidth = 4;
-static const tCoordType kGridHeight = 4;
+static const CoordType kGridWidth = 4;
+static const CoordType kGridHeight = 4;
 
 static const uint16 kMapOfMazePICTID = 906;
 static const uint16 kMapOfGearRoomPICTID = 907;
@@ -318,7 +318,7 @@ void MapImage::unloadImage() {
 	_whichArea = kMapNoArea;
 }
 
-void MapImage::moveToMapLocation(const tNeighborhoodID, const tRoomID room, const tDirectionConstant dir) {
+void MapImage::moveToMapLocation(const NeighborhoodID, const RoomID room, const DirectionConstant dir) {
 	GraphicsManager *gfx = ((PegasusEngine *)g_engine)->_gfx;
 
 	int flag = ROOM_TO_FLAG(room, dir);
@@ -346,7 +346,7 @@ void MapImage::addFlagToMask(const int flag) {
 // This function can even be sensitive to open doors.
 // clone2727 notices that it's not, though
 void MapImage::getRevealedRects(const uint32 flag, Common::Rect &r1) {	
-	tCoordType gridX, gridY;
+	CoordType gridX, gridY;
 
 	switch (_whichArea) {
 	case kMapMaze:
@@ -371,7 +371,7 @@ void MapImage::getRevealedRects(const uint32 flag, Common::Rect &r1) {
 void MapImage::drawPlayer() {
 	Graphics::Surface *screen = ((PegasusEngine *)g_engine)->_gfx->getCurSurface();
 
-	tCoordType gridX, gridY;
+	CoordType gridX, gridY;
 
 	switch (_whichArea) {
 	case kMapMaze:
diff --git a/engines/pegasus/items/biochips/mapimage.h b/engines/pegasus/items/biochips/mapimage.h
index 359d67ca4c..d596b585c4 100755
--- a/engines/pegasus/items/biochips/mapimage.h
+++ b/engines/pegasus/items/biochips/mapimage.h
@@ -49,7 +49,7 @@ public:
 	void loadGearRoomIfNecessary();
 	void loadMazeIfNecessary();
 	void unloadImage();
-	void moveToMapLocation(const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	void moveToMapLocation(const NeighborhoodID, const RoomID, const DirectionConstant);
 	
 	void draw(const Common::Rect &);
 	
diff --git a/engines/pegasus/items/biochips/opticalchip.cpp b/engines/pegasus/items/biochips/opticalchip.cpp
index f6519c7f61..6a9a41d573 100755
--- a/engines/pegasus/items/biochips/opticalchip.cpp
+++ b/engines/pegasus/items/biochips/opticalchip.cpp
@@ -30,7 +30,7 @@ namespace Pegasus {
 
 OpticalChip *g_opticalChip = 0;
 
-OpticalChip::OpticalChip(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+OpticalChip::OpticalChip(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		BiochipItem(id, neighborhood, room, direction), _ariesHotspot(kAriesSpotID), _mercuryHotspot(kMercurySpotID),
 		_poseidonHotspot(kPoseidonSpotID) {
 	_ariesHotspot.setArea(Common::Rect(kAIMiddleAreaLeft + 60, kAIMiddleAreaTop + 27, kAIMiddleAreaLeft + 60 + 121, kAIMiddleAreaTop + 27 + 20));
@@ -118,11 +118,11 @@ void OpticalChip::activateOpticalHotspots() {
 		_poseidonHotspot.setActive();
 }
 
-void OpticalChip::clickInOpticalHotspot(tHotSpotID id) {
+void OpticalChip::clickInOpticalHotspot(HotSpotID id) {
 	playOpMemMovie(id);
 }
 
-void OpticalChip::playOpMemMovie(tHotSpotID id) {
+void OpticalChip::playOpMemMovie(HotSpotID id) {
 	Common::String movieName;
 	switch (id) {
 	case kAriesSpotID:
@@ -136,7 +136,7 @@ void OpticalChip::playOpMemMovie(tHotSpotID id) {
 		break;
 	}
 
-	tItemState state = getItemState(), newState;
+	ItemState state = getItemState(), newState;
 	switch (state) {
 	case kOptical000:
 		// Can never happen.
diff --git a/engines/pegasus/items/biochips/opticalchip.h b/engines/pegasus/items/biochips/opticalchip.h
index c44a5eaf63..b1ea87bffc 100755
--- a/engines/pegasus/items/biochips/opticalchip.h
+++ b/engines/pegasus/items/biochips/opticalchip.h
@@ -34,7 +34,7 @@ namespace Pegasus {
 
 class OpticalChip : public BiochipItem {
 public:
-	OpticalChip(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	OpticalChip(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~OpticalChip();
 
 	virtual void writeToStream(Common::WriteStream *);
@@ -45,8 +45,8 @@ public:
 	void addPoseidon();
 
 	void activateOpticalHotspots();
-	void clickInOpticalHotspot(tHotSpotID);
-	void playOpMemMovie(tHotSpotID);
+	void clickInOpticalHotspot(HotSpotID);
+	void playOpMemMovie(HotSpotID);
 
 protected:
 	enum {
diff --git a/engines/pegasus/items/biochips/pegasuschip.cpp b/engines/pegasus/items/biochips/pegasuschip.cpp
index 8d369c1a17..1e3e0d7a88 100755
--- a/engines/pegasus/items/biochips/pegasuschip.cpp
+++ b/engines/pegasus/items/biochips/pegasuschip.cpp
@@ -32,7 +32,7 @@
 
 namespace Pegasus {
 
-PegasusChip::PegasusChip(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+PegasusChip::PegasusChip(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		BiochipItem(id, neighborhood, room, direction), _recallSpot(kPegasusRecallSpotID) {
 	_recallSpot.setArea(Common::Rect(kAIMiddleAreaLeft + 116, kAIMiddleAreaTop + 63, kAIMiddleAreaLeft + 184, kAIMiddleAreaTop + 91));
 	_recallSpot.setHotspotFlags(kPegasusBiochipSpotFlag);
@@ -125,8 +125,8 @@ void PegasusChip::activatePegasusHotspots() {
 void PegasusChip::clickInPegasusHotspot() {
 	PegasusEngine *vm = (PegasusEngine *)g_engine;
 
-	tItemState thisState = getItemState();
-	tItemState hiliteState;
+	ItemState thisState = getItemState();
+	ItemState hiliteState;
 
 	switch (thisState) {
 	case kPegasusPrehistoric00:
diff --git a/engines/pegasus/items/biochips/pegasuschip.h b/engines/pegasus/items/biochips/pegasuschip.h
index 1ee35b78a1..7597424821 100755
--- a/engines/pegasus/items/biochips/pegasuschip.h
+++ b/engines/pegasus/items/biochips/pegasuschip.h
@@ -33,7 +33,7 @@ namespace Pegasus {
 
 class PegasusChip : public BiochipItem {
 public:
-	PegasusChip(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	PegasusChip(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~PegasusChip();
 
 	void select();
diff --git a/engines/pegasus/items/biochips/retscanchip.cpp b/engines/pegasus/items/biochips/retscanchip.cpp
index e9904056c1..84b74a63d2 100755
--- a/engines/pegasus/items/biochips/retscanchip.cpp
+++ b/engines/pegasus/items/biochips/retscanchip.cpp
@@ -28,7 +28,7 @@
 
 namespace Pegasus {
 
-RetScanChip::RetScanChip(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+RetScanChip::RetScanChip(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		BiochipItem(id, neighborhood, room, direction) {
 }
 
diff --git a/engines/pegasus/items/biochips/retscanchip.h b/engines/pegasus/items/biochips/retscanchip.h
index 7d8fe6d401..e72eaeddaf 100755
--- a/engines/pegasus/items/biochips/retscanchip.h
+++ b/engines/pegasus/items/biochips/retscanchip.h
@@ -32,7 +32,7 @@ namespace Pegasus {
 
 class RetScanChip : public BiochipItem {
 public:
-	RetScanChip(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	RetScanChip(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~RetScanChip() {}
 	
 	void searchForLaser();
diff --git a/engines/pegasus/items/biochips/shieldchip.cpp b/engines/pegasus/items/biochips/shieldchip.cpp
index 4bd05728b4..58cbfcc4ec 100755
--- a/engines/pegasus/items/biochips/shieldchip.cpp
+++ b/engines/pegasus/items/biochips/shieldchip.cpp
@@ -31,7 +31,7 @@ namespace Pegasus {
 
 ShieldChip *g_shield = 0;
 
-ShieldChip::ShieldChip(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+ShieldChip::ShieldChip(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		BiochipItem(id, neighborhood, room, direction) {
 	g_shield = this;
 }
diff --git a/engines/pegasus/items/biochips/shieldchip.h b/engines/pegasus/items/biochips/shieldchip.h
index c0b9cc5183..69c6369236 100755
--- a/engines/pegasus/items/biochips/shieldchip.h
+++ b/engines/pegasus/items/biochips/shieldchip.h
@@ -32,7 +32,7 @@ namespace Pegasus {
 
 class ShieldChip : public BiochipItem {
 public:
-	ShieldChip(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	ShieldChip(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~ShieldChip() {}
 
 	void select();