Revision: 2492
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2492&view=rev
Author: ulteq
Date: 2012-05-02 06:40:28 +0000 (Wed, 02 May 2012)
Log Message:
-----------
-Cleanup++
Modified Paths:
--------------
trunk/source/main/audio/Sound.cpp
trunk/source/main/audio/SoundScriptManager.cpp
trunk/source/main/gameplay/CacheSystem.cpp
trunk/source/main/gui/SelectorWindow.cpp
Modified: trunk/source/main/audio/Sound.cpp
===================================================================
--- trunk/source/main/audio/Sound.cpp 2012-05-02 05:25:12 UTC (rev 2491)
+++ trunk/source/main/audio/Sound.cpp 2012-05-02 06:40:28 UTC (rev 2492)
@@ -25,8 +25,8 @@
using namespace Ogre;
-Sound::Sound(ALuint _buffer, SoundManager *soundManager, int sourceIndex) :
- buffer(_buffer)
+Sound::Sound(ALuint buffer, SoundManager *soundManager, int sourceIndex) :
+ buffer(buffer)
, soundManager(soundManager)
, sourceIndex(sourceIndex)
, audibility(0.0f)
@@ -51,7 +51,7 @@
}
// First check if the sound is finished!
- if (!loop && should_play && hardware_index!=-1)
+ if (!loop && should_play && hardware_index != -1)
{
int value = 0;
alGetSourcei((ALuint)soundManager->getHardwareSource(hardware_index),
AL_SOURCE_STATE, &value);
@@ -96,7 +96,7 @@
void Sound::setEnabled(bool e)
{
enabled = e;
- soundManager->recomputeSource(sourceIndex, REASON_PLAY, 0, NULL);
+ soundManager->recomputeSource(sourceIndex, REASON_PLAY, 0.0f, NULL);
}
bool Sound::getEnabled()
@@ -107,13 +107,13 @@
void Sound::play()
{
should_play = true;
- soundManager->recomputeSource(sourceIndex, REASON_PLAY, 0, NULL);
+ soundManager->recomputeSource(sourceIndex, REASON_PLAY, 0.0f, NULL);
}
void Sound::stop()
{
should_play = false;
- soundManager->recomputeSource(sourceIndex, REASON_STOP, 0, NULL);
+ soundManager->recomputeSource(sourceIndex, REASON_STOP, 0.0f, NULL);
}
void Sound::setGain(float gain)
@@ -137,13 +137,13 @@
void Sound::setPosition(Ogre::Vector3 pos)
{
this->position = pos;
- soundManager->recomputeSource(sourceIndex, REASON_POSN, 0, &pos);
+ soundManager->recomputeSource(sourceIndex, REASON_POSN, 0.0f, &pos);
}
void Sound::setVelocity(Ogre::Vector3 vel)
{
this->velocity = vel;
- soundManager->recomputeSource(sourceIndex, REASON_VLCT, 0, &vel);
+ soundManager->recomputeSource(sourceIndex, REASON_VLCT, 0.0f, &vel);
}
#endif // USE_OPENAL
Modified: trunk/source/main/audio/SoundScriptManager.cpp
===================================================================
--- trunk/source/main/audio/SoundScriptManager.cpp 2012-05-02 05:25:12 UTC
(rev 2491)
+++ trunk/source/main/audio/SoundScriptManager.cpp 2012-05-02 06:40:28 UTC
(rev 2492)
@@ -40,9 +40,9 @@
soundsDisabled(false)
, loadingBase(false)
, instance_counter(0)
- , maxDistance(500.0)
- , rolloffFactor(1.0)
- , referenceDistance(7.5)
+ , maxDistance(500.0f)
+ , rolloffFactor(1.0f)
+ , referenceDistance(7.5f)
{
for (int i=0; i < SS_MAX_TRIG; i++)
{
@@ -417,7 +417,6 @@
}
}
-
void SoundScriptManager::skipToNextCloseBrace(DataStreamPtr& stream)
{
String line = "";
@@ -448,8 +447,8 @@
//=====================================================================
-SoundScriptTemplate::SoundScriptTemplate(String name, String groupname, String
filename, bool _baseTemplate) :
- baseTemplate(_baseTemplate)
+SoundScriptTemplate::SoundScriptTemplate(String name, String groupname, String
filename, bool baseTemplate) :
+ baseTemplate(baseTemplate)
, filename(filename)
, free_sound(0)
, gain_multiplier(1.0f)
Modified: trunk/source/main/gameplay/CacheSystem.cpp
===================================================================
--- trunk/source/main/gameplay/CacheSystem.cpp 2012-05-02 05:25:12 UTC (rev
2491)
+++ trunk/source/main/gameplay/CacheSystem.cpp 2012-05-02 06:40:28 UTC (rev
2492)
@@ -38,14 +38,13 @@
using namespace RoR; // CSHA1
-CacheSystem::CacheSystem()
+CacheSystem::CacheSystem() :
+ changedFiles(0)
+ , deletedFiles(0)
+ , newFiles(0)
+ , rgcounter(0)
+ , smgr(0)
{
- rgcounter = 0;
- changedFiles = 0;
- newFiles = 0;
- deletedFiles = 0;
- smgr = 0;
-
// register the extensions
known_extensions.push_back("machine");
known_extensions.push_back("fixed");
Modified: trunk/source/main/gui/SelectorWindow.cpp
===================================================================
--- trunk/source/main/gui/SelectorWindow.cpp 2012-05-02 05:25:12 UTC (rev
2491)
+++ trunk/source/main/gui/SelectorWindow.cpp 2012-05-02 06:40:28 UTC (rev
2492)
@@ -344,8 +344,8 @@
// category all
mCategoryUsage[CacheSystem::CID_All]++;
- // category fresh, 24 hours = 86400
- if(ts - it->addtimestamp < 86400)
+ // category fresh
+ if(ts - it->addtimestamp < CACHE_FILE_FRESHNESS)
mCategoryUsage[CacheSystem::CID_Fresh]++;
mEntries.push_back(*it);
@@ -497,7 +497,7 @@
for(std::vector<Cache_Entry>::iterator it = mEntries.begin(); it !=
mEntries.end(); it++)
{
if(it->categoryid == categoryID || categoryID ==
CacheSystem::CID_All
-
|| categoryID == CacheSystem::CID_Fresh && (ts - it->addtimestamp < 86400)
+
|| categoryID == CacheSystem::CID_Fresh && (ts - it->addtimestamp <
CACHE_FILE_FRESHNESS)
|| categoryID == CacheSystem::CID_SearchResults && searchCompare(search_cmd,
&(*it)))
{
counter++;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Rigsofrods-devel mailing list
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
