Menu
▾
▴
[Armagetronad-commits] SF.net SVN: armagetronad:[10421] armagetronad/branches/0.4
|
From: <z-...@us...> - 2012-05-06 12:41:20
|
Revision: 10421
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10421&view=rev
Author: z-man
Date: 2012-05-06 12:41:13 +0000 (Sun, 06 May 2012)
Log Message:
-----------
Merging branch 0.2.8 from revision 10416 to 10420:
------------------------------------------------------------------------
r10420 | bazaaarmagetron | 2012-05-06 14:21:49 +0200 (Sun, 06 May 2012) | 2 lines
Manuel Moos: Initialising desired audio spec with zeroes in places we do not care about.
------------------------------------------------------------------------
r10419 | bazaaarmagetron | 2012-05-06 14:21:13 +0200 (Sun, 06 May 2012) | 2 lines
Manuel Moos: Added nTrueVersion -> rConsoleGraph dependency
(not merged, not needed)
------------------------------------------------------------------------
r10418 | bazaaarmagetron | 2012-05-05 09:12:25 +0200 (Sat, 05 May 2012) | 1 line
Daniel Lee Harple: Add ARMAGETRONAD_VERSION to env.
(adapted to new tVersion structure on merge to avoid unnecessary tTrueVersion.h include)
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10416&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10420&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10419&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10418&view=rev
Modified Paths:
--------------
armagetronad/branches/0.4/armagetronad/src/engine/eSound.cpp
armagetronad/branches/0.4/armagetronad/src/render/rConsoleCout.cpp
Property Changed:
----------------
armagetronad/branches/0.4/
Property changes on: armagetronad/branches/0.4
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10416
/armagetronad/branches/0.2.8.3:9309-10393
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10420
/armagetronad/branches/0.2.8.3:9309-10393
Modified: armagetronad/branches/0.4/armagetronad/src/engine/eSound.cpp
===================================================================
--- armagetronad/branches/0.4/armagetronad/src/engine/eSound.cpp 2012-05-06 12:21:49 UTC (rev 10420)
+++ armagetronad/branches/0.4/armagetronad/src/engine/eSound.cpp 2012-05-06 12:41:13 UTC (rev 10421)
@@ -167,6 +167,7 @@
if (!sound_is_there && sound_quality!=SOUND_OFF)
{
SDL_AudioSpec desired;
+ memset( &desired, 0, sizeof( SDL_AudioSpec ) );
switch (sound_quality)
{
Modified: armagetronad/branches/0.4/armagetronad/src/render/rConsoleCout.cpp
===================================================================
--- armagetronad/branches/0.4/armagetronad/src/render/rConsoleCout.cpp 2012-05-06 12:21:49 UTC (rev 10420)
+++ armagetronad/branches/0.4/armagetronad/src/render/rConsoleCout.cpp 2012-05-06 12:41:13 UTC (rev 10421)
@@ -31,6 +31,7 @@
#include "tConfiguration.h"
#include "tRecorder.h"
#include "tDirectories.h"
+#include "tVersion.h"
#include <map>
@@ -631,6 +632,9 @@
env.AddPath( "ARMAGETRONAD_PATH_SCREENSHOT", tDirectories::Screenshot() );
env.AddPath( "ARMAGETRONAD_PATH_RESOURCE", tDirectories::Resource() );
+ // add other data
+ env.Add( "ARMAGETRONAD_VERSION", st_programVersion );
+
// add user-specified variables
env.AddAll( sr_globalScriptEnv );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|