[Gemrb-commits] gemrb/gemrb/plugins/Core CharAnimations.cpp, 1.95, 1.96

[Willem J. P. <wjp...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv32756/plugins/Core

Modified Files:
	CharAnimations.cpp 
Log Message:
animation fixes (from Avenger): dragon movement, wyverns, BG1 idling

Index: CharAnimations.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/CharAnimations.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** CharAnimations.cpp	3 Dec 2006 20:37:56 -0000	1.95
--- CharAnimations.cpp	3 Dec 2006 23:00:59 -0000	1.96
***************
*** 526,529 ****
--- 526,532 ----
  		case IE_ANI_SHOOT:
  		case IE_ANI_ATTACK:
+ 		case IE_ANI_ATTACK_JAB:
+ 		case IE_ANI_ATTACK_SLASH:
+ 		case IE_ANI_ATTACK_BACKSLASH:
  			nextStanceID = IE_ANI_READY;
  			autoSwitchOnEnd = true;
***************
*** 988,992 ****
  //                            0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15  16  17  18
  static char *StancePrefix[]={"3","2","5","5","4","4","2","2","5","4","1","3","3","3","4","1","4","4","4"};
! static char *CyclePrefix[]= {"0","0","1","1","1","1","0","0","1","1","1","1","1","1","1","1","1","1","1"};
  static unsigned int CycleOffset[] = {0,  0,  0,  0,  0,  9,  0,  0,  0, 18,  0,  0,  9,  18,  0,  0,  0,  0,  0};
  
--- 991,995 ----
  //                            0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15  16  17  18
  static char *StancePrefix[]={"3","2","5","5","4","4","2","2","5","4","1","3","3","3","4","1","4","4","4"};
! static char *CyclePrefix[]= {"0","0","1","1","1","1","0","0","1","1","0","1","1","1","1","1","1","1","1"};
  static unsigned int CycleOffset[] = {0,  0,  0,  0,  0,  9,  0,  0,  0, 18,  0,  0,  9,  18,  0,  0,  0,  0,  0};
  
***************
*** 996,1003 ****
  	unsigned char& Cycle, unsigned char Orient, int Part)
  {
  	switch (StanceID) {
  		case IE_ANI_WALK:
  			strcat( ResRef, "g1" );
- 			Cycle = Orient;
  			break;
  
--- 999,1006 ----
  	unsigned char& Cycle, unsigned char Orient, int Part)
  {
+ 	Cycle=SixteenToNine[Orient];
  	switch (StanceID) {
  		case IE_ANI_WALK:
  			strcat( ResRef, "g1" );
  			break;
  
***************
*** 1005,1019 ****
  		case IE_ANI_ATTACK_SLASH:
  			strcat( ResRef, "g3" );
- 			Cycle = Orient;
  			break;
  
  		case IE_ANI_ATTACK_BACKSLASH:
  			strcat( ResRef, "g3" );
! 			Cycle = 16 + Orient;
  			break;
  
  		case IE_ANI_ATTACK_JAB:
  			strcat( ResRef, "g3" );
! 			Cycle = 32 + Orient;
  			break;
  
--- 1008,1021 ----
  		case IE_ANI_ATTACK_SLASH:
  			strcat( ResRef, "g3" );
  			break;
  
  		case IE_ANI_ATTACK_BACKSLASH:
  			strcat( ResRef, "g3" );
! 			Cycle += 16;
  			break;
  
  		case IE_ANI_ATTACK_JAB:
  			strcat( ResRef, "g3" );
! 			Cycle += 32;
  			break;
  
***************
*** 1021,1035 ****
  		case IE_ANI_AWAKE:
  			strcat( ResRef, "g2" );
- 			Cycle = 0 + Orient;
  			break;
  
  		case IE_ANI_READY:
  			strcat( ResRef, "g2" );
! 			Cycle = 16 + Orient;
  			break;
  
  		case IE_ANI_DAMAGE:
  			strcat( ResRef, "g2" );
! 			Cycle = 32 + Orient;
  			break;
  
--- 1023,1036 ----
  		case IE_ANI_AWAKE:
  			strcat( ResRef, "g2" );
  			break;
  
  		case IE_ANI_READY:
  			strcat( ResRef, "g2" );
! 			Cycle += 16;
  			break;
  
  		case IE_ANI_DAMAGE:
  			strcat( ResRef, "g2" );
! 			Cycle += 32;
  			break;
  
***************
*** 1038,1047 ****
  		case IE_ANI_EMERGE:
  			strcat( ResRef, "g2" );
! 			Cycle = 48 + Orient;
  			break;
  
  		case IE_ANI_TWITCH:
  			strcat( ResRef, "g2" );
! 			Cycle = 64 + Orient;
  			break;
  
--- 1039,1048 ----
  		case IE_ANI_EMERGE:
  			strcat( ResRef, "g2" );
! 			Cycle += 48;
  			break;
  
  		case IE_ANI_TWITCH:
  			strcat( ResRef, "g2" );
! 			Cycle += 64;
  			break;
  
***************
*** 1366,1369 ****
--- 1367,1371 ----
  		case IE_ANI_DIE:
  		case IE_ANI_GET_UP:
+ 		case IE_ANI_PST_START: // to make ctrl-s work in BG2
  			strcat( ResRef, "g1" );
  			Cycle = 48 + Orient;
***************
*** 1379,1383 ****
  		case IE_ANI_HEAD_TURN:
  			strcat( ResRef, "g1" );
! 			Cycle = 16 + Orient;
  			break;
  
--- 1381,1385 ----
  		case IE_ANI_HEAD_TURN:
  			strcat( ResRef, "g1" );
! 			Cycle = 24 + Orient;
  			break;
  
***************
*** 1388,1392 ****
  		case IE_ANI_AWAKE:
  			strcat( ResRef, "g1" );
! 			Cycle = 24 + Orient;
  			break;
  
--- 1390,1394 ----
  		case IE_ANI_AWAKE:
  			strcat( ResRef, "g1" );
! 			Cycle = 16 + Orient;
  			break;