[Gemrb-commits] gemrb/gemrb/plugins/Core Core.cpp,1.9,1.10 Game.cpp,1.11,1.12 Game.h,1.8,1.9 GameScript.cpp,1.55,1.56 GameScript.h,1.35,1.36

[<avenger_teambg@pr...>]

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

Modified Files:
	Core.cpp Game.cpp Game.h GameScript.cpp GameScript.h 
Log Message:
Rewritten scripts to load action/trigger/object instead of being hardcoded
Added several script actions/triggers


Index: Core.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Core.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Core.cpp	25 Jan 2004 18:13:47 -0000	1.9
--- Core.cpp	31 Jan 2004 18:45:19 -0000	1.10
***************
*** 65,68 ****
--- 65,69 ----
  
  //// Globally used functions
+ //returns true if path is an existing directory
  GEM_EXPORT bool dir_exists(const char *path)
  {
***************
*** 74,77 ****
--- 75,86 ----
  }
  
+ //returns the length of string (up to a delimiter)
+ GEM_EXPORT int strlench(const char *string, char ch)
+ {
+ 	int i;
+ 	for(i=0;string[i] && string[i]!=ch;i++);
+ 	return i;
+ }
+ 
  //// Compatibility functions
  #ifdef WIN32

Index: Game.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Game.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Game.cpp	31 Jan 2004 15:14:55 -0000	1.11
--- Game.cpp	31 Jan 2004 18:45:19 -0000	1.12
***************
*** 53,56 ****
--- 53,66 ----
  }
  
+ int Game::InStore(Actor *pc)
+ {
+ 	for(int i=0;i<NPCs.size();i++)
+ 	{
+ 		if(NPCs[i]==pc)
+ 			return i;
+ 	}
+ 	return -1;
+ }
+ 
  int Game::InParty(Actor *pc)
  {
***************
*** 66,74 ****
  {
  	int slot=InParty(pc);
! 	if(slot==-1)
  		return slot;
  	PCs.push_back(pc);
  	return (int)PCs.size()-1;
  }
  int Game::DelPC(unsigned int slot, bool autoFree)
  {
--- 76,88 ----
  {
  	int slot=InParty(pc);
! 	if(slot!=-1)
  		return slot;
+ 	slot=InStore(pc);
+ 	if(slot!=-1)            //it is an NPC, can't add as PC
+ 		return -1;
  	PCs.push_back(pc);
  	return (int)PCs.size()-1;
  }
+ 
  int Game::DelPC(unsigned int slot, bool autoFree)
  {
***************
*** 82,85 ****
--- 96,118 ----
  	return 0;
  }
+ 
+ int Game::LeaveParty(Actor *actor)
+ {
+ 	int slot=InParty(actor);
+ 	if(slot<0)
+ 		return slot;
+ 	PCs.erase(PCs.begin()+slot);
+ 	NPCs.push_back(actor);
+ }
+ 
+ int Game::JoinParty(Actor *actor)
+ {
+ 	int slot=InStore(actor);
+ 	if(slot<0)
+ 		return slot;
+ 	NPCs.erase(PCs.begin()+slot);
+ 	PCs.push_back(actor);
+ }
+ 
  Map * Game::GetMap(unsigned int index)
  {
***************
*** 133,136 ****
--- 166,175 ----
  int Game::AddNPC(Actor *npc)
  {
+ 	int slot=InStore(npc); //already an npc
+ 	if(slot!=-1)
+ 		return slot;
+ 	slot=InParty(npc);
+ 	if(slot!=-1)
+ 		return -1;     //can't add as npc already in party
  	NPCs.push_back(npc);
  	return NPCs.size()-1;

Index: Game.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Game.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Game.h	31 Jan 2004 15:14:55 -0000	1.8
--- Game.h	31 Jan 2004 18:45:19 -0000	1.9
***************
*** 56,59 ****
--- 56,65 ----
  	/* finds an actor in party, returns slot, if not there, returns -1*/
  	int InParty(Actor *pc);
+ 	/* finds an actor in store, returns slot, if not there, returns -1*/
+ 	int InStore(Actor *pc);
+ 	/* joins party (if already an npc) */
+ 	int JoinParty(Actor *pc);
+ 	/* leaves party (if in there) */
+ 	int LeaveParty(Actor *pc);
  	/*returns slot*/
  	int SetPC(Actor *pc);

Index: GameScript.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/GameScript.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** GameScript.cpp	29 Jan 2004 21:40:21 -0000	1.55
--- GameScript.cpp	31 Jan 2004 18:45:19 -0000	1.56
***************
*** 34,41 ****
  static SymbolMgr* triggersTable;
  static SymbolMgr* actionsTable;
  static TriggerFunction triggers[MAX_TRIGGERS];
  static ActionFunction actions[MAX_ACTIONS];
! static char blocking[MAX_ACTIONS];
! static char instant[MAX_ACTIONS];
  
  GameScript::GameScript(const char * ResRef, unsigned char ScriptType, Variables * local)
--- 34,201 ----
  static SymbolMgr* triggersTable;
[...1001 lines suppressed...]
*** 2724,2731 ****
  {
  //just a hack
! 	for(int i=0;i<6;i++) {
! 		Scriptable * scr = core->GetGame()->GetPC(i);
! 		if(scr)
! 			scr->ClearActions();
  	}
  }
--- 2918,2927 ----
  {
  //just a hack
! 	Game *game=core->GetGame();
! 
! 	for(int i=0;i<game->PartySize;i++) {
! 		Actor * act = game->GetPC(i);
! 		if(act)
! 			act->ClearActions();
  	}
  }

Index: GameScript.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/GameScript.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** GameScript.h	29 Jan 2004 21:40:21 -0000	1.35
--- GameScript.h	31 Jan 2004 18:45:19 -0000	1.36
***************
*** 76,80 ****
  	};
  	~Object() {
- 		printf("Freeing Object\n");
  	}
  public:
--- 76,79 ----
***************
*** 106,110 ****
  		}
  		RefCount--;
- 		printf("Refcount decreased to: %d\n",RefCount);
  		if(!RefCount)
  			delete this;
--- 105,108 ----
***************
*** 135,139 ****
  			objectParameter->Release();
  		}
- 		printf("Freeing Trigger\n");
  	}
  public:
--- 133,136 ----
***************
*** 159,163 ****
  		}
  		RefCount--;
- 		printf("Refcount decreased to: %d\n",RefCount);
  		if(!RefCount)
  			delete this;
--- 156,159 ----
***************
*** 192,196 ****
  		//delete[] triggers;
  		delete triggers;
- 		printf("Freeing Condition\n");
  	}
  public:
--- 188,191 ----
***************
*** 208,212 ****
  		}
  		RefCount--;
- 		printf("Refcount decreased to: %d\n",RefCount);
  		if(!RefCount)
  			delete this;
--- 203,206 ----
***************
*** 246,250 ****
  				objects[c]->Release();
  		}
- 		printf("Freeing Action\n");
  	}
  public:
--- 240,243 ----
***************
*** 269,273 ****
  		}
  		RefCount--;
- 		printf("Refcount decreased to: %d\n",RefCount);
  		if(!RefCount)
  			delete this;
--- 262,265 ----
***************
*** 303,307 ****
  		//delete[] actions;
  		delete actions;
- 		printf("Freeing Response\n");
  	}
  public:
--- 295,298 ----
***************
*** 320,324 ****
  		}
  		RefCount--;
- 		printf("Refcount decreased to: %d\n",RefCount);
  		if(!RefCount)
  			delete this;
--- 311,314 ----
***************
*** 353,357 ****
  		//delete[] responses;
  		delete responses;
- 		printf("Freeing ResponseSet\n");
  	}
  public:
--- 343,346 ----
***************
*** 369,373 ****
  		}
  		RefCount--;
- 		printf("Refcount decreased to: %d\n",RefCount);
  		if(!RefCount)
  			delete this;
--- 358,361 ----
***************
*** 398,402 ****
  		if(responseSet)
  			responseSet->Release();
- 		printf("Freeing ResponseBlock\n");
  	}
  public:
--- 386,389 ----
***************
*** 414,418 ****
  		}
  		RefCount--;
- 		printf("Refcount decreased to: %d\n",RefCount);
  		if(!RefCount)
  			delete this;
--- 401,404 ----
***************
*** 446,450 ****
  	~Script() {
  		FreeResponseBlocks();
! 		printf("Freeing Script\n");
  	}
  	const char *GetName() {
--- 432,436 ----
  	~Script() {
  		FreeResponseBlocks();
! 		printf("Freeing Script: %s\n",GetName());
  	}
  	const char *GetName() {
***************
*** 486,490 ****
  		}
  		RefCount--;
- 		printf("Refcount decreased to: %d\n",RefCount);
  		if(!RefCount)
  			delete this;
--- 472,475 ----
***************
*** 504,507 ****
--- 489,515 ----
  typedef int (* TriggerFunction)(Scriptable*, Trigger*);
  typedef void (* ActionFunction)(Scriptable*, Action*);
+ typedef void (* ObjectFunction)(); //not known yet
+ 
+ struct TriggerLink {
+ 	const char *Name;
+ 	TriggerFunction Function;
+ };
+ 
+ #define AF_NONE      0
+ #define AF_INSTANT   1
+ #define AF_CONTINUE  2
+ #define AF_MASK      3   //none, instant or continue
+ #define AF_BLOCKING  4
+ 
+ struct ActionLink {
+ 	const char *Name;
+ 	ActionFunction Function;
+ 	int Flags;
+ };
+ 
+ struct ObjectLink {
+ 	const char *Name;
+ 	ObjectFunction Function;
+ };
  
  #define IE_SCRIPT_ALWAYS		0
***************
*** 510,514 ****
  
  #define MAX_TRIGGERS			0xFF
! #define MAX_ACTIONS				400
  
  class GEM_EXPORT GameScript
--- 518,523 ----
  
  #define MAX_TRIGGERS			0xFF
! #define MAX_ACTIONS			400
! #define MAX_OBJECTS			128
  
  class GEM_EXPORT GameScript
***************
*** 557,563 ****
  	static void ExecuteString(Scriptable * Sender, char * String);
  	static bool EvaluateString(Scriptable * Sender, char * String);
! private: //Script Functions
  	//Triggers
! 	static int  Globals(Scriptable * Sender, Trigger * parameters);
  	static int  OnCreation(Scriptable * Sender, Trigger * parameters);
  	static int  PartyHasItem(Scriptable * Sender, Trigger * parameters);
--- 566,575 ----
  	static void ExecuteString(Scriptable * Sender, char * String);
  	static bool EvaluateString(Scriptable * Sender, char * String);
! public: //Script Functions
  	//Triggers
! 	static int  Global(Scriptable * Sender, Trigger * parameters);
! 	static int  GlobalLT(Scriptable * Sender, Trigger * parameters);
! 	static int  GlobalGT(Scriptable * Sender, Trigger * parameters);
! 	static int  GlobalsEqual(Scriptable * Sender, Trigger * parameters);
  	static int  OnCreation(Scriptable * Sender, Trigger * parameters);
  	static int  PartyHasItem(Scriptable * Sender, Trigger * parameters);
***************
*** 569,572 ****
--- 581,585 ----
  	static int  Class(Scriptable * Sender, Trigger * parameters);
  	static int  Exists(Scriptable * Sender, Trigger * parameters);
+ 	static int  InParty(Scriptable * Sender, Trigger * parameters);
  	static int  General(Scriptable * Sender, Trigger * parameters);
  	static int  Range(Scriptable * Sender, Trigger * parameters);
***************
*** 576,580 ****
  	static int  Dead(Scriptable * Sender, Trigger * parameters);
  	static int  See(Scriptable * Sender, Trigger * parameters);
! private:
  	//Actions
  	static void NoAction(Scriptable * Sender, Action * parameters);
--- 589,594 ----
  	static int  Dead(Scriptable * Sender, Trigger * parameters);
  	static int  See(Scriptable * Sender, Trigger * parameters);
! 	static int  BitCheck(Scriptable * Sender, Trigger * parameters);
! public:
  	//Actions
  	static void NoAction(Scriptable * Sender, Action * parameters);
***************
*** 598,602 ****
  	static void EndCutSceneMode(Scriptable * Sender, Action * parameters);
  	static void StartCutScene(Scriptable * Sender, Action * parameters);
! 	static void CutSceneId(Scriptable * Sender, Action * parameters);
  	static void Wait(Scriptable * Sender, Action * parameters);
  	static void SmallWait(Scriptable * Sender, Action * parameters);
--- 612,616 ----
  	static void EndCutSceneMode(Scriptable * Sender, Action * parameters);
  	static void StartCutScene(Scriptable * Sender, Action * parameters);
! 	static void CutSceneID(Scriptable * Sender, Action * parameters);
  	static void Wait(Scriptable * Sender, Action * parameters);
  	static void SmallWait(Scriptable * Sender, Action * parameters);
***************
*** 648,657 ****
  	static void GlobalBOr(Scriptable * Sender, Action * parameters);
  	static void BitClear(Scriptable * Sender, Action * parameters);
! 	static void GlobalShlGlobal(Scriptable * Sender, Action * parameters);
! 	static void GlobalShrGlobal(Scriptable * Sender, Action * parameters);
! 	static void GlobalShl(Scriptable * Sender, Action * parameters);
! 	static void GlobalShr(Scriptable * Sender, Action * parameters);
  	static void ClearAllActions(Scriptable * Sender, Action * parameters);
  	static void ClearActions(Scriptable * Sender, Action * parameters);
  };
  
--- 662,674 ----
  	static void GlobalBOr(Scriptable * Sender, Action * parameters);
  	static void BitClear(Scriptable * Sender, Action * parameters);
! 	static void GlobalShLGlobal(Scriptable * Sender, Action * parameters);
! 	static void GlobalShRGlobal(Scriptable * Sender, Action * parameters);
! 	static void GlobalShL(Scriptable * Sender, Action * parameters);
! 	static void GlobalShR(Scriptable * Sender, Action * parameters);
  	static void ClearAllActions(Scriptable * Sender, Action * parameters);
  	static void ClearActions(Scriptable * Sender, Action * parameters);
+ 	static void JoinParty(Scriptable * Sender, Action * parameters);
+ 	static void LeaveParty(Scriptable * Sender, Action * parameters);
+ 	static void MakeGlobal(Scriptable * Sender, Action * parameters);
  };
  

[Gemrb-commits] gemrb/gemrb/plugins/Core Game.h,1.7,1.8 Game.cpp,1.10,1.11

[<avenger_teambg@pr...>]

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

Modified Files:
	Game.h Game.cpp 
Log Message:
Add: Added InParty(Actor *ac) function to Game class


Index: Game.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Game.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Game.h	5 Jan 2004 23:52:11 -0000	1.7
--- Game.h	31 Jan 2004 15:14:55 -0000	1.8
***************
*** 51,55 ****
--- 51,60 ----
  	std::vector<Map*> Maps;
  public:
+ 	int PartySize;
+ public:
  	Actor* GetPC(unsigned int slot);
+ 	/* finds an actor in party, returns slot, if not there, returns -1*/
+ 	int InParty(Actor *pc);
+ 	/*returns slot*/
  	int SetPC(Actor *pc);
  	int DelPC(unsigned int slot, bool autoFree = false);

Index: Game.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Game.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Game.cpp	7 Jan 2004 22:00:47 -0000	1.10
--- Game.cpp	31 Jan 2004 15:14:55 -0000	1.11
***************
*** 30,33 ****
--- 30,34 ----
  Game::Game(void)
  {
+ 	PartySize=6;    //this could be modified later
  }
  
***************
*** 51,56 ****
--- 52,71 ----
  	return PCs[slot];
  }
+ 
+ int Game::InParty(Actor *pc)
+ {
+ 	for(int i=0;i<PCs.size();i++)
+ 	{
+ 		if(PCs[i]==pc)
+ 			return i;
+ 	}
+ 	return -1;
+ }
+ 
  int Game::SetPC(Actor *pc)
  {
+ 	int slot=InParty(pc);
+ 	if(slot==-1)
+ 		return slot;
  	PCs.push_back(pc);
  	return (int)PCs.size()-1;

[Gemrb-commits] gemrb/gemrb/plugins/Core Actor.cpp,1.22,1.23 GameScript.cpp,1.54,1.55 GameScript.h,1.34,1.35

[<avenger_teambg@pr...>]

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

Modified Files:
	Actor.cpp GameScript.cpp GameScript.h 
Log Message:
Fix: fixed ctrl-m cheatkey for actors (Added Script::GetName())


Index: Actor.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Actor.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Actor.cpp	18 Jan 2004 17:23:44 -0000	1.22
--- Actor.cpp	29 Jan 2004 21:40:21 -0000	1.23
***************
*** 298,302 ****
  	printf("Debugdump of Actor %s:\n", LongName);
  	for(int i=0;i<MAX_SCRIPTS;i++) {
! 		printf("Script %d: %s\n",i,Scripts[i]);
  	}
  	printf("Dialog: %s\n",Dialog);
--- 298,306 ----
  	printf("Debugdump of Actor %s:\n", LongName);
  	for(int i=0;i<MAX_SCRIPTS;i++) {
! 		const char *poi="<none>";
! 		if(Scripts[i] && Scripts[i]->script) {
! 			poi=Scripts[i]->script->GetName();
! 		}
! 		printf("Script %d: %s\n",i,poi);
  	}
  	printf("Dialog: %s\n",Dialog);

Index: GameScript.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/GameScript.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** GameScript.cpp	19 Jan 2004 23:12:31 -0000	1.54
--- GameScript.cpp	29 Jan 2004 21:40:21 -0000	1.55
***************
*** 296,300 ****
  	if(!script)
  		return;
- printf("Update...\n");
  	for(unsigned int a = 0; a < script->responseBlocksCount; a++) {
  		ResponseBlock * rB = script->responseBlocks[a];
--- 296,299 ----

Index: GameScript.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/GameScript.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** GameScript.h	19 Jan 2004 22:58:53 -0000	1.34
--- GameScript.h	29 Jan 2004 21:40:21 -0000	1.35
***************
*** 432,436 ****
  class GEM_EXPORT Script {
  public:
! 	Script(const char * Name) {
  		canary = 0xdeadbeef;
  		RefCount = 1;
--- 432,436 ----
  class GEM_EXPORT Script {
  public:
! 	Script(const char * ScriptName) {
  		canary = 0xdeadbeef;
  		RefCount = 1;
***************
*** 441,446 ****
  			return;
  		}
! 		strncpy(this->Name, Name, 8);
! 		this->Name[8] = 0;
  	};
  	~Script() {
--- 441,446 ----
  			return;
  		}
! 		strncpy(Name, ScriptName, 8);
! 		Name[8] = 0;
  	};
  	~Script() {
***************
*** 448,451 ****
--- 448,454 ----
  		printf("Freeing Script\n");
  	}
+ 	const char *GetName() {
+ 		return this?Name:"<none>";
+ 	}
  	void AllocateBlocks(unsigned int count) {
  		if(!count) {