- fixed walking animation.

- lighting and vision calculation reworked.
- right-click aborts walking.
- first unit is now selected at start instead of last one.
- units are properly shaded and properly cached.


git-svn-id: https://openxcom.svn.sourceforge.net/svnroot/openxcom/trunk@265 11c4a5ed-7179-4546-81a6-367b3be9d812

Author: tomvd

src/Battlescape/BattlescapeGenerator.cpp

@@ -194,6 +194,7 @@ void BattlescapeGenerator::run()
 			if ((*i)->getCraft() == _craft)
 				addSoldier((*i), _game->getRuleset()->getUnitSprites("XCOM_0"));
 		}
+		_save->setSelectedUnit(_save->getUnits()->at(0)); // select first soldier
 
 		// add items that are in the craft
 		for (std::map<std::string, Item*>::iterator i = _craft->getItems()->begin(); i != _craft->getItems()->end(); i++)
@@ -252,7 +253,6 @@ void BattlescapeGenerator::addSoldier(Soldier *soldier, RuleUnitSprite *rules)
 	}
 
 	_save->getUnits()->push_back(unit);
-	_save->setSelectedUnit(unit);
 }
 
 /**

src/Battlescape/BattlescapeState.cpp

@@ -240,10 +240,21 @@ void BattlescapeState::think()
  */
 void BattlescapeState::mapClick(Action *action)
 {
+	// right-click abort walking
+	if (action->getDetails()->button.button == SDL_BUTTON_RIGHT)
+	{
+		BattleUnit *unit = _battleGame->getSelectedUnit();
+		if (unit->getStatus() == STATUS_WALKING)
+		{
+			_battleGame->getPathfinding()->abortPath();
+			return;
+		}
+	}
+
 	// don't handle mouseclicks below 140, because they are in the buttons area (it overlaps with map surface)
 	if (action->getDetails()->motion.y/action->getYScale() > BUTTONS_AREA) return;
 
-	// don't accept clicks if there is no cursor
+	// don't accept below clicks if there is no cursor
 	if (_map->isCursorHidden()) return;
 
 	Position pos;
@@ -433,31 +444,31 @@ void BattlescapeState::moveUnit()
 
 	if (unit->getStatus() == STATUS_WALKING)
 	{
-		unit->keepWalking();
-
-		// play footstep sound every step = two steps between two tiles
+		// play footstep sound 1
 		if (unit->getWalkingPhase() == 3)
 		{
 			Tile *tile = _battleGame->getTile(unit->getPosition());
 			if (tile->getFootstepSound())
 				_game->getResourcePack()->getSoundSet("BATTLE.CAT")->getSound(22 + (tile->getFootstepSound()*2))->play();
 		}
-		// at walking phase 4 the unit moved from one tile to the other
-		if (unit->getWalkingPhase() == 4)
-		{
-			_battleGame->getTile(unit->getLastPosition())->setUnit(0);
-			_battleGame->getTile(unit->getPosition())->setUnit(unit);
-		}
-		// play footstep sound every step = two steps between two tiles
+		// play footstep sound 2
 		if (unit->getWalkingPhase() == 7)
 		{
 			Tile *tile = _battleGame->getTile(unit->getPosition());
 			if (tile->getFootstepSound())
 				_game->getResourcePack()->getSoundSet("BATTLE.CAT")->getSound(23 + (tile->getFootstepSound()*2))->play();
-			tile->setUnit(unit); // unit is now on this tile
 		}
 
-		if (unit->getStatus() != STATUS_STANDING)
+		unit->keepWalking(); // advances the phase
+
+		// unit moved from one tile to the other, update the tiles
+		if (unit->getPosition() != unit->getLastPosition())
+		{
+			_battleGame->getTile(unit->getLastPosition())->setUnit(0);
+			_battleGame->getTile(unit->getPosition())->setUnit(unit);
+		}
+
+		if (unit->getStatus() != STATUS_STANDING) // we handle the standing part below
 		{
 			_map->cacheUnits();
 			_map->draw();
@@ -467,7 +478,7 @@ void BattlescapeState::moveUnit()
 	if (unit->getStatus() == STATUS_TURNING)
 	{
 		unit->turn();
-		_battleGame->getTerrainModifier()->calculateLineOfSight(unit);
+		_battleGame->getTerrainModifier()->calculateFOV(unit);
 		_map->cacheUnits();
 		_map->draw();
 	}
@@ -497,24 +508,24 @@ void BattlescapeState::moveUnit()
 				unit->startWalking(dir, destination);
 				_map->hideCursor(true); // hide cursor while walking
 				_game->getCursor()->setVisible(false);
+
+				_map->cacheUnits();
+				_map->draw(); // draws phase 0
 			}
 		}
-		else if (_map->isCursorHidden())
-		{
-			_battleGame->getTerrainModifier()->calculateLighting();
-			_map->hideCursor(false); // show cursor again
-			_game->getCursor()->setVisible(true);
-		}
 
-		if (moved)
+		if (moved) // we have moved one tile: the walking cycle is finished
 		{
 			moved = false;
 			_map->setViewHeight(unit->getPosition().z);
-			_battleGame->getTerrainModifier()->calculateLineOfSight(unit);
+			_battleGame->getTerrainModifier()->calculateFOV(unit);
 			// if you want lighting to be calculated every step, uncomment next line
 			//_battleGame->getTerrainModifier()->calculateLighting();
-			if (unit->getStatus() == STATUS_STANDING)
+			if (unit->getStatus() == STATUS_STANDING) // we finished walking
 			{
+				_battleGame->getTerrainModifier()->calculateLighting();
+				_map->hideCursor(false); // show cursor again
+				_game->getCursor()->setVisible(true);
 				_map->cacheUnits();
 				_map->draw();
 			}

src/Battlescape/Map.cpp

@@ -31,6 +31,7 @@
 #include "../Engine/Font.h"
 #include "../Engine/Language.h"
 #include "../Engine/Palette.h"
+#include "../Engine/RNG.h"
 #include "../Engine/Game.h"
 #include "../Savegame/SavedBattleGame.h"
 #include "../Savegame/Tile.h"
@@ -319,7 +320,6 @@ void Map::drawTerrain()
 						}
 					}
 
-
 					// Draw cursor front
 					if (_selectorX == itY && _selectorY == itX && !_hideCursor)
 					{
@@ -339,7 +339,8 @@ void Map::drawTerrain()
 						frame->setY(screenPosition.y);
 						frame->blit(this);
 					}
-
+					
+					tile = _save->getTile(mapPosition);
 					// Draw smoke/fire
 					if (tile->getFire() && tile->isDiscovered())
 					{
@@ -349,6 +350,14 @@ void Map::drawTerrain()
 						frame->setY(screenPosition.y);
 						frame->blit(this);
 					}
+					if (tile->getSmoke() && tile->isDiscovered())
+					{
+						frameNumber = 8 + int(floor((tile->getSmoke() / 5.0) - 0.1)); // see http://www.ufopaedia.org/images/c/cb/Smoke.gif
+						frame = _res->getSurfaceSet("SMOKE.PCK")->getFrame(frameNumber + (_animFrame / 2));
+						frame->setX(screenPosition.x);
+						frame->setY(screenPosition.y);
+						frame->blit(this);
+					}
 
 				}
 			}
@@ -393,9 +402,15 @@ void Map::keyboardPress(Action *action, State *state)
 	// "f" - puts a tile on fire (for testing purposes)
 	if (action->getDetails()->key.keysym.sym == SDLK_f)
 	{
-		_save->getTile(pos)->setFire(1);
+		_save->getTile(pos)->setFire(RNG::generate(1,5));
 		_save->getTerrainModifier()->calculateLighting();
 	}
+	// "s" - puts a tile on smoke (for testing purposes)
+	if (action->getDetails()->key.keysym.sym == SDLK_s)
+	{
+		_save->getTile(pos)->setSmoke(RNG::generate(1,50));
+		//_save->getTerrainModifier()->calculateLighting();
+	}
 }
 
 /**
@@ -581,7 +596,8 @@ void Map::scroll()
  */
 void Map::animate()
 {
-	_animFrame = _animFrame == 7 ? 0 : _animFrame+1;
+	_animFrame++;
+	if (_animFrame == 8) _animFrame = 0;
 
 	for (int i = 0; i < _tileCount; i++)
 	{
@@ -691,29 +707,31 @@ void Map::getSelectorPosition(Position *pos)
  */
 void Map::calculateWalkingOffset(BattleUnit *unit, Position *offset)
 {
-	int offsetX[8] = { 1, 2, 1, 0, -1, -2, -1, 0 };
-	int offsetY[8] = { 1, 0, -1, -2, -1, 0, 1, 2 };
-	int phase = unit->getWalkingPhase();
+	int offsetX[8] = { 1, 1, 1, 0, -1, -1, -1, 0 };
+	int offsetY[8] = { 1, 0, -1, -1, -1, 0, 1, 1 };
+	int phase = unit->getWalkingPhase() + unit->getDiagonalWalkingPhase();
 	int dir = unit->getDirection();
+	int midphase = 4 + 4 * (dir % 2);
+	int endphase = 8 + 8 * (dir % 2);
 
-	if (phase)
+	if (unit->getStatus() == STATUS_WALKING)
 	{
-		if (phase < 4)
+		if (phase < midphase)
 		{
 			offset->x = phase * 2 * offsetX[dir];
 			offset->y = - phase * offsetY[dir];
 		}
 		else
 		{
-			offset->x = (phase - 8) * 2 * offsetX[dir];
-			offset->y = - (phase - 8) * offsetY[dir];
+			offset->x = (phase - endphase) * 2 * offsetX[dir];
+			offset->y = - (phase - endphase) * offsetY[dir];
 		}
 	}
 
 	// If we are walking in between tiles, interpolate it's terrain level.
-	if (phase)
+	if (unit->getStatus() == STATUS_WALKING)
 	{
-		if (phase < 4)
+		if (phase < midphase)
 		{
 			int fromLevel = _save->getTile(unit->getPosition())->getTerrainLevel();
 			int toLevel = _save->getTile(unit->getDestination())->getTerrainLevel();
@@ -726,7 +744,7 @@ void Map::calculateWalkingOffset(BattleUnit *unit, Position *offset)
 				// going up a level, so toLevel 0 becomes -24, -8 becomes -16
 				toLevel = -24*(unit->getDestination().z - unit->getPosition().z) + abs(toLevel);
 			}
-			offset->y += ((fromLevel * (8 - phase)) / 8) + ((toLevel * (phase)) / 8);
+			offset->y += ((fromLevel * (endphase - phase)) / endphase) + ((toLevel * (phase)) / endphase);
 		}
 		else
 		{
@@ -743,7 +761,7 @@ void Map::calculateWalkingOffset(BattleUnit *unit, Position *offset)
 				// going up a level, so fromLevel 0 becomes +24, -8 becomes 16
 				fromLevel = -24*(unit->getDestination().z - unit->getLastPosition().z) + abs(fromLevel);
 			}
-			offset->y += ((fromLevel * (8 - phase)) / 8) + ((toLevel * (phase)) / 8);
+			offset->y += ((fromLevel * (endphase - phase)) / endphase) + ((toLevel * (phase)) / endphase);
 		}
 	}
 	else
@@ -925,16 +943,11 @@ void Map::cacheUnits()
 			unitSprite->draw();
 			unitSprite->blit(_unitCache.at((*i)->getId()));
 
-			// non player units get shaded according to the tile's shade
-			if ((*i)->getFaction() != FACTION_PLAYER)
-			{
-				_unitCache.at((*i)->getId())->setShade(_save->getTile((*i)->getPosition())->getShade());
-			}
+			_unitCache.at((*i)->getId())->setShade(_save->getTile((*i)->getPosition())->getShade());
+			(*i)->setCached(true);
 		}
 	}
 	delete unitSprite;
 }
 
-
-
 }

src/Battlescape/Pathfinding.cpp

@@ -261,6 +261,14 @@ int Pathfinding::dequeuePath()
 	return last_element;
 }
 
+/*
+ * Abort path clears the path vector.
+ */
+void Pathfinding::abortPath()
+{
+	_path.clear();
+}
+
 
 /*
  * Whether a certain part of a tile blocks movement.

src/Battlescape/Pathfinding.h

@@ -66,6 +66,8 @@ class Pathfinding
 	int dequeuePath();
 	/// Get's the TU cost to move from 1 tile to the other.
 	int getTUCost(const Position &startPosition, const int direction, Position *endPosition, BattleUnit *unit);
+	/// Abort the current path.
+	void abortPath();
 };
 
 }