2008-09-26 Krzysztof Kosciuszkiewicz <[email protected]>

	* V222
	* endianness.c, endianness.h: added _SwapEquipment(), fix one mistake

ChangeLog

@@ -1,3 +1,9 @@
+2008-09-26	Krzysztof Kosciuszkiewicz <[email protected]>
+
+	* V222
+
+	* endianness.c, endianness.h: added _SwapEquipment(), fix one mistake
+
 2008-08-29	Krzysztof Kosciuszkiewicz <[email protected]>
 
 	* V221

endianness.c

@@ -80,51 +80,6 @@ void _SwapGameDat(void)
 				_Swap16bit(Data->P[j].BudgetHistoryF[i]);
 		}
 
-		for (i = 0; i < 3; i++)
-		{
-			Data->P[j].Probe[i].InitCost =
-				_Swap16bit(Data->P[j].Probe[i].InitCost);
-			Data->P[j].Probe[i].UnitWeight =
-				_Swap16bit(Data->P[j].Probe[i].UnitWeight);
-			Data->P[j].Probe[i].MaxPay =
-				_Swap16bit(Data->P[j].Probe[i].MaxPay);
-			Data->P[j].Probe[i].Safety =
-				_Swap16bit(Data->P[j].Probe[i].Safety);
-		};
-		for (i = 0; i < 5; i++)
-		{
-			Data->P[j].Rocket[i].InitCost =
-				_Swap16bit(Data->P[j].Rocket[i].InitCost);
-			Data->P[j].Rocket[i].UnitWeight =
-				_Swap16bit(Data->P[j].Rocket[i].UnitWeight);
-			Data->P[j].Rocket[i].MaxPay =
-				_Swap16bit(Data->P[j].Rocket[i].MaxPay);
-			Data->P[j].Rocket[i].Safety =
-				_Swap16bit(Data->P[j].Rocket[i].Safety);
-		};
-		for (i = 0; i < 7; i++)
-		{
-			Data->P[j].Manned[i].InitCost =
-				_Swap16bit(Data->P[j].Manned[i].InitCost);
-			Data->P[j].Manned[i].UnitWeight =
-				_Swap16bit(Data->P[j].Manned[i].UnitWeight);
-			Data->P[j].Manned[i].MaxPay =
-				_Swap16bit(Data->P[j].Manned[i].MaxPay);
-			Data->P[j].Manned[i].Safety =
-				_Swap16bit(Data->P[j].Manned[i].Safety);
-		};
-		for (i = 0; i < 7; i++)
-		{
-			Data->P[j].Misc[i].InitCost =
-				_Swap16bit(Data->P[j].Misc[i].InitCost);
-			Data->P[j].Misc[i].UnitWeight =
-				_Swap16bit(Data->P[j].Misc[i].UnitWeight);
-			Data->P[j].Misc[i].MaxPay =
-				_Swap16bit(Data->P[j].Misc[i].MaxPay);
-			Data->P[j].Misc[i].Safety =
-				_Swap16bit(Data->P[j].Misc[i].Safety);
-		};
-
 		for (i = 0; i < 65; i++)
 		{
 			Data->P[j].Pool[i].Prestige =
@@ -138,9 +93,68 @@ void _SwapGameDat(void)
 				_Swap16bit(Data->P[j].PastIntel[i].num);
 
 	}
+
+	_SwapEquipment();
 	// End of GameDatSwap
 }
 
+void _SwapEquipment(void)
+{
+	int plr = 0;
+	int i = 0;
+
+	for (plr = 0; plr < 2; ++plr)
+	{
+		for (i = 0; i < 3; i++)
+		{
+			Data->P[plr].Probe[i].InitCost =
+				_Swap16bit(Data->P[plr].Probe[i].InitCost);
+			Data->P[plr].Probe[i].UnitWeight =
+				_Swap16bit(Data->P[plr].Probe[i].UnitWeight);
+			Data->P[plr].Probe[i].MaxPay =
+				_Swap16bit(Data->P[plr].Probe[i].MaxPay);
+			Data->P[plr].Probe[i].Safety =
+				_Swap16bit(Data->P[plr].Probe[i].Safety);
+		}
+
+		for (i = 0; i < 5; i++)
+		{
+			Data->P[plr].Rocket[i].InitCost =
+				_Swap16bit(Data->P[plr].Rocket[i].InitCost);
+			Data->P[plr].Rocket[i].UnitWeight =
+				_Swap16bit(Data->P[plr].Rocket[i].UnitWeight);
+			Data->P[plr].Rocket[i].MaxPay =
+				_Swap16bit(Data->P[plr].Rocket[i].MaxPay);
+			Data->P[plr].Rocket[i].Safety =
+				_Swap16bit(Data->P[plr].Rocket[i].Safety);
+		}
+
+		for (i = 0; i < 7; i++)
+		{
+			Data->P[plr].Manned[i].InitCost =
+				_Swap16bit(Data->P[plr].Manned[i].InitCost);
+			Data->P[plr].Manned[i].UnitWeight =
+				_Swap16bit(Data->P[plr].Manned[i].UnitWeight);
+			Data->P[plr].Manned[i].MaxPay =
+				_Swap16bit(Data->P[plr].Manned[i].MaxPay);
+			Data->P[plr].Manned[i].Safety =
+				_Swap16bit(Data->P[plr].Manned[i].Safety);
+		}
+
+		for (i = 0; i < 7; i++)
+		{
+			Data->P[plr].Misc[i].InitCost =
+				_Swap16bit(Data->P[plr].Misc[i].InitCost);
+			Data->P[plr].Misc[i].UnitWeight =
+				_Swap16bit(Data->P[plr].Misc[i].UnitWeight);
+			Data->P[plr].Misc[i].MaxPay =
+				_Swap16bit(Data->P[plr].Misc[i].MaxPay);
+			Data->P[plr].Misc[i].Safety =
+				_Swap16bit(Data->P[plr].Misc[i].Safety);
+		}
+	}
+}
+
 void _SwapPatchHdr(PatchHdr* hdr)
 {
 	assert(hdr);

endianness.h

@@ -5,6 +5,7 @@ uint32_t _Swap32bit(uint32_t value);
 uint16_t _Swap16bit(uint16_t value);
 float _SwapFloat(float value);
 void _SwapGameDat(void);
+void _SwapEquipment(void);
 void _SwapPatchHdr(PatchHdr *hdr);
 void _SwapPatchHdrSmall(PatchHdrSmall *hdr);
 
@@ -14,6 +15,7 @@ void _SwapPatchHdrSmall(PatchHdrSmall *hdr);
 #define Swap16bit(a)  (a) = _Swap16bit((a))
 #define SwapFloat(a)  (a) = _SwapFloat((a))
 #define SwapGameDat() _SwapGameDat()
+#define SwapEquipment() _SwapEquipment()
 #define SwapPatchHdr(a) _SwapPatchHdr((a))
 #define SwapPatchHdrSmall(a) _SwapPatchHdrSmall((a))
 
@@ -22,7 +24,8 @@ void _SwapPatchHdrSmall(PatchHdrSmall *hdr);
 #define Swap32bit(a)
 #define Swap16bit(a)
 #define SwapFloat(a)
-#define SwapGameDat(a)
+#define SwapGameDat()
+#define SwapEquipment()
 #define SwapPatchHdr(a)
 #define SwapPatchHdrSmall(a)
 

version.c

@@ -1 +1 @@
-221
+222