8 files changed, 21 insertions, 21 deletions

diff --git a/engines/pegasus/items/inventory/airmask.cpp b/engines/pegasus/items/inventory/airmask.cpp
index 682927deaf..56f9d6f62f 100755
--- a/engines/pegasus/items/inventory/airmask.cpp
+++ b/engines/pegasus/items/inventory/airmask.cpp
@@ -40,7 +40,7 @@ void AirMask::airMaskTimerExpired(FunctionPtr *, void *) {
 		g_neighborhood->checkAirMask();
 }
 
-AirMask::AirMask(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+AirMask::AirMask(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		InventoryItem(id, neighborhood, room, direction), _toggleSpot(kAirMaskToggleSpotID) {
 	g_airMask = this;
 	_toggleSpot.setArea(Common::Rect(kAIMiddleAreaLeft + 10, kAIMiddleAreaTop + 17, kAIMiddleAreaLeft + 110, kAIMiddleAreaTop + 57));
@@ -68,7 +68,7 @@ void AirMask::readFromStream(Common::ReadStream *stream) {
 }
 
 void AirMask::putMaskOn() {
-	tAirQuality airQuality;
+	AirQuality airQuality;
 
 	if (g_neighborhood)
 		airQuality = g_neighborhood->getAirQuality(GameState.getCurrentRoom());
@@ -76,8 +76,8 @@ void AirMask::putMaskOn() {
 		airQuality = kAirQualityGood;
 
 	uint airLevel = getAirLeft();
-	tItemState newState = getItemState();
-	tItemState oldState = newState;
+	ItemState newState = getItemState();
+	ItemState oldState = newState;
 
 	if (airLevel == 0) {
 		newState = kAirMaskEmptyFilter;
@@ -99,8 +99,8 @@ void AirMask::putMaskOn() {
 
 void AirMask::takeMaskOff() {	
 	uint airLevel = getAirLeft();
-	tItemState newState = getItemState();
-	tItemState oldState = newState;
+	ItemState newState = getItemState();
+	ItemState oldState = newState;
 
 	if (airLevel == 0)
 		newState = kAirMaskEmptyOff;
@@ -127,7 +127,7 @@ void AirMask::airQualityChanged() {
 		takeMaskOff();
 }
 
-void AirMask::setItemState(const tItemState newState) {
+void AirMask::setItemState(const ItemState newState) {
 	if (newState != getItemState()) {
 		InventoryItem::setItemState(newState);
 
diff --git a/engines/pegasus/items/inventory/airmask.h b/engines/pegasus/items/inventory/airmask.h
index 0e71380baf..f207f3b82b 100755
--- a/engines/pegasus/items/inventory/airmask.h
+++ b/engines/pegasus/items/inventory/airmask.h
@@ -34,13 +34,13 @@ namespace Pegasus {
 
 class AirMask : public InventoryItem, private Idler {
 public:
-	AirMask(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	AirMask(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~AirMask();
 
 	virtual void writeToStream(Common::WriteStream *);
 	virtual void readFromStream(Common::ReadStream *);
 
-	virtual void setItemState(const tItemState);
+	virtual void setItemState(const ItemState);
 	void putMaskOn();
 	void takeMaskOff();
 	void toggleItemState();
diff --git a/engines/pegasus/items/inventory/gascanister.cpp b/engines/pegasus/items/inventory/gascanister.cpp
index b6cd883bec..bf63cc6542 100755
--- a/engines/pegasus/items/inventory/gascanister.cpp
+++ b/engines/pegasus/items/inventory/gascanister.cpp
@@ -28,7 +28,7 @@
 
 namespace Pegasus {
 
-GasCanister::GasCanister(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+GasCanister::GasCanister(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		InventoryItem(id, neighborhood, room, direction) {
 }
 
diff --git a/engines/pegasus/items/inventory/gascanister.h b/engines/pegasus/items/inventory/gascanister.h
index 437df1292f..dae72c12cb 100755
--- a/engines/pegasus/items/inventory/gascanister.h
+++ b/engines/pegasus/items/inventory/gascanister.h
@@ -32,7 +32,7 @@ namespace Pegasus {
 
 class GasCanister : public InventoryItem {
 public:
-	GasCanister(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	GasCanister(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~GasCanister() {}
 	
 	void select();
diff --git a/engines/pegasus/items/inventory/inventoryitem.cpp b/engines/pegasus/items/inventory/inventoryitem.cpp
index 17f07050b3..4399708879 100755
--- a/engines/pegasus/items/inventory/inventoryitem.cpp
+++ b/engines/pegasus/items/inventory/inventoryitem.cpp
@@ -31,7 +31,7 @@
 
 namespace Pegasus {
 
-InventoryItem::InventoryItem(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+InventoryItem::InventoryItem(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		Item(id, neighborhood, room, direction) {
 
 	PegasusEngine *vm = (PegasusEngine *)g_engine;
@@ -61,7 +61,7 @@ InventoryItem::~InventoryItem() {
 	delete[] _leftAreaInfo.entries;
 }
 
-tItemType InventoryItem::getItemType() {
+ItemType InventoryItem::getItemType() {
 	return kInventoryItemType;
 }
 
@@ -70,7 +70,7 @@ TimeValue InventoryItem::getLeftAreaTime() const {
 		return 0xffffffff;
 
 	TimeValue time;
-	tItemState state;
+	ItemState state;
 
 	findItemStateEntryByState(_leftAreaInfo, _itemState, time);
 	if (time == 0xffffffff)
diff --git a/engines/pegasus/items/inventory/inventoryitem.h b/engines/pegasus/items/inventory/inventoryitem.h
index d3247d651c..b526463b18 100755
--- a/engines/pegasus/items/inventory/inventoryitem.h
+++ b/engines/pegasus/items/inventory/inventoryitem.h
@@ -39,12 +39,12 @@ struct JMPInventoryInfo {
 
 class InventoryItem : public Item {
 public:
-	InventoryItem(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	InventoryItem(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~InventoryItem();
 	
-	virtual tItemType getItemType();
+	virtual ItemType getItemType();
 	
-	void getPanelTimes(TimeValue&, TimeValue&) const;
+	void getPanelTimes(TimeValue &, TimeValue &) const;
 	TimeValue getLeftAreaTime() const;
 	
 	void setAnimationTime(const TimeValue);
diff --git a/engines/pegasus/items/inventory/keycard.cpp b/engines/pegasus/items/inventory/keycard.cpp
index 53a3f67e00..c818b6675b 100755
--- a/engines/pegasus/items/inventory/keycard.cpp
+++ b/engines/pegasus/items/inventory/keycard.cpp
@@ -28,7 +28,7 @@
 
 namespace Pegasus {
 
-KeyCard::KeyCard(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+KeyCard::KeyCard(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 			InventoryItem(id, neighborhood, room, direction) {
 	setItemState(kFlashlightOff);
 }
@@ -40,7 +40,7 @@ void KeyCard::toggleItemState() {
 		setItemState(kFlashlightOff);
 }
 
-void KeyCard::setItemState(const tItemState newState) {
+void KeyCard::setItemState(const ItemState newState) {
 	if (newState != getItemState()) {
 		InventoryItem::setItemState(newState);
 		((PegasusEngine *)g_engine)->checkFlashlight();
diff --git a/engines/pegasus/items/inventory/keycard.h b/engines/pegasus/items/inventory/keycard.h
index 7fdb905d58..c30c789786 100755
--- a/engines/pegasus/items/inventory/keycard.h
+++ b/engines/pegasus/items/inventory/keycard.h
@@ -32,11 +32,11 @@ namespace Pegasus {
 
 class KeyCard : public InventoryItem {
 public:
-	KeyCard(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	KeyCard(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~KeyCard() {}
 	
 	virtual void toggleItemState();
-	virtual void setItemState(const tItemState);
+	virtual void setItemState(const ItemState);
 	bool isFlashlightOn();
 
 protected: