From 177f47a5355fdbe6e45b51328274db02baace79b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 24 Jan 2015 14:48:00 -0500
Subject: XEEN: Implement drawOutdoors

---
 engines/xeen/interface_map.cpp | 73 +++++++++++++++++++++++++++++++++++++++---
 engines/xeen/interface_map.h   |  3 +-
 engines/xeen/map.cpp           |  2 +-
 3 files changed, 72 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/xeen/interface_map.cpp b/engines/xeen/interface_map.cpp
index a699b8f638..04f7355603 100644
--- a/engines/xeen/interface_map.cpp
+++ b/engines/xeen/interface_map.cpp
@@ -27,9 +27,9 @@
 
 namespace Xeen {
 
-OutdoorDrawList::OutdoorDrawList() : _skySprite(_data[1]), _groundSprite(_data[2]),
-	_combatImgs1(&_data[124]), _combatImgs2(&_data[95]),
-	_combatImgs3(&_data[76]), _combatImgs4(&_data[53]) {
+OutdoorDrawList::OutdoorDrawList() : _sky1(_data[0]), _sky2(_data[1]), 
+	_groundSprite(_data[2]), _combatImgs1(&_data[124]), _combatImgs2(&_data[95]),
+	_combatImgs3(&_data[76]), _combatImgs4(&_data[53]), _groundTiles(&_data[3]) {
 	_data[0] = DrawStruct(0, 8, 8);
 	_data[1] = DrawStruct(1, 8, 25);
 	_data[2] = DrawStruct(0, 8, 67);
@@ -4390,7 +4390,72 @@ void InterfaceMap::drawIndoors() {
  * Draw the contents of the current 3d view of an outdoor map
  */
 void InterfaceMap::drawOutdoors() {
-	// TODO
+	Map &map = *_vm->_map;
+	Party &party = *_vm->_party;
+	Screen &screen = *_vm->_screen;
+	int surfaceId;
+
+	// Draw any surface tiles on top of the default ground
+	for (int cellIndex = 0; cellIndex < 25; ++cellIndex) {
+		map.getCell(cellIndex == 24 ? 2 : DRAW_NUMBERS[cellIndex]);
+
+		DrawStruct &drawStruct = _indoorList._groundTiles[cellIndex];
+		SpriteResource &sprites = map._surfaceSprites[map._currentSurfaceId];
+		drawStruct._sprites = sprites.empty() ? (SpriteResource *)nullptr : &sprites;
+
+		surfaceId = map.mazeData()._surfaceTypes[map._currentSurfaceId];
+		if (surfaceId == SURFTYPE_DWATER || surfaceId == SURFTYPE_LAVA) {
+			drawStruct._frame = DRAW_FRAMES[cellIndex][_flipWater ? 1 : 0];
+			drawStruct._flags = _flipWater ? SPRFLAG_HORIZ_FLIPPED : 0;
+		} else {
+			drawStruct._frame = DRAW_FRAMES[cellIndex][_flipGround ? 1 : 0];
+			drawStruct._flags = _flipGround ? SPRFLAG_HORIZ_FLIPPED : 0;
+		}
+	}
+
+	party.handleLight();
+
+	// Set up terrain draw entries
+	const int TERRAIN_INDEXES1[9] = { 44, 36, 37, 38, 45, 43, 42, 41, 39 };
+	const int TERRAIN_INDEXES2[5] = { 22, 24, 31, 29, 26 };
+	const int TERRAIN_INDEXES3[3] = { 11, 16, 13 };
+	const int TERRAIN_INDEXES4[5] = { 5, 9, 7, 0, 4 };
+
+	for (int idx = 0; idx < 9; ++idx) {
+		map.getCell(TERRAIN_INDEXES1[idx]);
+		_outdoorList[36 + idx]._sprites = &map._wallSprites._surfaces[map._currentWall._data];
+	}
+	for (int idx = 0; idx < 5; ++idx) {
+		map.getCell(TERRAIN_INDEXES2[idx]);
+		_outdoorList[61 + idx]._sprites = &map._wallSprites._surfaces[map._currentWall._data];
+	}
+	for (int idx = 0; idx < 3; ++idx) {
+		map.getCell(TERRAIN_INDEXES3[idx]);
+		_outdoorList[84 + idx]._sprites = &map._wallSprites._surfaces[map._currentWall._data];
+	}
+	for (int idx = 0; idx < 5; ++idx) {
+		map.getCell(TERRAIN_INDEXES4[idx]);
+		_outdoorList[103 + idx]._sprites = &map._wallSprites._surfaces[map._currentWall._data];
+	}
+
+	map.getCell(1);
+	_outdoorList[108]._sprites = &map._wallSprites._surfaces[map._currentWall._data];
+	_outdoorList[109]._sprites = &map._wallSprites._surfaces[map._currentWall._data];
+	_outdoorList[110]._sprites = &map._wallSprites._surfaces[map._currentWall._data];
+	_outdoorList._sky1._flags = _outdoorList._sky2._flags = _flipSky ? SPRFLAG_HORIZ_FLIPPED : 0;
+	_outdoorList._groundSprite._flags = _flipWater ? SPRFLAG_HORIZ_FLIPPED : 0;
+
+	// Finally render the outdoor scene
+	screen._windows[3].drawList(&_outdoorList[0], _outdoorList.size());
+
+	// Check for any character shooting
+	_isShooting = false;
+	for (int i = 0; i < _vm->_party->_partyCount; ++i) {
+		if (_vm->_combat->_shooting[i])
+			_isShooting = true;
+	}
+
+	_charsShooting = _isShooting;
 }
 
 
diff --git a/engines/xeen/interface_map.h b/engines/xeen/interface_map.h
index 4a4ff13fd8..3ee2c430e9 100644
--- a/engines/xeen/interface_map.h
+++ b/engines/xeen/interface_map.h
@@ -34,8 +34,9 @@ class XeenEngine;
 class OutdoorDrawList {
 public:
 	DrawStruct _data[132];
-	DrawStruct &_skySprite;
+	DrawStruct &_sky1, &_sky2;
 	DrawStruct &_groundSprite;
+	DrawStruct * const _groundTiles;
 	DrawStruct * const _combatImgs1;
 	DrawStruct * const _combatImgs2;
 	DrawStruct * const _combatImgs3;
diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp
index 043f8c0bf6..ae38b77ed6 100644
--- a/engines/xeen/map.cpp
+++ b/engines/xeen/map.cpp
@@ -1088,7 +1088,7 @@ void Map::load(int mapId) {
 
 		_groundSprites.load("water.out");
 		_tileSprites.load("outdoor.til");
-		outdoorList._skySprite._sprites = &_skySprites[0];
+		outdoorList._sky2._sprites = &_skySprites[0];
 		outdoorList._groundSprite._sprites = &_groundSprites;
 		
 		for (int i = 0; i < TOTAL_SURFACES; ++i) {
-- 
cgit v1.2.3