Log Message:
-----------
Fixed getting of workmanship and some other things.
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.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- World.cpp 5 Sep 2003 03:19:42 -0000 1.52
+++ World.cpp 8 Sep 2003 03:14:31 -0000 1.53
@@ -1301,6 +1301,12 @@
}
+ // Usage Mask
+ if (pCreate->m_dwFlags2 & 0x00080000) {
+ pMembers->get_NextInt(strunknown_v5, &pCreate->m_UsageMask);
+ _DebugLog("\n m_UsageMask: %x",pCreate->m_UsageMask) ;
+ }
+
// Icon Outline
if (pCreate->m_dwFlags2 & 0x00000080) {
pMembers->get_NextInt(strunknown_v4, &pCreate->m_IconOutline);
@@ -1383,27 +1389,20 @@
}
- // Usage Mask
- if (pCreate->m_dwFlags2 & 0x00080000) {
- pMembers->get_NextInt(strunknown_v5, &pCreate->m_UsageMask);
- _DebugLog("\n m_UsageMask: %x",pCreate->m_UsageMask) ;
- }
-
- // Monarch
- if (pCreate->m_dwFlags2 & 0x00000040) {
- pMembers->get_NextInt(strmonarch, &pCreate->m_dwMonarch);
- _DebugLog("\n Monarch: %x",pCreate->m_dwMonarch) ;
- }
+ //// Tradenote Vendor ID
+ //if (pCreate->m_dwFlags2 & 0x00020000) {
+ // pMembers->get_NextInt(strtradenoteVendor, &pCreate->m_dwTradeNoteVendor);
+ // _DebugLog("\n TradeNoteVendor: %x",pCreate->m_dwTradeNoteVendor) ;
+ //}
- // Tradenote Vendor ID
- if (pCreate->m_dwFlags2 & 0x00020000) {
- pMembers->get_NextInt(strtradenoteVendor, &pCreate->m_dwTradeNoteVendor);
- _DebugLog("\n TradeNoteVendor: %x",pCreate->m_dwTradeNoteVendor) ;
+ // Workmanship
+ if (pCreate->m_dwFlags2 & 0x01000000) {
+ pMembers->get_NextFloat(strworkmanship, &pCreate->m_Workmanship);
+ _DebugLog("\n m_Workmanship: %f", pCreate->m_Workmanship) ;
}
-
// Burden
if (pCreate->m_dwFlags2 & 0x00200000) {
pMembers->get_NextInt(strburden, &pCreate->m_Burden);
@@ -1416,13 +1415,7 @@
_DebugLog("\n m_dwAssociatedSpell: %x",pCreate->m_dwAssociatedSpell) ;
}
- // Workmanship
- if (pCreate->m_dwFlags2 & 0x01000000) {
- pMembers->get_NextFloat(strworkmanship, &pCreate->m_Workmanship);
- _DebugLog("\n m_dwMaterial: %x",pCreate->m_dwMaterial) ;
- }
-
- // Workmanship
+ // HouseOwner
if (pCreate->m_dwFlags2 & 0x02000000) {
pMembers->get_NextInt(strhouseOwnerID, &pCreate->m_HouseOwner);
_DebugLog("\n m_HouseOwner: %x",pCreate->m_HouseOwner) ;
@@ -1442,6 +1435,13 @@
}
+ // Monarch
+ if (pCreate->m_dwFlags2 & 0x00000040) {
+ pMembers->get_NextInt(strmonarch, &pCreate->m_dwMonarch);
+ _DebugLog("\n Monarch: %x",pCreate->m_dwMonarch) ;
+ }
+
+
// Material
if (pCreate->m_dwFlags2 & 0x80000000) {
pMembers->get_NextInt(strmaterial, &pCreate->m_dwMaterial);
|
