HDB: Rename _drawMan -> _gfx

1 files changed, 108 insertions, 108 deletions

diff --git a/engines/hdb/ai-init.cpp b/engines/hdb/ai-init.cpp
index feeac65ba6..f8fe0c2cbc 100644
--- a/engines/hdb/ai-init.cpp
+++ b/engines/hdb/ai-init.cpp
@@ -706,71 +706,71 @@ bool AI::init() {
 	_waypointGfx[3]->load(g_hdb->_fileMan->findFirstData("icon_waypoint_select4", TYPE_ICON32));
 
 	// Setup Vars to reference SPECIAL Map Tiles
-	_useSwitchOff	= g_hdb->_drawMan->getTileIndex("anim_t32_switch_off01");
-	_useSwitchOn	= g_hdb->_drawMan->getTileIndex("t32_switch_on");
-	_useSwitch2Off	= g_hdb->_drawMan->getTileIndex("anim_t32_1switch_off01");
-	_useSwitch2On	= g_hdb->_drawMan->getTileIndex("t32_1switch_on");
-//	_useHandswitchOn	= g_hdb->_drawMan->getTileIndex("t32_ship_handswitch_on");
-//	_useHandswitchOff	= g_hdb->_drawMan->getTileIndex("anim_t32_ship_handswitch_off1");
-	_useHolderEmpty	= g_hdb->_drawMan->getTileIndex("anim_t32_holder_empty1");
-	_useHolderFull	= g_hdb->_drawMan->getTileIndex("t32_holder_full");
-	_useMailsorter	= g_hdb->_drawMan->getTileIndex("anim_t32_mailsort1");
-	_useAskcomp		= g_hdb->_drawMan->getTileIndex("anim_t32_askcomp1");
-
-	_targetDoorN	= g_hdb->_drawMan->getTileIndex("t32_door_n_1");
-	_targetDoorP	= g_hdb->_drawMan->getTileIndex("t32_door_p_1");
-	_targetDoorS	= g_hdb->_drawMan->getTileIndex("t32_door_s_1");
-	_targetDoorNv	= g_hdb->_drawMan->getTileIndex("t32_door_nv_1");
-	_targetDoorPv	= g_hdb->_drawMan->getTileIndex("t32_door_pv_1");
-	_targetDoorSv	= g_hdb->_drawMan->getTileIndex("t32_door_sv_1");
-
-	_targetDoor2N	= g_hdb->_drawMan->getTileIndex("t32_door2_n_1");
-	_targetDoor2P	= g_hdb->_drawMan->getTileIndex("t32_door2_p_1");
-	_targetDoor2S	= g_hdb->_drawMan->getTileIndex("t32_door2_s_1");
-	_targetDoor2Nv	= g_hdb->_drawMan->getTileIndex("t32_door2_nv_1");
-	_targetDoor2Pv	= g_hdb->_drawMan->getTileIndex("t32_door2_pv_1");
-	_targetDoor2Sv	= g_hdb->_drawMan->getTileIndex("t32_door2_sv_1");
-
-	_target2DoorN	= g_hdb->_drawMan->getTileIndex("t32_e2_door_n_1");
-	_target2DoorP	= g_hdb->_drawMan->getTileIndex("t32_e2_door_p_1");
-	_target2DoorS	= g_hdb->_drawMan->getTileIndex("t32_e2_door_s_1");
-	_target2DoorNv	= g_hdb->_drawMan->getTileIndex("t32_e2_door_nv_1");
-	_target2DoorPv	= g_hdb->_drawMan->getTileIndex("t32_e2_door_pv_1");
-	_target2DoorSv	= g_hdb->_drawMan->getTileIndex("t32_e2_door_sv_1");
-
-	_target3DoorN	= g_hdb->_drawMan->getTileIndex("t32_e3_door_n_1");
-	_target3DoorP	= g_hdb->_drawMan->getTileIndex("t32_e3_door_p_1");
-	_target3DoorS	= g_hdb->_drawMan->getTileIndex("t32_e3_door_s_1");
-	_target3DoorNv	= g_hdb->_drawMan->getTileIndex("t32_e3_door_nv_1");
-	_target3DoorPv	= g_hdb->_drawMan->getTileIndex("t32_e3_door_pv_1");
-	_target3DoorSv	= g_hdb->_drawMan->getTileIndex("t32_e3_door_sv_1");
-
-	_targetBridgeU	= g_hdb->_drawMan->getTileIndex("t32_bridgeup1");
-	_targetBridgeD	= g_hdb->_drawMan->getTileIndex("t32_bridgedown1");
-	_targetBridgeL	= g_hdb->_drawMan->getTileIndex("t32_bridgeleft1");
-	_targetBridgeR	= g_hdb->_drawMan->getTileIndex("t32_bridgeright1");
-	_targetBridgeMidLR	= g_hdb->_drawMan->getTileIndex("t32_mgrate_mid");
-	_targetBridgeMidUD	= g_hdb->_drawMan->getTileIndex("t32_mgrate_tbmid");
-	_touchplateOn	= g_hdb->_drawMan->getTileIndex("t32_touchplateon");
-	_touchplateOff	= g_hdb->_drawMan->getTileIndex("t32_touchplateoff");
-	_blockpole		= g_hdb->_drawMan->getTileIndex("t32_blockpole_1");
-	_useTeleporter	= g_hdb->_drawMan->getTileIndex("anim_t32_teleporter1");
-
-	_useSwitchOff	= g_hdb->_drawMan->getTileIndex("t32_temple_touchplate_on");
-	_useSwitchOff	= g_hdb->_drawMan->getTileIndex("t32_temple_touchplate_off");
-
-	_kcHolderWhiteOff	= g_hdb->_drawMan->getTileIndex("anim_t32_kcholder_white_off1");
-	_kcHolderWhiteOn	= g_hdb->_drawMan->getTileIndex("t32_kcholder_white_on");
-	_kcHolderBlueOff	= g_hdb->_drawMan->getTileIndex("anim_t32_kcholder_blue_off1");
-	_kcHolderBlueOn		= g_hdb->_drawMan->getTileIndex("t32_kcholder_blue_on");
-	_kcHolderRedOff		= g_hdb->_drawMan->getTileIndex("anim_t32_kcholder_red_off1");
-	_kcHolderRedOn		= g_hdb->_drawMan->getTileIndex("t32_kcholder_red_on");
-	_kcHolderGreenOff	= g_hdb->_drawMan->getTileIndex("anim_t32_kcholder_green_off1");
-	_kcHolderGreenOn	= g_hdb->_drawMan->getTileIndex("t32_kcholder_green_on");
-	_kcHolderPurpleOff	= g_hdb->_drawMan->getTileIndex("anim_t32_kcholder_purple_off1");
-	_kcHolderPurpleOn	= g_hdb->_drawMan->getTileIndex("t32_kcholder_purple_on");
-	_kcHolderBlackOff	= g_hdb->_drawMan->getTileIndex("anim_t32_kcholder_black_off1");
-	_kcHolderBlackOn	= g_hdb->_drawMan->getTileIndex("t32_kcholder_black_on");
+	_useSwitchOff	= g_hdb->_gfx->getTileIndex("anim_t32_switch_off01");
+	_useSwitchOn	= g_hdb->_gfx->getTileIndex("t32_switch_on");
+	_useSwitch2Off	= g_hdb->_gfx->getTileIndex("anim_t32_1switch_off01");
+	_useSwitch2On	= g_hdb->_gfx->getTileIndex("t32_1switch_on");
+//	_useHandswitchOn	= g_hdb->_gfx->getTileIndex("t32_ship_handswitch_on");
+//	_useHandswitchOff	= g_hdb->_gfx->getTileIndex("anim_t32_ship_handswitch_off1");
+	_useHolderEmpty	= g_hdb->_gfx->getTileIndex("anim_t32_holder_empty1");
+	_useHolderFull	= g_hdb->_gfx->getTileIndex("t32_holder_full");
+	_useMailsorter	= g_hdb->_gfx->getTileIndex("anim_t32_mailsort1");
+	_useAskcomp		= g_hdb->_gfx->getTileIndex("anim_t32_askcomp1");
+
+	_targetDoorN	= g_hdb->_gfx->getTileIndex("t32_door_n_1");
+	_targetDoorP	= g_hdb->_gfx->getTileIndex("t32_door_p_1");
+	_targetDoorS	= g_hdb->_gfx->getTileIndex("t32_door_s_1");
+	_targetDoorNv	= g_hdb->_gfx->getTileIndex("t32_door_nv_1");
+	_targetDoorPv	= g_hdb->_gfx->getTileIndex("t32_door_pv_1");
+	_targetDoorSv	= g_hdb->_gfx->getTileIndex("t32_door_sv_1");
+
+	_targetDoor2N	= g_hdb->_gfx->getTileIndex("t32_door2_n_1");
+	_targetDoor2P	= g_hdb->_gfx->getTileIndex("t32_door2_p_1");
+	_targetDoor2S	= g_hdb->_gfx->getTileIndex("t32_door2_s_1");
+	_targetDoor2Nv	= g_hdb->_gfx->getTileIndex("t32_door2_nv_1");
+	_targetDoor2Pv	= g_hdb->_gfx->getTileIndex("t32_door2_pv_1");
+	_targetDoor2Sv	= g_hdb->_gfx->getTileIndex("t32_door2_sv_1");
+
+	_target2DoorN	= g_hdb->_gfx->getTileIndex("t32_e2_door_n_1");
+	_target2DoorP	= g_hdb->_gfx->getTileIndex("t32_e2_door_p_1");
+	_target2DoorS	= g_hdb->_gfx->getTileIndex("t32_e2_door_s_1");
+	_target2DoorNv	= g_hdb->_gfx->getTileIndex("t32_e2_door_nv_1");
+	_target2DoorPv	= g_hdb->_gfx->getTileIndex("t32_e2_door_pv_1");
+	_target2DoorSv	= g_hdb->_gfx->getTileIndex("t32_e2_door_sv_1");
+
+	_target3DoorN	= g_hdb->_gfx->getTileIndex("t32_e3_door_n_1");
+	_target3DoorP	= g_hdb->_gfx->getTileIndex("t32_e3_door_p_1");
+	_target3DoorS	= g_hdb->_gfx->getTileIndex("t32_e3_door_s_1");
+	_target3DoorNv	= g_hdb->_gfx->getTileIndex("t32_e3_door_nv_1");
+	_target3DoorPv	= g_hdb->_gfx->getTileIndex("t32_e3_door_pv_1");
+	_target3DoorSv	= g_hdb->_gfx->getTileIndex("t32_e3_door_sv_1");
+
+	_targetBridgeU	= g_hdb->_gfx->getTileIndex("t32_bridgeup1");
+	_targetBridgeD	= g_hdb->_gfx->getTileIndex("t32_bridgedown1");
+	_targetBridgeL	= g_hdb->_gfx->getTileIndex("t32_bridgeleft1");
+	_targetBridgeR	= g_hdb->_gfx->getTileIndex("t32_bridgeright1");
+	_targetBridgeMidLR	= g_hdb->_gfx->getTileIndex("t32_mgrate_mid");
+	_targetBridgeMidUD	= g_hdb->_gfx->getTileIndex("t32_mgrate_tbmid");
+	_touchplateOn	= g_hdb->_gfx->getTileIndex("t32_touchplateon");
+	_touchplateOff	= g_hdb->_gfx->getTileIndex("t32_touchplateoff");
+	_blockpole		= g_hdb->_gfx->getTileIndex("t32_blockpole_1");
+	_useTeleporter	= g_hdb->_gfx->getTileIndex("anim_t32_teleporter1");
+
+	_useSwitchOff	= g_hdb->_gfx->getTileIndex("t32_temple_touchplate_on");
+	_useSwitchOff	= g_hdb->_gfx->getTileIndex("t32_temple_touchplate_off");
+
+	_kcHolderWhiteOff	= g_hdb->_gfx->getTileIndex("anim_t32_kcholder_white_off1");
+	_kcHolderWhiteOn	= g_hdb->_gfx->getTileIndex("t32_kcholder_white_on");
+	_kcHolderBlueOff	= g_hdb->_gfx->getTileIndex("anim_t32_kcholder_blue_off1");
+	_kcHolderBlueOn		= g_hdb->_gfx->getTileIndex("t32_kcholder_blue_on");
+	_kcHolderRedOff		= g_hdb->_gfx->getTileIndex("anim_t32_kcholder_red_off1");
+	_kcHolderRedOn		= g_hdb->_gfx->getTileIndex("t32_kcholder_red_on");
+	_kcHolderGreenOff	= g_hdb->_gfx->getTileIndex("anim_t32_kcholder_green_off1");
+	_kcHolderGreenOn	= g_hdb->_gfx->getTileIndex("t32_kcholder_green_on");
+	_kcHolderPurpleOff	= g_hdb->_gfx->getTileIndex("anim_t32_kcholder_purple_off1");
+	_kcHolderPurpleOn	= g_hdb->_gfx->getTileIndex("t32_kcholder_purple_on");
+	_kcHolderBlackOff	= g_hdb->_gfx->getTileIndex("anim_t32_kcholder_black_off1");
+	_kcHolderBlackOn	= g_hdb->_gfx->getTileIndex("t32_kcholder_black_on");
 
 	_dummyPlayer.type = AI_GUY;
 	_dummyLaser.type = AI_LASERBEAM;
@@ -873,97 +873,97 @@ void AI::restartSystem() {
 
 void AI::initAnimInfo() {
 	if (g_hdb->_map->checkOneTileExistInRange(_useSwitchOff, 2))
-		g_hdb->_drawMan->getTile(_useSwitchOn);
+		g_hdb->_gfx->getTile(_useSwitchOn);
 	if (g_hdb->_map->checkOneTileExistInRange(_useSwitch2Off, 2))
-		g_hdb->_drawMan->getTile(_useSwitch2On);
+		g_hdb->_gfx->getTile(_useSwitch2On);
 	if (g_hdb->_map->checkOneTileExistInRange(_useHolderEmpty, 2))
-		g_hdb->_drawMan->getTile(_useHolderFull);
+		g_hdb->_gfx->getTile(_useHolderFull);
 	if (g_hdb->_map->checkOneTileExistInRange(_useHandswitchOff, 2))
-		g_hdb->_drawMan->getTile(_useHandswitchOn);
+		g_hdb->_gfx->getTile(_useHandswitchOn);
 
 	if (g_hdb->_map->checkOneTileExistInRange(_targetDoorN, 4))
-		g_hdb->_drawMan->cacheTileSequence(_targetDoorN, 4);
+		g_hdb->_gfx->cacheTileSequence(_targetDoorN, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_targetDoorP, 4))
-		g_hdb->_drawMan->cacheTileSequence(_targetDoorP, 4);
+		g_hdb->_gfx->cacheTileSequence(_targetDoorP, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_targetDoorS, 4))
-		g_hdb->_drawMan->cacheTileSequence(_targetDoorS, 4);
+		g_hdb->_gfx->cacheTileSequence(_targetDoorS, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_targetDoorNv, 4))
-		g_hdb->_drawMan->cacheTileSequence(_targetDoorNv, 4);
+		g_hdb->_gfx->cacheTileSequence(_targetDoorNv, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_targetDoorPv, 4))
-		g_hdb->_drawMan->cacheTileSequence(_targetDoorPv, 4);
+		g_hdb->_gfx->cacheTileSequence(_targetDoorPv, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_targetDoorSv, 4))
-		g_hdb->_drawMan->cacheTileSequence(_targetDoorSv, 4);
+		g_hdb->_gfx->cacheTileSequence(_targetDoorSv, 4);
 
 	if (g_hdb->_map->checkOneTileExistInRange(_targetDoor2N, 4))
-		g_hdb->_drawMan->cacheTileSequence(_targetDoor2N, 4);
+		g_hdb->_gfx->cacheTileSequence(_targetDoor2N, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_targetDoor2P, 4))
-		g_hdb->_drawMan->cacheTileSequence(_targetDoor2P, 4);
+		g_hdb->_gfx->cacheTileSequence(_targetDoor2P, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_targetDoor2S, 4))
-		g_hdb->_drawMan->cacheTileSequence(_targetDoor2S, 4);
+		g_hdb->_gfx->cacheTileSequence(_targetDoor2S, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_targetDoor2Nv, 4))
-		g_hdb->_drawMan->cacheTileSequence(_targetDoor2Nv, 4);
+		g_hdb->_gfx->cacheTileSequence(_targetDoor2Nv, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_targetDoor2Pv, 4))
-		g_hdb->_drawMan->cacheTileSequence(_targetDoor2Pv, 4);
+		g_hdb->_gfx->cacheTileSequence(_targetDoor2Pv, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_targetDoor2Sv, 4))
-		g_hdb->_drawMan->cacheTileSequence(_targetDoor2Sv, 4);
+		g_hdb->_gfx->cacheTileSequence(_targetDoor2Sv, 4);
 
 	if (g_hdb->_map->checkOneTileExistInRange(_target2DoorN, 4))
-		g_hdb->_drawMan->cacheTileSequence(_target2DoorN, 4);
+		g_hdb->_gfx->cacheTileSequence(_target2DoorN, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_target2DoorP, 4))
-		g_hdb->_drawMan->cacheTileSequence(_target2DoorP, 4);
+		g_hdb->_gfx->cacheTileSequence(_target2DoorP, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_target2DoorS, 4))
-		g_hdb->_drawMan->cacheTileSequence(_target2DoorS, 4);
+		g_hdb->_gfx->cacheTileSequence(_target2DoorS, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_target2DoorNv, 4))
-		g_hdb->_drawMan->cacheTileSequence(_target2DoorNv, 4);
+		g_hdb->_gfx->cacheTileSequence(_target2DoorNv, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_target2DoorPv, 4))
-		g_hdb->_drawMan->cacheTileSequence(_target2DoorPv, 4);
+		g_hdb->_gfx->cacheTileSequence(_target2DoorPv, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_target2DoorSv, 4))
-		g_hdb->_drawMan->cacheTileSequence(_target2DoorSv, 4);
+		g_hdb->_gfx->cacheTileSequence(_target2DoorSv, 4);
 
 	if (g_hdb->_map->checkOneTileExistInRange(_target3DoorN, 4))
-		g_hdb->_drawMan->cacheTileSequence(_target3DoorN, 4);
+		g_hdb->_gfx->cacheTileSequence(_target3DoorN, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_target3DoorP, 4))
-		g_hdb->_drawMan->cacheTileSequence(_target3DoorP, 4);
+		g_hdb->_gfx->cacheTileSequence(_target3DoorP, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_target3DoorS, 4))
-		g_hdb->_drawMan->cacheTileSequence(_target3DoorS, 4);
+		g_hdb->_gfx->cacheTileSequence(_target3DoorS, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_target3DoorNv, 4))
-		g_hdb->_drawMan->cacheTileSequence(_target3DoorNv, 4);
+		g_hdb->_gfx->cacheTileSequence(_target3DoorNv, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_target3DoorPv, 4))
-		g_hdb->_drawMan->cacheTileSequence(_target3DoorPv, 4);
+		g_hdb->_gfx->cacheTileSequence(_target3DoorPv, 4);
 	if (g_hdb->_map->checkOneTileExistInRange(_target3DoorSv, 4))
-		g_hdb->_drawMan->cacheTileSequence(_target3DoorSv, 4);
+		g_hdb->_gfx->cacheTileSequence(_target3DoorSv, 4);
 
 	if (g_hdb->_map->checkOneTileExistInRange(_targetBridgeU, 3))
-		g_hdb->_drawMan->cacheTileSequence(_targetBridgeU, 3);
+		g_hdb->_gfx->cacheTileSequence(_targetBridgeU, 3);
 	if (g_hdb->_map->checkOneTileExistInRange(_targetBridgeD, 3))
-		g_hdb->_drawMan->cacheTileSequence(_targetBridgeD, 3);
+		g_hdb->_gfx->cacheTileSequence(_targetBridgeD, 3);
 	if (g_hdb->_map->checkOneTileExistInRange(_targetBridgeL, 3))
-		g_hdb->_drawMan->cacheTileSequence(_targetBridgeL, 3);
+		g_hdb->_gfx->cacheTileSequence(_targetBridgeL, 3);
 	if (g_hdb->_map->checkOneTileExistInRange(_targetBridgeR, 3))
-		g_hdb->_drawMan->cacheTileSequence(_targetBridgeR, 3);
+		g_hdb->_gfx->cacheTileSequence(_targetBridgeR, 3);
 
-	g_hdb->_drawMan->cacheTileSequence(_targetBridgeMidLR, 1);
-	g_hdb->_drawMan->cacheTileSequence(_targetBridgeMidUD, 1);
+	g_hdb->_gfx->cacheTileSequence(_targetBridgeMidLR, 1);
+	g_hdb->_gfx->cacheTileSequence(_targetBridgeMidUD, 1);
 
 	if (g_hdb->_map->checkOneTileExistInRange(_touchplateOff, 2))
-		g_hdb->_drawMan->cacheTileSequence(_touchplateOff, 2);
+		g_hdb->_gfx->cacheTileSequence(_touchplateOff, 2);
 	if (g_hdb->_map->checkOneTileExistInRange(_templeTouchpOff, 2))
-		g_hdb->_drawMan->cacheTileSequence(_templeTouchpOff, 2);
+		g_hdb->_gfx->cacheTileSequence(_templeTouchpOff, 2);
 	if (g_hdb->_map->checkOneTileExistInRange(_blockpole, 4))
-		g_hdb->_drawMan->cacheTileSequence(_blockpole, 4);
+		g_hdb->_gfx->cacheTileSequence(_blockpole, 4);
 
 	if (g_hdb->_map->checkOneTileExistInRange(_kcHolderWhiteOff, 2))
-		g_hdb->_drawMan->getTile(_kcHolderWhiteOn);
+		g_hdb->_gfx->getTile(_kcHolderWhiteOn);
 	if (g_hdb->_map->checkOneTileExistInRange(_kcHolderBlueOff, 2))
-		g_hdb->_drawMan->getTile(_kcHolderBlueOn);
+		g_hdb->_gfx->getTile(_kcHolderBlueOn);
 	if (g_hdb->_map->checkOneTileExistInRange(_kcHolderRedOff, 2))
-		g_hdb->_drawMan->getTile(_kcHolderRedOn);
+		g_hdb->_gfx->getTile(_kcHolderRedOn);
 	if (g_hdb->_map->checkOneTileExistInRange(_kcHolderGreenOff, 2))
-		g_hdb->_drawMan->getTile(_kcHolderGreenOn);
+		g_hdb->_gfx->getTile(_kcHolderGreenOn);
 	if (g_hdb->_map->checkOneTileExistInRange(_kcHolderPurpleOff, 2))
-		g_hdb->_drawMan->getTile(_kcHolderPurpleOn);
+		g_hdb->_gfx->getTile(_kcHolderPurpleOn);
 	if (g_hdb->_map->checkOneTileExistInRange(_kcHolderBlackOff, 2))
-		g_hdb->_drawMan->getTile(_kcHolderBlackOn);
+		g_hdb->_gfx->getTile(_kcHolderBlackOn);
 }
 
 const char *AITypeStr[] = {