games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

TerrainTileObject: store ambientSound for every object

Browse Source 
Though ambient sounds won't work for heroes objects since they added separately.
This commit is contained in:
Arseniy Shestakov 2017-09-14 20:46:38 +03:00 committed by DJWarmonger
parent d96a3aa5b7
commit fc0ab5b970
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/CPlayerInterface.cpp
View File

@ -2945,16 +2945,8 @@ void CPlayerInterface::updateAmbientSounds(bool resetAll)
// We want sound for every special terrain on tile and not just one on top
for(auto & ttObj : CGI->mh->ttiles[tile.x][tile.y][tile.z].objects)
{
auto obj = ttObj.obj;
if(!obj || !obj->getAmbientSound())
continue;
// All tiles of static objects are sound sources. E.g Volcanos and special terrains
// For visitable object only their visitable tile is sound source
if(CCS->soundh->ambientCheckVisitable() && obj->isVisitable() && !obj->visitableAt(tile.x, tile.y))
continue;
updateSounds(obj->getAmbientSound().get(), dist);
if(ttObj.ambientSound)
updateSounds(ttObj.ambientSound.get(), dist);
}
if(CGI->mh->map->isCoastalTile(tile))
updateSounds("LOOPOCEA", dist);

15
client/mapHandler.cpp
View File

@ -27,6 +27,7 @@
#include "../lib/GameConstants.h"
#include "../lib/CStopWatch.h"
#include "CMT.h"
#include "CMusicHandler.h"
#include "../lib/CRandomGenerator.h"
#define ADVOPT (conf.go()->ac)
@ -318,7 +319,7 @@ void CMapHandler::initObjectRects()
cr.h = 32;
cr.x = image->width() - fx * 32 - 32;
cr.y = image->height() - fy * 32 - 32;
TerrainTileObject toAdd(obj,cr);
TerrainTileObject toAdd(obj, cr, obj->visitableAt(currTile.x, currTile.y));
if( map->isInTheMap(currTile) && // within map
@ -1216,13 +1217,13 @@ bool CMapHandler::printObject(const CGObjectInstance * obj, bool fadein)
cr.h = 32;
cr.x = fx*32;
cr.y = fy*32;
TerrainTileObject toAdd(obj, cr);
if((obj->pos.x + fx - tilesW+1)>=0 && (obj->pos.x + fx - tilesW+1)<ttiles.size()-frameW && (obj->pos.y + fy - tilesH+1)>=0 && (obj->pos.y + fy - tilesH+1)<ttiles[0].size()-frameH)
{
int3 pos(obj->pos.x + fx - tilesW + 1, obj->pos.y + fy - tilesH + 1, obj->pos.z);
TerrainTile2 & curt = ttiles[pos.x][pos.y][pos.z];
TerrainTileObject toAdd(obj, cr, obj->visitableAt(pos.x, pos.y));
if (fadein && ADVOPT.objectFading)
{
startObjectFade(toAdd, true, pos);
@ -1482,11 +1483,19 @@ bool CMapHandler::compareObjectBlitOrder(const CGObjectInstance * a, const CGObj
return false;
}
TerrainTileObject::TerrainTileObject(const CGObjectInstance * obj_, SDL_Rect rect_)
TerrainTileObject::TerrainTileObject(const CGObjectInstance * obj_, SDL_Rect rect_, bool visitablePos)
: obj(obj_),
rect(rect_),
fadeAnimKey(-1)
{
// We store information about ambient sound is here because object might disappear while sound is updating
if(obj->getAmbientSound())
{
// All tiles of static objects are sound sources. E.g Volcanos and special terrains
// For visitable object only their visitable tile is sound source
if(!CCS->soundh->ambientCheckVisitable() || !obj->isVisitable() || visitablePos)
ambientSound = obj->getAmbientSound();
}
}
TerrainTileObject::~TerrainTileObject()

3
client/mapHandler.h
View File

@ -69,8 +69,9 @@ struct TerrainTileObject
const CGObjectInstance *obj;
SDL_Rect rect;
int fadeAnimKey;
boost::optional<std::string> ambientSound;
TerrainTileObject(const CGObjectInstance *obj_, SDL_Rect rect_);
TerrainTileObject(const CGObjectInstance *obj_, SDL_Rect rect_, bool visitablePos = false);
~TerrainTileObject();
};