Refactored verses parser.

git-svn-id: svn://svn.renegadeprojects.com/yrpp/trunk@284 bbc44d77-a14d-0410-bbfb-905795908d03

Conversions.h

@@ -3,52 +3,46 @@
 
 #include <Helpers/Macro.h>
 #include <YRPP.h>
+#include <WarheadTypeClass.h>
 
 // converters
 class Conversions
 {
 public:
-	static double Str2Armor(char *buf, DWORD *specialFX) {
+	static double Str2Armor(const char *buf, WarheadFlags *whFlags) {
 		if(!buf) { return 0.0; }
+
+		bool ForceFire = true;
+		bool Retaliate = true;
+		bool PassiveAcquire = true;
+
 		if(strchr(buf, '%')) {
-			bool specialed = false;
+
 			if(strlen(buf) == 2) {
 				switch(*buf) {
 					case '0':
-						*specialFX &= ~verses_ForceFire;
+						ForceFire = false;
 					case '1':
-						*specialFX &= ~verses_Retaliate;
+						Retaliate = false;
 					case '2':
-						*specialFX &= ~verses_PassiveAcquire;
-						specialed = true;
+						PassiveAcquire = false;
 						break;
 				}
 			}
-			if(!specialed) {
-				*specialFX |= verses_ForceFire;
-				*specialFX |= verses_Retaliate;
-				*specialFX |= verses_PassiveAcquire;
-			}
+			whFlags->ForceFire = ForceFire;
+			whFlags->Retaliate = Retaliate;
+			whFlags->PassiveAcquire = PassiveAcquire;
 			return atoi(buf) * 0.01;
 		} else {
 			double vs = atof(buf);
-			bool specialed = false;
-			if(CLOSE_ENOUGH(vs, 0.02)) {
-				*specialFX &= ~verses_PassiveAcquire;
-				specialed = true;
-			}
-			if(CLOSE_ENOUGH(vs, 0.01)) {
-				*specialFX &= ~verses_Retaliate;
-				specialed = true;
+			if(LESS_EQUAL(vs, 0.02)) {
+				whFlags->PassiveAcquire = PassiveAcquire;
 			}
-			if(CLOSE_ENOUGH(vs, 0.00)) {
-				*specialFX &= ~verses_ForceFire;
-				specialed = true;
+			if(LESS_EQUAL(vs, 0.01)) {
+				whFlags->Retaliate = Retaliate;
 			}
-			if(!specialed) {
-				*specialFX |= verses_ForceFire;
-				*specialFX |= verses_Retaliate;
-				*specialFX |= verses_PassiveAcquire;
+			if(LESS_EQUAL(vs, 0.00)) {
+				whFlags->ForceFire = ForceFire;
 			}
 			return vs;
 		}

GeneralDefinitions.h

@@ -885,14 +885,6 @@ typedef int eTargetFlags;
 #define	ttf_Occupiable		0x8000
 #define	ttf_TechCapture		0x10000
 
-
-typedef int eWarheadFlags;
-
-#define	verses_ForceFire	0x1
-#define	verses_Retaliate	0x2
-#define	verses_PassiveAcquire	0x4
-
-
 typedef int eBlitterFlags;
 
 #define	bf_001		0x1

Helpers/Macro.h

@@ -53,4 +53,7 @@
 #define CLOSE_ENOUGH(x, y) \
 	(fabs(x - y) < 0.001)
 
+#define LESS_EQUAL(x, y) \
+	((x - y) <= 0.001)
+
 #endif

WarheadTypeClass.h

@@ -12,6 +12,14 @@ class AnimTypeClass;
 class ParticleTypeClass;
 class VoxelAnimTypeClass;
 
+struct WarheadFlags {
+	bool ForceFire : 1;
+	bool Retaliate : 1;
+	bool PassiveAcquire : 1;
+
+	WarheadFlags(bool FF = true, bool Retal = true, bool Acquire = true) : ForceFire(FF), Retaliate(Retal), PassiveAcquire(Acquire) {};
+};
+
 class WarheadTypeClass : public AbstractTypeClass
 {
 public: