diff --git a/gen/obj_defines.h b/gen/obj_defines.h index f58b7d160b19f559f7dc01e6291d59e640e5c7d5..1a8a5683643ecc8b85eceb8801dcc86d12b1b58a 100644 --- a/gen/obj_defines.h +++ b/gen/obj_defines.h @@ -907,11 +907,11 @@ if ( version <= 0x04020200 ) { \ NifStream( boundingBox.radius, in, version ); \ }; \ }; \ -if ( ( version >= 0x0A000100 ) && ( version <= 0x14000004 ) ) { \ +if ( ( version >= 0x0A000100 ) && ( version <= 0x0A020000 ) ) { \ NifStream( block_num, in, version ); \ link_stack.push_back( block_num ); \ }; \ -if ( version >= 0x14000005 ) { \ +if ( version >= 0x14000004 ) { \ NifStream( block_num, in, version ); \ link_stack.push_back( block_num ); \ }; \ @@ -941,13 +941,13 @@ if ( version <= 0x04020200 ) { \ NifStream( boundingBox.radius, out, version ); \ }; \ }; \ -if ( ( version >= 0x0A000100 ) && ( version <= 0x14000004 ) ) { \ +if ( ( version >= 0x0A000100 ) && ( version <= 0x0A020000 ) ) { \ if ( collisionData != NULL ) \ NifStream( link_map[StaticCast<NiObject>(collisionData)], out, version ); \ else \ NifStream( 0xffffffff, out, version ); \ }; \ -if ( version >= 0x14000005 ) { \ +if ( version >= 0x14000004 ) { \ if ( collisionObject != NULL ) \ NifStream( link_map[StaticCast<NiObject>(collisionObject)], out, version ); \ else \ @@ -994,7 +994,7 @@ for (uint i0 = 0; i0 < properties.size(); i0++) { \ properties[i0] = NULL; \ link_stack.pop_front(); \ }; \ -if ( ( version >= 0x0A000100 ) && ( version <= 0x14000004 ) ) { \ +if ( ( version >= 0x0A000100 ) && ( version <= 0x0A020000 ) ) { \ if (link_stack.empty()) \ throw runtime_error("Trying to pop a link from empty stack. This is probably a bug."); \ if (link_stack.front() != 0xffffffff) { \ @@ -1005,7 +1005,7 @@ if ( ( version >= 0x0A000100 ) && ( version <= 0x14000004 ) ) { \ collisionData = NULL; \ link_stack.pop_front(); \ }; \ -if ( version >= 0x14000005 ) { \ +if ( version >= 0x14000004 ) { \ if (link_stack.empty()) \ throw runtime_error("Trying to pop a link from empty stack. This is probably a bug."); \ if (link_stack.front() != 0xffffffff) { \ diff --git a/niflib.cpp b/niflib.cpp index 922db60e92e3b27c7c269d362028e5c83cba7613..7306dcf740ff29fae4f13157b41eeadf0060929e 100644 --- a/niflib.cpp +++ b/niflib.cpp @@ -4,7 +4,7 @@ All rights reserved. Please see niflib.h for licence. */ //#define DEBUG // this will produce lots of output //#define PRINT_OBJECT_NAMES //#define PRINT_OBJECT_CONTENTS -#define DEBUG_LINK_PHASE +//#define DEBUG_LINK_PHASE #include "niflib.h" #include "obj/NiAVObject.h"