From: Laszlo T. <ave...@us...> - 2004-09-13 16:53:53
|
Update of /cvsroot/gemrb/gemrb/gemrb/plugins/ACMImporter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28925/plugins/ACMImporter Modified Files: AmbientMgrAL.cpp Log Message: msvc 7.0 compatibility fixes after the changes of x,y -> Point Index: AmbientMgrAL.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/ACMImporter/AmbientMgrAL.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AmbientMgrAL.cpp 29 Aug 2004 01:19:01 -0000 1.1 --- AmbientMgrAL.cpp 13 Sep 2004 16:53:13 -0000 1.2 *************** *** 178,182 **** printf("Invalid SoundResRef: %.8s, Dequeueing...\n",a->sounds[i]); free(a->sounds[i]); ! a->sounds.erase(a->sounds.begin() + i); } else { buffers.push_back(buffer); --- 178,182 ---- printf("Invalid SoundResRef: %.8s, Dequeueing...\n",a->sounds[i]); free(a->sounds[i]); ! a->sounds.erase(a->sounds.begin() + i); } else { buffers.push_back(buffer); *************** *** 291,297 **** bool AmbientMgrAL::AmbientSource::isHeard(const Point &listener) const { ! float xdist = listener.x - ambient->getOrigin().x; ! float ydist = listener.y - ambient->getOrigin().y; ! float dist = sqrt(xdist * xdist + ydist * ydist); return dist < ambient->getRadius(); } --- 291,297 ---- bool AmbientMgrAL::AmbientSource::isHeard(const Point &listener) const { ! int xdist =listener.x - ambient->getOrigin().x; ! int ydist =listener.y - ambient->getOrigin().y; ! int dist = (int) sqrt( (double) (xdist * xdist + ydist * ydist) ); return dist < ambient->getRadius(); } |