Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

add new animation type for MMST

Fixes animation erros and invisible mist when slaying vampires in BG2.
  • Loading branch information...
commit dd811322dc8f48553d937d5c7af3eaee7df8a0c1 1 parent e6a3e33
fizzet fizzet authored
15 gemrb/core/CharAnimations.cpp
View
@@ -799,6 +799,9 @@ IE_ANI_TWO_FILES_3B: Animations using this type are stored using the following t
This is the standard IWD animation, but BG2 also has it.
See MOR2
+IE_ANI_TWO_FILES_4: This type stores animations in two files (G1 and G2) which each having only
+ one cycle. And both of those seem to be identical.
+
IE_ANI_TWO_PIECE: This is a modified IE_ANI_SIX_FILES with supporting still frames (using a
different palette) stored in a second set of files. Currently only used by MAKH
@@ -1151,6 +1154,13 @@ Animation** CharAnimations::GetAnimation(unsigned char Stance, unsigned char Ori
Anims[StanceID][Orient] = anims;
}
break;
+ case IE_ANI_TWO_FILES_4:
+ for (int i = 0; i < MAX_ANIMS; ++i) {
+ for (int j = 0; j < MAX_ORIENT; ++j) {
+ Anims[i][j] = anims;
+ }
+ }
+ break;
case IE_ANI_PST_ANIMATION_3: //no stc just std
case IE_ANI_PST_ANIMATION_2: //no std just stc
@@ -1242,6 +1252,11 @@ void CharAnimations::GetAnimResRef(unsigned char StanceID,
AddMMR2Suffix( NewResRef, StanceID, Cycle, Orient );
break;
+ case IE_ANI_TWO_FILES_4:
+ strcat( NewResRef, "g1");
+ Cycle = 0;
+ break;
+
case IE_ANI_TWO_FILES:
AddTwoFileSuffix(NewResRef, StanceID, Cycle, Orient );
break;
1  gemrb/core/CharAnimations.h
View
@@ -84,6 +84,7 @@ namespace GemRB {
#define IE_ANI_TWO_FILES_3B 16 //iwd animations (eg. MBBM)
#define IE_ANI_TWO_PIECE 17 //MAKH
#define IE_ANI_FOUR_FILES_3 18 //mostly civilians
+#define IE_ANI_TWO_FILES_4 19
//PST animation types
#define IE_ANI_PST_ANIMATION_1 56 //full animation
2  gemrb/unhardcoded/bg2/avatars.2da
View
@@ -225,7 +225,7 @@
0x7F36 NSHD NSHD NSHD NSHD 4 2 1 *
0x7F37 NIRE NIRE NIRE NIRE 4 2 1 *
0x7F38 MEYE MEYE MEYE MEYE 14 2 1 *
-0x7F39 MMST MMST MMST MMST 14 2 1 *
+0x7F39 MMST MMST MMST MMST 19 2 1 *
0x7F3A NIRO NIRO NIRO NIRO 4 2 1 *
0x7F3B MSOL MSOL MSOL MSOL 4 2 1 *
0x7F3C MASL MASL MASL MASL 4 2 1 *
Please sign in to comment.
Something went wrong with that request. Please try again.