- Fixed collision bug.

- Added firing sound, hit sound and bullet sprites.

Author: tomvd

src/Battlescape/BattleAction.cpp

@@ -29,6 +29,7 @@
 #include "../Engine/RNG.h"
 #include "../Engine/SoundSet.h"
 #include "../Engine/Sound.h"
+#include "../Ruleset/RuleItem.h"
 
 
 namespace OpenXcom
@@ -78,10 +79,11 @@ void BattleAction::start()
 	else if (_type == SNAP_SHOT)
 	{
 		_save->getSelectedUnit()->aim(true);
-		_projectile = new Projectile(_res, _save, _save->getSelectedUnit()->getPosition(), _target);
+		_projectile = new Projectile(_res, _save, _save->getSelectedUnit()->getPosition(), _target, _item->getRules()->getBulletSprite());
 		if (_projectile->calculateTrajectory())
 		{
 			_status = INPROGRESS;
+			_res->getSoundSet("BATTLE.CAT")->getSound(_item->getRules()->getFireSound())->play();
 		}
 		else
 		{
@@ -135,6 +137,7 @@ void BattleAction::moveBullet()
 		if(!_projectile->move())
 		{
 			// impact !
+			_res->getSoundSet("BATTLE.CAT")->getSound(_item->getRules()->getHitSound())->play();
 			_position = _projectile->getPosition(-1);
 			delete _projectile;
 			_projectile = 0;

src/Battlescape/Map.cpp

@@ -329,33 +329,6 @@ void Map::drawTerrain(Surface *surface)
 
 					// Draw items
 
-					// check if we got bullet
-					if (_action && _action->getProjectileType() > 0 && bulletPosition == mapPosition)
-					{
-						for (int i=1;i<_action->getProjectileParticle(0);i++)
-						{
-							if (_action->getProjectileParticle(i) != 0xFF)
-							{
-								Position voxelPos = _action->getPosition(1-i);
-								convertVoxelToScreen(voxelPos, &bulletPosition);
-								_bullet[i]->setX(bulletPosition.x);
-								_bullet[i]->setY(bulletPosition.y);
-								_bullet[i]->blit(surface);
-							}
-						}
-					}
-					// check if we got impact
-					if (_action && _action->getType()==HIT && bulletPosition == mapPosition)
-					{
-						Position voxelPos = _action->getPosition();
-						convertVoxelToScreen(voxelPos, &bulletPosition);
-						frame = _res->getSurfaceSet("SMOKE.PCK")->getFrame(26+_action->getAnimFrame());
-						frame->setX(bulletPosition.x - (_spriteWidth / 2));
-						frame->setY(bulletPosition.y - (_spriteHeight / 2));
-						frame->blit(surface);
-					}
-
-
 					// Draw soldier
 					if (unit)
 					{
@@ -397,6 +370,32 @@ void Map::drawTerrain(Surface *surface)
 						}
 					}
 
+										// check if we got bullet
+					if (_action && _action->getProjectileType() > 0 && bulletPosition == mapPosition)
+					{
+						for (int i=1;i<_action->getProjectileParticle(0);i++)
+						{
+							if (_action->getProjectileParticle(i) != 0xFF)
+							{
+								Position voxelPos = _action->getPosition(1-i);
+								convertVoxelToScreen(voxelPos, &bulletPosition);
+								_bullet[i]->setX(bulletPosition.x);
+								_bullet[i]->setY(bulletPosition.y);
+								_bullet[i]->blit(surface);
+							}
+						}
+					}
+					// check if we got impact
+					if (_action && _action->getType()==HIT && bulletPosition == mapPosition)
+					{
+						Position voxelPos = _action->getPosition();
+						convertVoxelToScreen(voxelPos, &bulletPosition);
+						frame = _res->getSurfaceSet("SMOKE.PCK")->getFrame(26 + _action->getAnimFrame());
+						frame->setX(bulletPosition.x - (_spriteWidth / 2));
+						frame->setY(bulletPosition.y - (_spriteHeight / 2));
+						frame->blit(surface);
+					}
+
 					// Draw cursor front
 					if (_selectorX == itY && _selectorY == itX && _cursorType != CT_NONE)
 					{

src/Battlescape/Projectile.cpp

@@ -57,10 +57,11 @@ const int Projectile::_trail[11][36] = {
  * @param save Pointer to battlesavegame.
  * @param origin Projectile's start position in tile x/y/z.
  * @param target Projectile's target position in tile x/y/z.
+ * @param bulletType
  */
-Projectile::Projectile(ResourcePack *res, SavedBattleGame *save, Position origin, Position target) : _res(res), _save(save), _origin(origin), _target(target), _position(0)
+Projectile::Projectile(ResourcePack *res, SavedBattleGame *save, Position origin, Position target, int bulletType) : _res(res), _save(save), _origin(origin), _target(target), _position(0), _bulletType(bulletType)
 {
-	_bulletType=4; // test
+
 }
 
 /**

src/Battlescape/Projectile.h

@@ -49,7 +49,7 @@ class Projectile
 	int voxelCheck(const Position& voxel);
 public:
 	/// Creates a new Projectile.
-	Projectile(ResourcePack *res, SavedBattleGame *save, Position _origin, Position _target);
+	Projectile(ResourcePack *res, SavedBattleGame *save, Position _origin, Position _target, int bulletType);
 	/// Cleans up the Projectile.
 	~Projectile();
 	/// Calculates the trajectory.

src/Ruleset/MapDataSet.cpp

@@ -176,8 +176,6 @@ void MapDataSet::load(ResourcePack *res)
 		to->setFlammable((int)mcd.Flammable);
 		to->setFuel((int)mcd.Fuel);
 
-
-
 		// build the 3D voxel model for this object using the loft references
 		model = new MapModel();
 		for (int layer = 0; layer < 12; layer++)
@@ -197,14 +195,15 @@ void MapDataSet::load(ResourcePack *res)
 			{
 				delete model;
 				model = 0;
-				to->setModel(*i);
+				to->setModel((MapModel*)(*i));
 				found = true;
 			}
 		}
 		if (!found)
 		{
 			_models.push_back(model);
 			to->setModel(model);
+			model = 0;
 		}
 	}
 

src/Ruleset/MapModel.cpp

@@ -109,8 +109,6 @@ int MapModel::getHeight() const
 void MapModel::set16Voxels(Uint16 voxels, int y, int z)
 {
 	_voxels[z * _length + y] = voxels;
-	// recalculate checksum each time?
-	_checksum = fletcher32(_voxels, (_width/16) * _length * _height);
 }
 
 /**
@@ -128,39 +126,18 @@ bool MapModel::getVoxel(int x, int y, int z) const
 }
 
 /**
-* The equals function. Compares two checksums of mapmodel objects with their checksum.
+* The equals function.
 * @param mapModel
 * @return bool
 */
-bool MapModel::equals (const MapModel *mapModel) const
+bool MapModel::equals (const MapModel *mapModel)
 {
-	return _checksum == mapModel->_checksum;
-}
-
-/**
-* Calculates a checksum. Used to compare two models.
-* @param data Pointer to the data.
-* @param len Length of the data.
-* @return Uint32 a 32bit checksum.
-*/
-Uint32 MapModel::fletcher32( Uint16 *data, size_t len )
-{
-        Uint32 sum1 = 0xffff, sum2 = 0xffff;
- 
-        while (len) {
-                unsigned tlen = len > 360 ? 360 : len;
-                len -= tlen;
-                do {
-                        sum1 += *data++;
-                        sum2 += sum1;
-                } while (--tlen);
-                sum1 = (sum1 & 0xffff) + (sum1 >> 16);
-                sum2 = (sum2 & 0xffff) + (sum2 >> 16);
-        }
-        /* Second reduction step to reduce sums to 16 bits */
-        sum1 = (sum1 & 0xffff) + (sum1 >> 16);
-        sum2 = (sum2 & 0xffff) + (sum2 >> 16);
-        return sum2 << 16 | sum1;
+	for (int i=0; i < (_width/16) * _length * _height; i++)
+	{
+		if (this->_voxels[i] != mapModel->_voxels[i])
+			return false;
+	}
+	return true;
 }
 
 }

src/Ruleset/MapModel.h

@@ -37,8 +37,6 @@ class MapModel
 private:
 	int _width, _length, _height;
 	Uint16 *_voxels;
-	Uint32 fletcher32( Uint16 *data, size_t len );
-	Uint32 _checksum;
 public:
 	MapModel(int width = 16, int length = 16, int height = 24);
 	~MapModel();
@@ -55,7 +53,7 @@ class MapModel
 	/// Get a single voxel.
 	bool getVoxel(int x, int y, int z) const;
 	/// Equals function.
-    bool equals (const MapModel *mapModel) const;
+    bool equals (const MapModel *mapModel);
 
 };
 

src/Ruleset/RuleItem.cpp

@@ -197,4 +197,77 @@ void RuleItem::setTwoHanded(bool flag)
 {
 	_twoHanded = flag;
 }
+
+/**
+ * Returns the item's bullet sprite reference.
+ * @return Sprite reference.
+ */
+int RuleItem::getBulletSprite() const
+{
+	return _bulletSprite;
+}
+
+/**
+ * Changes the item's bulet sprite reference.
+ * @param sprite Sprite reference.
+ */
+void RuleItem::setBulletSprite(int sprite)
+{
+	_bulletSprite = sprite;
+}
+
+/**
+ * Returns the item's fire sound.
+ * @return Sprite reference.
+ */
+int RuleItem::getFireSound() const
+{
+	return _fireSound;
+}
+
+/**
+ * Changes the item's fire sound..
+ * @param sprite Sprite reference.
+ */
+void RuleItem::setFireSound(int sound)
+{
+	_fireSound = sound;
+}
+
+/**
+ * Returns the item's hit sound.
+ * @return Sprite reference.
+ */
+int RuleItem::getHitSound() const
+{
+	return _hitSound;
+}
+
+/**
+ * Changes the item's fire sound..
+ * @param sprite Sprite reference.
+ */
+void RuleItem::setHitSound(int sound)
+{
+	_hitSound = sound;
+}
+
+/**
+ * Returns the item's hit sound.
+ * @return Sprite reference.
+ */
+int RuleItem::getHitAnimation() const
+{
+	return _hitAnimation;
+}
+
+/**
+ * Changes the item's fire sound..
+ * @param sprite Sprite reference.
+ */
+void RuleItem::setHitAnimation(int animation)
+{
+	_hitAnimation = animation;
+}
+
 }

src/Ruleset/RuleItem.h

@@ -37,7 +37,8 @@ class RuleItem
 	float _size;
 	int _cost, _time;
 	bool _equip, _twoHanded;
-	int _bigSprite, _floorSprite, _handSprite;
+	int _bigSprite, _floorSprite, _handSprite, _bulletSprite;
+	int _fireSound, _hitSound, _hitAnimation;
 public:
 	/// Creates a blank item ruleset.
 	RuleItem(std::string type);
@@ -64,19 +65,35 @@ class RuleItem
 	/// Gets the item's reference in BIGOBS.PCK for use in inventory.
 	int getBigSprite() const;
 	/// Sets the item's reference in BIGOBS.PCK for use in inventory.
-	void setBigSprite(int value);
+	void setBigSprite(int sprite);
 	/// Gets the item's reference in FLOOROB.PCK for use in inventory.
 	int getFloorSprite() const;
 	/// Sets the item's reference in FLOOROB.PCK for use in inventory.
-	void setFloorSprite(int value);
+	void setFloorSprite(int sprite);
 	/// Gets the item's reference in HANDOB.PCK for use in inventory.
 	int getHandSprite() const;
 	/// Sets the item's reference in HANDOB.PCK for use in inventory.
-	void setHandSprite(int value);
+	void setHandSprite(int sprite);
 	/// Gets if the item is two-handed.
 	bool getTwoHanded() const;
 	/// Sets if the item is two-handed.
 	void setTwoHanded(bool flag);
+	/// Gets the item's bullet sprite reference.
+	int getBulletSprite() const;
+	/// Sets the item's bulet sprite reference.
+	void setBulletSprite(int sprite);
+	/// Gets the item's fire sound.
+	int getFireSound() const;
+	/// Sets the item's fire sound.
+	void setFireSound(int sound);
+	/// Gets the item's hit sound.
+	int getHitSound() const;
+	/// Sets the item's hit sound.
+	void setHitSound(int sound);
+	/// Gets the item's hit animation.
+	int getHitAnimation() const;
+	/// Sets the item's hit animation.
+	void setHitAnimation(int animation);
 
 };