ScriptedAnimation: z and y pos were inverted when reading #481

tested a bunch and everything seems to still be fine there are other potential z/y swaps to be done, but I didn't find a counterexample
gemrb · Jan 16, 2020 · 48e20b5 · 48e20b5
1 parent 22b318e
commit 48e20b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
@@ -9192,7 +9192,7 @@ void Actor::AddVVCell(ScriptedAnimation* vvc)
 	if (!vvc) {
 		return;
 	}
-	if (vvc->ZPos<0) {
+	if (vvc->YPos < 0) {
 		vvcCells=&vvcShields;
 	} else {
 		vvcCells=&vvcOverlays;

diff --git a/gemrb/core/ScriptedAnimation.cpp b/gemrb/core/ScriptedAnimation.cpp
@@ -266,7 +266,7 @@ ScriptedAnimation::ScriptedAnimation(DataStream* stream)
 	stream->ReadDword( &tmp );
 	XPos = (signed) tmp;
 	stream->ReadDword( &tmp );  //this affects visibility
-	ZPos = (signed) tmp;
+	YPos = (signed) tmp;
 	stream->Seek( 4, GEM_CURRENT_POS );
 	stream->ReadDword( &FrameRate );
 
@@ -275,7 +275,7 @@ ScriptedAnimation::ScriptedAnimation(DataStream* stream)
 	stream->ReadDword( &FaceTarget );
 	stream->Seek( 16, GEM_CURRENT_POS );
 	stream->ReadDword( &tmp );  //this doesn't affect visibility
-	YPos = (signed) tmp;
+	ZPos = (signed) tmp;
 	stream->ReadDword( &LightX );
 	stream->ReadDword( &LightY );
 	stream->ReadDword( &LightZ );