Merge remote-tracking branch 'upstream/master' into loadout_copy_paste

Author: myk002

src/Battlescape/BattlescapeState.cpp

@@ -94,7 +94,7 @@ namespace OpenXcom
 BattlescapeState::BattlescapeState(Game *game) : State(game), _popups(), _xBeforeMouseScrolling(0), _yBeforeMouseScrolling(0), _totalMouseMoveX(0), _totalMouseMoveY(0), _mouseMovedOverThreshold(0)
 {
 	std::fill_n(_visibleUnit, 10, (BattleUnit*)(0));
-	//game->getScreen()->setScale(1.0);
+
 	int screenWidth = Options::baseXResolution;
 	int screenHeight = Options::baseYResolution;
 	int iconsWidth = 320;

src/Battlescape/Map.cpp

@@ -78,7 +78,7 @@ namespace OpenXcom
  * @param y Y position in pixels.
  * @param visibleMapHeight Current visible map height.
  */
-Map::Map(Game *game, int width, int height, int x, int y, int visibleMapHeight) : InteractiveSurface(width, height, x, y), _game(game), _arrow(0), _selectorX(0), _selectorY(0), _mouseX(0), _mouseY(0), _cursorType(CT_NORMAL), _cursorSize(1), _animFrame(0), _projectile(0), _projectileInFOV(false), _explosionInFOV(false), _visibleMapHeight(visibleMapHeight), _unitDying(false), _smoothingEngaged(false)
+Map::Map(Game *game, int width, int height, int x, int y, int visibleMapHeight) : InteractiveSurface(width, height, x, y), _game(game), _arrow(0), _selectorX(0), _selectorY(0), _mouseX(0), _mouseY(0), _cursorType(CT_NORMAL), _cursorSize(1), _animFrame(0), _projectile(0), _projectileInFOV(false), _explosionInFOV(false), _launch(false), _visibleMapHeight(visibleMapHeight), _unitDying(false), _smoothingEngaged(false)
 {
 	_previewSetting = Options::battleNewPreviewPath;
 	_smoothCamera = Options::battleSmoothCamera;
@@ -289,15 +289,20 @@ void Map::drawTerrain(Surface *surface)
 			}
 			if (_smoothCamera)
 			{
+				if (_launch)
+				{
+					_launch = false;
+					if ((bulletPositionScreen.x < 1 || bulletPositionScreen.x > surface->getWidth() - 1 ||
+						bulletPositionScreen.y < 1 || bulletPositionScreen.y > _visibleMapHeight - 1))
+					{
+						_camera->centerOnPosition(Position(bulletLowX, bulletLowY, bulletHighZ), false);
+						_camera->convertVoxelToScreen(_projectile->getPosition(), &bulletPositionScreen);
+					}
+				}
 				if (!_smoothingEngaged)
 				{
-					Position origin = _projectile->getOrigin();
-					Position target = _projectile->getTarget();
-					if (std::abs(origin.x - target.x) > 1 ||
-						std::abs(origin.y - target.y) > 1 || 
-						std::abs(origin.z - target.z) > 1 ||
-						bulletPositionScreen.x < 0 || bulletPositionScreen.x > surface->getWidth() ||
-						bulletPositionScreen.y < 0 || bulletPositionScreen.y > _visibleMapHeight)
+					if (bulletPositionScreen.x < 1 || bulletPositionScreen.x > surface->getWidth() - 1 ||
+						bulletPositionScreen.y < 1 || bulletPositionScreen.y > _visibleMapHeight - 1)
 					{
 						_smoothingEngaged = true;
 					}
@@ -1205,6 +1210,10 @@ void Map::cacheUnit(BattleUnit *unit)
 void Map::setProjectile(Projectile *projectile)
 {
 	_projectile = projectile;
+	if (projectile && Options::battleSmoothCamera)
+	{
+		_launch = true;
+	}
 }
 
 /**

src/Battlescape/Map.h

@@ -63,7 +63,7 @@ class Map : public InteractiveSurface
 	Projectile *_projectile;
 	bool _projectileInFOV;
 	std::set<Explosion *> _explosions;
-	bool _explosionInFOV;
+	bool _explosionInFOV, _launch;
 	BattlescapeMessage *_message;
 	Camera *_camera;
 	int _visibleMapHeight;

src/Battlescape/TileEngine.cpp

@@ -1380,7 +1380,7 @@ bool TileEngine::detonate(Tile* tile)
 						}
 					}
 				}
-				if (2 * flam < remainingPower && (tiles[i]->getMapData(MapData::O_FLOOR) || tiles[i]->getMapData(MapData::O_OBJECT)))
+				if (i > 3 && 2 * flam < remainingPower && (tile->getMapData(MapData::O_FLOOR) || tile->getMapData(MapData::O_OBJECT)))
 				{
 					tile->setFire(fuel);
 					tile->setSmoke(std::max(1, std::min(15 - (flam / 10), 12)));

src/Battlescape/UnitDieBState.cpp

@@ -112,7 +112,7 @@ void UnitDieBState::init()
  */
 void UnitDieBState::think()
 {
-	if (_unit->getDirection() != 3)
+	if (_unit->getDirection() != 3 && _damageType != DT_HE)
 	{
 		int dir = _unit->getDirection() + 1;
 		if (dir == 8)

src/Engine/Game.cpp

@@ -60,6 +60,7 @@ Game::Game(const std::string &title) : _screen(0), _cursor(0), _lang(0), _states
 	}
 	Log(LOG_INFO) << "SDL initialized successfully.";
 
+	Options::reload = false;
 	Options::mute = false;
 	// Initialize SDL_mixer
 	if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)

src/Engine/Options.cpp

@@ -78,6 +78,9 @@ void create()
 	_info.push_back(OptionInfo("spendResearchedItems", &spendResearchedItems, false));
 	_info.push_back(OptionInfo("baseXResolution", &baseXResolution, Screen::ORIGINAL_WIDTH));
 	_info.push_back(OptionInfo("baseYResolution", &baseYResolution, Screen::ORIGINAL_HEIGHT));
+	_info.push_back(OptionInfo("baseResGeoscape", &baseResGeoscape, true));
+	_info.push_back(OptionInfo("baseResBasescape", &baseResBasescape, true));
+	_info.push_back(OptionInfo("baseResBattlescape", &baseResBattlescape, true));
 	_info.push_back(OptionInfo("useScaleFilter", &useScaleFilter, false));
 	_info.push_back(OptionInfo("useHQXFilter", &useHQXFilter, false));
 	_info.push_back(OptionInfo("useOpenGL", &useOpenGL, false));

src/Engine/Options.inc.h

@@ -6,7 +6,8 @@ OPT int displayWidth, displayHeight, maxFrameSkip, baseXResolution, baseYResolut
 	audioSampleRate, audioBitDepth, pauseMode, windowedModePositionX, windowedModePositionY, FPS, changeValueByMouseWheel;
 OPT bool fullscreen, asyncBlit, playIntro, useScaleFilter, useHQXFilter, useOpenGL, checkOpenGLErrors, vSyncForOpenGL, useOpenGLSmoothing,
 	allowResize, borderless, debug, debugUi, fpsCounter, newSeedOnLoad, keepAspectRatio,
-	cursorInBlackBandsInFullscreen, cursorInBlackBandsInWindow, cursorInBlackBandsInBorderlessWindow;
+	cursorInBlackBandsInFullscreen, cursorInBlackBandsInWindow, cursorInBlackBandsInBorderlessWindow,
+	baseResGeoscape, baseResBasescape, baseResBattlescape;
 OPT std::string language, useOpenGLShader;
 OPT KeyboardType keyboardMode;
 OPT SaveSort saveOrder;

src/Geoscape/Cord.h

@@ -20,15 +20,38 @@
 #define	OPENXCOM_CORD_H
 
 #include <cmath>
+#include "../aresame.h"
 
 namespace OpenXcom
 {
-	
-	
+struct Cord;
+
+struct CordPolar
+{
+	double lon, lat;
+
+	inline CordPolar(double plon, double plat)
+	{
+		lon = plon;
+		lat = plat;
+	}
+	inline CordPolar(const CordPolar& pol)
+	{
+		lon = pol.lon;
+		lat = pol.lat;
+	}
+	inline CordPolar()
+	{
+		lon = 0;
+		lat = 0;
+	}
+	explicit inline CordPolar(const Cord&);
+};
+
 struct Cord
 {
 	double x, y, z;
-	
+
 	inline Cord(double px, double py, double pz)
 	{
 		x = px;
@@ -47,7 +70,16 @@ struct Cord
 		y = 0.0;
 		z = 0.0;
 	}
-	
+	explicit inline Cord(const CordPolar&);
+
+	inline Cord operator +()
+	{
+		return *this;
+	}
+	inline Cord operator -()
+	{
+		return Cord(-x, -y, -z);
+	}
 	inline Cord& operator *=(double d)
 	{
 		x *= d;
@@ -77,12 +109,31 @@ struct Cord
 		z -= c.z;
 		return *this;
 	}
+	inline bool operator ==(const Cord& c)
+	{
+		return AreSame(x, c.x) && AreSame(y, c.y) && AreSame(z, c.z);
+	}
+
 	inline double norm() const
 	{
-		return std::sqrt(x*x+ y*y + z*z);
+		return std::sqrt(x*x + y*y + z*z);
 	}
 };
 
+inline Cord::Cord(const CordPolar& pol)
+{
+	x = std::sin(pol.lon) * std::cos(pol.lat);
+	y = std::sin(pol.lat);
+	z = std::cos(pol.lon) * std::cos(pol.lat);
+}
+
+inline CordPolar::CordPolar(const Cord& c)
+{
+	double inv = 1/c.norm();
+	lat = asin(c.y * inv);
+	lon = atan2(c.x, c.z);
+}
+
 }//namespace OpenXcom
 #endif	/* OPENXCOM_CORD_H */
 

src/Geoscape/Globe.cpp

@@ -1149,9 +1149,9 @@ void Globe::XuLine(Surface* surface, Surface* src, double x1, double y1, double
 
 	while(len>0)
 	{
-		if (x0>0 && y0>0 && x0<surface->getWidth() && y0<surface->getHeight())
+		tcol=src->getPixel((int)x0,(int)y0);
+		if (tcol)
 		{
-			tcol=src->getPixel((int)x0,(int)y0);
 			const int d = tcol & helper::ColorGroup;
 			if(d ==  Palette::blockOffset(12) || d ==  Palette::blockOffset(13))
 			{
@@ -1523,57 +1523,39 @@ void Globe::drawDetail()
 
 void Globe::drawPath(Surface *surface, double lon1, double lat1, double lon2, double lat2)
 {
-	double sx = lon2 - lon1;
-	double sy = lat2 - lat1;
-	double ln1, lt1, ln2, lt2, dln, dlt;
-	double slen, dlen;
-	int seg;
+	double length;
+	Sint16 count;
 	Sint16 x1, y1, x2, y2;
+	CordPolar p1, p2;
+	Cord a(CordPolar(lon1, lat1));
+	Cord b(CordPolar(lon2, lat2));
 
-	if (sx<0) sx += 2*M_PI;
-
-	if (fabs(sx)<0.01)
-	{
-		seg = abs( sy/(2*M_PI)*48 );
-		if (seg == 0) ++seg;
-	}
-	else
-	{
-		seg = abs( sx/(2*M_PI)*96 );
-		if (seg == 0) ++seg;
-	}
-	sx /= seg;
-	sy /= seg;
-	slen = sqrt(sx * sx + sy * sy);
+	if(-b == a)
+		return;
 
-	ln2 = lon1;
-	lt2 = lat1;
+	b -= a;
 
-	for (int i = 0; i < seg; ++i)
+	//longer path have more parts
+	length = b.norm();
+	length *= length*15;
+	count = length + 1;
+	b /= count;
+	p1 = CordPolar(a);
+	polarToCart(p1.lon, p1.lat, &x1, &y1);
+	for(int i = 0; i < count; ++i)
 	{
-		ln1 = ln2;
-		lt1 = lt2;
-		dln = sin(lon2 - ln1) * cos(lat2);
-		dlt = cos(lt1) * sin(lat2) - sin(lt1) * cos(lat2) * cos(lon2 - ln1);
-		dlen = sqrt(dln * dln + dlt * dlt);
-		dlt = dlt / dlen * slen;
-		dln = dln / dlen * slen / cos(lt1 + dlt);
-		ln2 = ln1 + dln;
-		lt2 = lt2 + dlt;
-
-		if (M_PI - fabs(fabs(lon2 - ln2) - M_PI) < 0.05 && M_PI - fabs(fabs(lat2 - lt2) - M_PI) < 0.05)
-		{
-			ln2 = lon2;
-			lt2 = lat2;
-			i = seg;
-		}
+		a += b;
+		p2 = CordPolar(a);
+		polarToCart(p2.lon, p2.lat, &x2, &y2);
 
-		if (!pointBack(ln2, lt2) && !pointBack(ln1, lt1))
+		if (!pointBack(p1.lon, p1.lat) && !pointBack(p2.lon, p2.lat))
 		{
-			polarToCart(ln1,lt1,&x1,&y1);
-			polarToCart(ln2,lt2,&x2,&y2);
 			XuLine(surface, this, x1, y1, x2, y2, 8);
 		}
+
+		p1 = p2;
+		x1 = x2;
+		y1 = y2;
 	}
 }