Revision: 2405
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2405&view=rev
Author: rorthomas
Date: 2012-01-31 03:09:26 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
sound volume integrated
Modified Paths:
--------------
trunk/source/main/audio/SoundManager.cpp
trunk/source/main/physics/Beam.cpp
Modified: trunk/source/main/audio/SoundManager.cpp
===================================================================
--- trunk/source/main/audio/SoundManager.cpp 2012-01-31 02:51:47 UTC (rev
2404)
+++ trunk/source/main/audio/SoundManager.cpp 2012-01-31 03:09:26 UTC (rev
2405)
@@ -52,9 +52,8 @@
LOG("Opening Device: '"+String(str)+"'");
+ master_volume = FSETTING("Sound Volume") / 100.0f;
- // TODO: Init the master_volume
-
for (int i=0; i<MAX_HARDWARE_SOURCES; i++) m_hardware_sources_map[i]=-1;
// We loop alcOpenDevice() because there is a potential race condition
with the asynchronous DSound enumeration callback
Modified: trunk/source/main/physics/Beam.cpp
===================================================================
--- trunk/source/main/physics/Beam.cpp 2012-01-31 02:51:47 UTC (rev 2404)
+++ trunk/source/main/physics/Beam.cpp 2012-01-31 03:09:26 UTC (rev 2405)
@@ -296,7 +296,7 @@
}
Beam::Beam(int tnum, SceneManager *manager, SceneNode *parent, RenderWindow*
win, Network *_net, float *_mapsizex, float *_mapsizez, Real px, Real py, Real
pz, Quaternion rot, const char* fname, Collisions *icollisions, HeightFinder
*mfinder, Water *w, Camera *pcam, bool networked, bool networking,
collision_box_t *spawnbox, bool ismachine, int _flaresMode,
std::vector<Ogre::String> *_truckconfig, Skin *skin, bool freeposition) : \
- deleting(false)
+ deleting(false), dash(nullptr)
{
#ifdef USE_MYGUI
dash = new DashBoardManager();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Rigsofrods-devel mailing list
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
