[Gemrb-commits] gemrb/gemrb/plugins/Core ActorBlock.cpp,1.66,1.67 ActorBlock.h,1.50,1.51

[Laszlo T. <ave...@us...>]

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

Modified Files:
	ActorBlock.cpp ActorBlock.h 
Log Message:
Load Door scriptnames correctly so scripts can access them


Index: ActorBlock.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/ActorBlock.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** ActorBlock.h	17 Oct 2004 18:11:24 -0000	1.50
--- ActorBlock.h	25 Nov 2004 21:04:23 -0000	1.51
***************
*** 217,221 ****
  	~Door(void);
  public:
! 	char Name[9];
  	TileOverlay* overlay;
  	unsigned short* tiles;
--- 217,222 ----
  	~Door(void);
  public:
! 	char Name[33]; //scriptable name
! 	char ID[9];    //WED ID
  	TileOverlay* overlay;
  	unsigned short* tiles;
***************
*** 232,235 ****
--- 233,237 ----
  public:
  	void SetName(char* Name);
+ 	void SetScriptName(char* Name);
  	void SetTiles(unsigned short* Tiles, int count);
  	void SetDoorLocked(bool Locked, bool playsound = false);

Index: ActorBlock.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/ActorBlock.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** ActorBlock.cpp	24 Nov 2004 21:47:04 -0000	1.66
--- ActorBlock.cpp	25 Nov 2004 21:04:15 -0000	1.67
***************
*** 575,582 ****
  }
  
! void Door::SetName(char* Name)
  {
! 	strncpy( this->Name, Name, 8 );
! 	this->Name[8] = 0;
  }
  
--- 575,589 ----
  }
  
! //this is the short name (not the scripting name)
! void Door::SetName(char* name)
  {
! 	strncpy( ID, name, 8 );
! 	ID[8] = 0;
! }
! 
! void Door::SetScriptName(char* name)
! {
! 	strncpy( Name, name, 32 );
! 	Name[32] = 0;
  }