Revision: 2426
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2426&view=rev
Author: rorthomas
Date: 2012-02-01 22:27:51 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
converted ugly #define to enum
Modified Paths:
--------------
trunk/source/main/audio/SoundScriptManager.h
Modified: trunk/source/main/audio/SoundScriptManager.h
===================================================================
--- trunk/source/main/audio/SoundScriptManager.h 2012-02-01 21:39:38 UTC
(rev 2425)
+++ trunk/source/main/audio/SoundScriptManager.h 2012-02-01 22:27:51 UTC
(rev 2426)
@@ -39,100 +39,105 @@
#define PITCHDOWN_CUTOFF_FACTOR 5.0
//list of sound triggers
-#define SS_TRIG_NONE -1
-#define SS_TRIG_ENGINE 0
-#define SS_TRIG_AEROENGINE1 1
-#define SS_TRIG_AEROENGINE2 2
-#define SS_TRIG_AEROENGINE3 3
-#define SS_TRIG_AEROENGINE4 4
-#define SS_TRIG_HORN 5
-#define SS_TRIG_BRAKE 6
-#define SS_TRIG_PUMP 7
-#define SS_TRIG_STARTER 8
-#define SS_TRIG_ALWAYSON 9
-#define SS_TRIG_REPAIR 10
-#define SS_TRIG_AIR 11
-#define SS_TRIG_GPWS_APDISCONNECT 12
-#define SS_TRIG_GPWS_10 13
-#define SS_TRIG_GPWS_20 14
-#define SS_TRIG_GPWS_30 15
-#define SS_TRIG_GPWS_40 16
-#define SS_TRIG_GPWS_50 17
-#define SS_TRIG_GPWS_100 18
-#define SS_TRIG_GPWS_PULLUP 19
-#define SS_TRIG_GPWS_MINIMUMS 20
-#define SS_TRIG_AIR_PURGE 21
-#define SS_TRIG_SHIFT 22
-#define SS_TRIG_GEARSLIDE 23
-#define SS_TRIG_CREAK 24
-#define SS_TRIG_BREAK 25
-#define SS_TRIG_SCREETCH 26
-#define SS_TRIG_PARK 27
-#define SS_TRIG_AFTERBURNER1 28
-#define SS_TRIG_AFTERBURNER2 29
-#define SS_TRIG_AFTERBURNER3 30
-#define SS_TRIG_AFTERBURNER4 31
-#define SS_TRIG_AFTERBURNER5 32
-#define SS_TRIG_AFTERBURNER6 33
-#define SS_TRIG_AFTERBURNER7 34
-#define SS_TRIG_AFTERBURNER8 35
-#define SS_TRIG_AEROENGINE5 36
-#define SS_TRIG_AEROENGINE6 37
-#define SS_TRIG_AEROENGINE7 38
-#define SS_TRIG_AEROENGINE8 39
-#define SS_TRIG_AOA 40
-#define SS_TRIG_IGNITION 41
-#define SS_TRIG_REVERSE_GEAR 42
-#define SS_TRIG_TURN_SIGNAL 43
-#define SS_TRIG_ALB_ACTIVE 44
-#define SS_TRIG_TC_ACTIVE 45
-#define SS_TRIG_AVICHAT01 46
-#define SS_TRIG_AVICHAT02 47
-#define SS_TRIG_AVICHAT03 48
-#define SS_TRIG_AVICHAT04 49
-#define SS_TRIG_AVICHAT05 50
-#define SS_TRIG_AVICHAT06 51
-#define SS_TRIG_AVICHAT07 52
-#define SS_TRIG_AVICHAT08 53
-#define SS_TRIG_AVICHAT09 54
-#define SS_TRIG_AVICHAT10 55
-#define SS_TRIG_AVICHAT11 56
-#define SS_TRIG_AVICHAT12 57
-#define SS_TRIG_AVICHAT13 58
-#define SS_MAX_TRIG 59
+enum {
+ SS_TRIG_NONE = -1,
+ SS_TRIG_ENGINE = 0,
+ SS_TRIG_AEROENGINE1,
+ SS_TRIG_AEROENGINE2,
+ SS_TRIG_AEROENGINE3,
+ SS_TRIG_AEROENGINE4,
+ SS_TRIG_HORN,
+ SS_TRIG_BRAKE,
+ SS_TRIG_PUMP,
+ SS_TRIG_STARTER,
+ SS_TRIG_ALWAYSON,
+ SS_TRIG_REPAIR,
+ SS_TRIG_AIR,
+ SS_TRIG_GPWS_APDISCONNECT,
+ SS_TRIG_GPWS_10,
+ SS_TRIG_GPWS_20,
+ SS_TRIG_GPWS_30,
+ SS_TRIG_GPWS_40,
+ SS_TRIG_GPWS_50,
+ SS_TRIG_GPWS_100,
+ SS_TRIG_GPWS_PULLUP,
+ SS_TRIG_GPWS_MINIMUMS,
+ SS_TRIG_AIR_PURGE,
+ SS_TRIG_SHIFT,
+ SS_TRIG_GEARSLIDE,
+ SS_TRIG_CREAK,
+ SS_TRIG_BREAK,
+ SS_TRIG_SCREETCH,
+ SS_TRIG_PARK,
+ SS_TRIG_AFTERBURNER1,
+ SS_TRIG_AFTERBURNER2,
+ SS_TRIG_AFTERBURNER3,
+ SS_TRIG_AFTERBURNER4,
+ SS_TRIG_AFTERBURNER5,
+ SS_TRIG_AFTERBURNER6,
+ SS_TRIG_AFTERBURNER7,
+ SS_TRIG_AFTERBURNER8,
+ SS_TRIG_AEROENGINE5,
+ SS_TRIG_AEROENGINE6,
+ SS_TRIG_AEROENGINE7,
+ SS_TRIG_AEROENGINE8,
+ SS_TRIG_AOA,
+ SS_TRIG_IGNITION,
+ SS_TRIG_REVERSE_GEAR,
+ SS_TRIG_TURN_SIGNAL,
+ SS_TRIG_ALB_ACTIVE,
+ SS_TRIG_TC_ACTIVE,
+ SS_TRIG_AVICHAT01,
+ SS_TRIG_AVICHAT02,
+ SS_TRIG_AVICHAT03,
+ SS_TRIG_AVICHAT04,
+ SS_TRIG_AVICHAT05,
+ SS_TRIG_AVICHAT06,
+ SS_TRIG_AVICHAT07,
+ SS_TRIG_AVICHAT08,
+ SS_TRIG_AVICHAT09,
+ SS_TRIG_AVICHAT10,
+ SS_TRIG_AVICHAT11,
+ SS_TRIG_AVICHAT12,
+ SS_TRIG_AVICHAT13,
+ SS_MAX_TRIG
+};
//list of modulation sources
-#define SS_MOD_NONE 0
-#define SS_MOD_ENGINE 1
-#define SS_MOD_TURBO 2
-#define SS_MOD_AEROENGINE1 3
-#define SS_MOD_AEROENGINE2 4
-#define SS_MOD_AEROENGINE3 5
-#define SS_MOD_AEROENGINE4 6
-#define SS_MOD_WHEELSPEED 7
-#define SS_MOD_INJECTOR 8
-#define SS_MOD_TORQUE 9
-#define SS_MOD_GEARBOX 10
-#define SS_MOD_CREAK 11
-#define SS_MOD_BREAK 12
-#define SS_MOD_SCREETCH 13
-#define SS_MOD_PUMP 14
-#define SS_MOD_THROTTLE1 15
-#define SS_MOD_THROTTLE2 16
-#define SS_MOD_THROTTLE3 17
-#define SS_MOD_THROTTLE4 18
-#define SS_MOD_THROTTLE5 19
-#define SS_MOD_THROTTLE6 20
-#define SS_MOD_THROTTLE7 21
-#define SS_MOD_THROTTLE8 22
-#define SS_MOD_AEROENGINE5 23
-#define SS_MOD_AEROENGINE6 24
-#define SS_MOD_AEROENGINE7 25
-#define SS_MOD_AEROENGINE8 26
-#define SS_MOD_AIRSPEED 27
-#define SS_MOD_AOA 28
-#define SS_MAX_MOD 29
+enum {
+ SS_MOD_NONE,
+ SS_MOD_ENGINE,
+ SS_MOD_TURBO,
+ SS_MOD_AEROENGINE1,
+ SS_MOD_AEROENGINE2,
+ SS_MOD_AEROENGINE3,
+ SS_MOD_AEROENGINE4,
+ SS_MOD_WHEELSPEED,
+ SS_MOD_INJECTOR,
+ SS_MOD_TORQUE,
+ SS_MOD_GEARBOX,
+ SS_MOD_CREAK,
+ SS_MOD_BREAK,
+ SS_MOD_SCREETCH,
+ SS_MOD_PUMP,
+ SS_MOD_THROTTLE1,
+ SS_MOD_THROTTLE2,
+ SS_MOD_THROTTLE3,
+ SS_MOD_THROTTLE4,
+ SS_MOD_THROTTLE5,
+ SS_MOD_THROTTLE6,
+ SS_MOD_THROTTLE7,
+ SS_MOD_THROTTLE8,
+ SS_MOD_AEROENGINE5,
+ SS_MOD_AEROENGINE6,
+ SS_MOD_AEROENGINE7,
+ SS_MOD_AEROENGINE8,
+ SS_MOD_AIRSPEED,
+ SS_MOD_AOA,
+ SS_MAX_MOD
+};
+
class SoundScriptTemplate
{
public:
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
