1 files changed, 8 insertions, 2 deletions

diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index 191fc7ab..cd2a1bf6 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -319,14 +319,20 @@ HAnimAnimationCreateForHierarchy(RpHAnimHierarchy *hier)
 	RpHAnimAnimation *anim = RpHAnimAnimationCreate(rpHANIMSTDKEYFRAMETYPEID, numNodes, 0, 0.0f);
 	if(anim == nil)
 		return nil;
-	RpHAnimStdKeyFrame *frame = (RpHAnimStdKeyFrame*)HANIMFRAMES(anim);
+	RpHAnimStdKeyFrame *frame;
 	for(i = 0; i < numNodes; i++){
+		frame = (RpHAnimStdKeyFrame*)HANIMFRAME(anim, i);	// games uses struct size here, not safe
 		frame->q.real = 1.0f;
 		frame->q.imag.x = frame->q.imag.y = frame->q.imag.z = 0.0f;
 		frame->t.x = frame->t.y = frame->t.z = 0.0f;
+#ifdef FIX_BUGS
+		// times are subtracted and divided giving NaNs
+		// so they can't both be 0
+		frame->time = i/hier->numNodes;
+#else
 		frame->time = 0.0f;
+#endif
 		frame->prevFrame = nil;
-		frame++;
 	}
 	return anim;
 }