[Decaldev-cvscommit] source: Fixed IconOutline, verified order of all Flag2 values

[John D. <go...@us...>]

Log Message:
-----------
Fixed IconOutline, verified order of all Flag2 values

Modified Files:
--------------
    /cvsroot/decaldev/source/DecalFilters:
        World.cpp

Revision Data
-------------
Index: World.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/World.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- World.cpp	13 Sep 2003 17:57:09 -0000	1.54
+++ World.cpp	14 Sep 2003 19:25:55 -0000	1.55
@@ -238,7 +238,7 @@
 	SysReAllocString( &strunknown_v0_3, L"unknown_v0_3" );
 	SysReAllocString( &strunknown_v2, L"unknown_v2" );
 	SysReAllocString( &strunknown_v4, L"unknown_v4" );
-	SysReAllocString( &strunknown_v4, L"unknown_v5" );
+	SysReAllocString( &strunknown_v5, L"unknown_v5" );
 	SysReAllocString( &strunknown_w1, L"unknown_w1" );
 	SysReAllocString( &strunknown10, L"unknown10" );
 	SysReAllocString( &strunknown11b, L"unknown11b" );
@@ -1276,6 +1276,12 @@
 		pCreate->m_Slot.type = 1 ;
 	}
 
+	// Missile Type
+	if (pCreate->m_dwFlags2 & 0x00000100) {
+		pMembers->get_NextInt(strunknown_w1, &pCreate->m_MissileType);
+		_DebugLog("\n   m_MissileType %x",pCreate->m_MissileType) ;
+	}
+
 	// Value
 	if (pCreate->m_dwFlags2 & 0x00000008) {
 		pMembers->get_NextInt(strvalue, &pCreate->m_dwValue);
@@ -1309,14 +1315,9 @@
 
 	// Icon Outline
 	if (pCreate->m_dwFlags2 & 0x00000080) {
+		_DebugLog("\n   m_IconOutline:", pCreate->m_IconOutline) ;
 		pMembers->get_NextInt(strunknown_v4, &pCreate->m_IconOutline);
-		_DebugLog("\n   m_IconOutline %x",pCreate->m_IconOutline) ;
-	}
-
-	// Missile Type
-	if (pCreate->m_dwFlags2 & 0x00000100) {
-		pMembers->get_NextInt(strunknown_w1, &pCreate->m_MissileType);
-		_DebugLog("\n   m_MissileType %x",pCreate->m_MissileType) ;
+		_DebugLog(" %x",pCreate->m_IconOutline) ;
 	}
 
 	// Equip Type
@@ -1429,7 +1430,7 @@
 
 
 	// Hook Type
-	if (pCreate->m_dwFlags2 & 0x10000000) {
+	if (pCreate->m_dwFlags2 & 0x20000000) {
 		pMembers->get_NextInt(strunknown11b, &pCreate->m_HookType);
 		_DebugLog("\n   m_HookType: %x",pCreate->m_HookType) ;
 	}