[wpdev-commits] wolfpack ChangeLog,1.115,1.116 basechar.cpp,1.164,1.165 items.cpp,1.454,1.455 server.cpp,1.32,1.33 timing.cpp,1.20,1.21 wolfpack.vcproj,1.52,1.53

[Sebastian H. <dar...@us...>]

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3668

Modified Files:
	ChangeLog basechar.cpp items.cpp server.cpp timing.cpp 
	wolfpack.vcproj 
Log Message:
npc mages

Index: server.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/server.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** server.cpp	9 Oct 2004 14:28:59 -0000	1.32
--- server.cpp	16 Oct 2004 18:19:40 -0000	1.33
***************
*** 28,31 ****
--- 28,32 ----
  #include "accounts.h"
  #include "ai/ai.h"
+ #include "ai/ai_mage.h"
  #include "basedef.h"
  #include "basics.h"
***************
*** 466,469 ****
--- 467,471 ----
  	Monster_Aggressive_L0::registerInFactory();
  	Monster_Aggressive_L1::registerInFactory();
+ 	Monster_Mage::registerInFactory();
  	Monster_Berserk::registerInFactory();
  	Human_Vendor::registerInFactory();

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -d -r1.164 -r1.165
*** basechar.cpp	16 Oct 2004 13:51:35 -0000	1.164
--- basechar.cpp	16 Oct 2004 18:19:40 -0000	1.165
***************
*** 1275,1280 ****
  	{
  		strength_ = Value.toLong();
! 		if ( maxHitpoints_ == 0 )
! 			maxHitpoints_ = strength_;
  		hitpoints_ = maxHitpoints_;
  	}
--- 1275,1279 ----
  	{
  		strength_ = Value.toLong();
! 		maxHitpoints_ = strength_;
  		hitpoints_ = maxHitpoints_;
  	}
***************
*** 1282,1287 ****
  	{
  		dexterity_ = Value.toLong();
! 		if ( maxStamina_ == 0 )
! 			maxStamina_ = dexterity_;
  		stamina_ = maxStamina_;
  	}
--- 1281,1285 ----
  	{
  		dexterity_ = Value.toLong();
! 		maxStamina_ = dexterity_;
  		stamina_ = maxStamina_;
  	}
***************
*** 1289,1294 ****
  	{
  		intelligence_ = Value.toLong();
! 		if ( maxMana_ == 0 )
! 			maxMana_ = intelligence_;
  		mana_ = maxMana_;
  	}
--- 1287,1291 ----
  	{
  		intelligence_ = Value.toLong();
! 		maxMana_ = intelligence_;
  		mana_ = maxMana_;
  	}

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** ChangeLog	16 Oct 2004 14:06:31 -0000	1.115
--- ChangeLog	16 Oct 2004 18:19:40 -0000	1.116
***************
*** 58,61 ****
--- 58,62 ----
  	- Fixed bug #0000353. (Riding horses not possible with body 0x3db)
  	- Fixed command processing with command char . and body 0x3db.
+ 	- Added AI Monster_Mage.
  
  Wolfpack 12.9.11 Beta (26. September 2004)

Index: wolfpack.vcproj
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** wolfpack.vcproj	8 Oct 2004 10:57:10 -0000	1.52
--- wolfpack.vcproj	16 Oct 2004 18:19:40 -0000	1.53
***************
*** 942,945 ****
--- 942,951 ----
  			</File>
  			<File
+ 				RelativePath=".\ai\ai_mage.cpp">
+ 			</File>
+ 			<File
+ 				RelativePath=".\ai\ai_mage.h">
+ 			</File>
+ 			<File
  				RelativePath=".\ai\ai_monsters.cpp">
  			</File>

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.454
retrieving revision 1.455
diff -C2 -d -r1.454 -r1.455
*** items.cpp	12 Oct 2004 23:59:28 -0000	1.454
--- items.cpp	16 Oct 2004 18:19:40 -0000	1.455
***************
*** 2184,2188 ****
  		P_ITEM pCont = dynamic_cast<P_ITEM>( container_ );
  
! 		if ( pCont->hasScript( "lock" ) )
  		{
  			return true;
--- 2184,2188 ----
  		P_ITEM pCont = dynamic_cast<P_ITEM>( container_ );
  
! 		if ( pCont->hasScript( "lock" ) && pCont->hasTag("locked") && pCont->getTag("locked").toInt() != 0 )
  		{
  			return true;

Index: timing.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/timing.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** timing.cpp	15 Oct 2004 16:29:07 -0000	1.20
--- timing.cpp	16 Oct 2004 18:19:40 -0000	1.21
***************
*** 438,442 ****
  	{
  		// Creatures owned by GMs won't hunger.
! 		if (!npc->owner() || !npc->owner()->isGMorCounselor()) {
  			if ( npc->hunger() )
  			{
--- 438,442 ----
  	{
  		// Creatures owned by GMs won't hunger.
! 		if ( !npc->owner() || !npc->owner()->isGMorCounselor()) {
  			if ( npc->hunger() )
  			{