[Scummvm-cvs-logs] CVS: scummvm script_v1.cpp,1.48,1.49

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv11758

Modified Files:
	script_v1.cpp 
Log Message:
setObjectName fix for Indy4 french

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** script_v1.cpp	13 Mar 2002 06:14:08 -0000	1.48
--- script_v1.cpp	18 Mar 2002 01:15:41 -0000	1.49
***************
*** 1947,1950 ****
--- 1947,1951 ----
  	int i;
  	byte *name;
+ 	unsigned char work[255];
  	
  	if (obj < NUM_ACTORS)
***************
*** 1959,1975 ****
  
  	while ((a = fetchScriptByte()) != 0) {
! 		 name[i++] = a;
  
  		if (a==0xFF) {
! 			name[i++] = fetchScriptByte();
! 			name[i++] = fetchScriptByte();
! 			name[i++] = fetchScriptByte();
  		}
  
- 		if (i >= size)
- 			error("New name of object %d too long", obj);
  	}
  
! 	name[i] = 0;
  	runHook(0);
  }
--- 1960,1982 ----
  
  	while ((a = fetchScriptByte()) != 0) {
! 		 work[i++] = a;
  
  		if (a==0xFF) {
! 			work[i++] = fetchScriptByte();
! 			work[i++] = fetchScriptByte();
! 			work[i++] = fetchScriptByte();
  		}
  
  	}
  
! 	if (i >= size) {
! 		work[i] = 0;
! 		warning("New name of object %d too long (old *%s* new *%s*)", 
! 					obj, name, work);
! 		i = size - 1;
! 	}
! 
! 	work[i] = 0;
! 	strcpy((char*)name, (char*)work);
  	runHook(0);
  }