[wpdev-commits] wolfpack/ai ai.cpp,1.20,1.21 ai_animals.cpp,1.12,1.13 ai_humans.cpp,1.14,1.15 ai_monsters.cpp,1.15,1.16

[Richard M. <dr...@us...>]

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

Modified Files:
	ai.cpp ai_animals.cpp ai_humans.cpp ai_monsters.cpp 
Log Message:
config.h and config.cpp moved to serverconfig.h and serverconfig.cpp
This is to prevent a conflict with Automake.


Index: ai_animals.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai_animals.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ai_animals.cpp	2 Jun 2004 15:04:08 -0000	1.12
--- ai_animals.cpp	4 Aug 2004 23:17:38 -0000	1.13
***************
*** 29,33 ****
  #include "../npc.h"
  #include "../player.h"
! #include "../config.h"
  
  #include "../sectors.h"
--- 29,33 ----
  #include "../npc.h"
  #include "../player.h"
! #include "../serverconfig.h"
  
  #include "../sectors.h"

Index: ai_humans.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai_humans.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ai_humans.cpp	2 Jun 2004 15:04:08 -0000	1.14
--- ai_humans.cpp	4 Aug 2004 23:17:38 -0000	1.15
***************
*** 34,38 ****
  #include "../targetrequests.h"
  #include "../timers.h"
! #include "../config.h"
  
  #include "../sectors.h"
--- 34,38 ----
  #include "../targetrequests.h"
  #include "../timers.h"
! #include "../serverconfig.h"
  
  #include "../sectors.h"

Index: ai.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ai.cpp	3 Jun 2004 14:42:53 -0000	1.20
--- ai.cpp	4 Aug 2004 23:17:37 -0000	1.21
***************
*** 32,36 ****
  #include "../sectors.h"
  #include "../player.h"
! #include "../config.h"
  
  #include "../basics.h"
--- 32,36 ----
  #include "../sectors.h"
  #include "../player.h"
! #include "../serverconfig.h"
  
  #include "../basics.h"
***************
*** 504,513 ****
  				{
  					unsigned char newdir = RandomNum(0, 7);
! 					// Make sure we're not trying to walk in the same 
! 					// direction or the directions directly beneath if we met the border of a 
  					// spawnregion. But we don't want to turn around exactly either. (Looks
  					// to mechanically)
! 					while (newdir == dir 
! 						|| newdir == ((dir == 0) ? 7 : dir - 1) 
  						|| newdir == ((dir == 7) ? 0 : dir + 1) )
  					{
--- 504,513 ----
  				{
  					unsigned char newdir = RandomNum(0, 7);
! 					// Make sure we're not trying to walk in the same
! 					// direction or the directions directly beneath if we met the border of a
  					// spawnregion. But we don't want to turn around exactly either. (Looks
  					// to mechanically)
! 					while (newdir == dir
! 						|| newdir == ((dir == 0) ? 7 : dir - 1)
  						|| newdir == ((dir == 7) ? 0 : dir + 1) )
  					{

Index: ai_monsters.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai_monsters.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ai_monsters.cpp	2 Jun 2004 15:04:08 -0000	1.15
--- ai_monsters.cpp	4 Aug 2004 23:17:38 -0000	1.16
***************
*** 31,35 ****
  #include "../sectors.h"
  #include "../player.h"
! #include "../config.h"
  #include "../basics.h"
  #include "../items.h"
--- 31,35 ----
  #include "../sectors.h"
  #include "../player.h"
! #include "../serverconfig.h"
  #include "../basics.h"
  #include "../items.h"