wpdev-commits — Wolfpack CVS commit info

[wpdev-commits] wolfpack configure,1.35,1.36

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

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

Modified Files:
	configure 
Log Message:
Old script was depreciated, so I made configure a link to configure.py
Consider it a shortcut :)


Index: configure
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** configure	4 Aug 2004 23:17:35 -0000	1.35
--- configure	5 Aug 2004 22:19:39 -0000	1.36
***************
*** 1,532 ****
  #!/bin/sh
- #################################################################
- #   )      (\_     # Wolfpack 13.0.0 Build Script               #
- #  ((    _/{  "-;  # Created by: Wolfpack Development Team      #
- #   )).-" {{ ;"`   # Revised by: Wolfpack Development Team      #
- #  ( (  ;._ \\ ctr # Last Modification: check cvs logs          #
- #################################################################
- 
- # BIG FAT TODO:	write clean functions instead of that blown up
- #		include/library search routines.
- 
- ##### make_newlines [string]
- # replacement of echo -e for newlines
- make_newlines ()
- {
- 	for i in $(echo "$1"|sed -e 's/ /^/g;s/\\n/ /g');
- 	do
- 		echo "$i"|tr '^' ' ';
- 	done;
- }
- 
- ##### normalize_path [path]
- # strips off unneeded slashes
- normalize_path ()
- {
- 	echo "$1"|sed -e 's/\/\/\+/\//g;s/\/\+$//;s/\/\.\//\//g';
- }
- 
- ##### regexp_exist [path/regexp]
- # check if a file exists which matches the regular expression
- # and return 0 upon existance of the file
- regexp_exist ()
- {
- 	PATH_EXACT="$(normalize_path "$(dirname "$1")")";
- 	FILE_REGEXP="$(basename "$1")";
- 
- 	[ "$(ls -1 "$PATH_EXACT" 2> /dev/null|grep "^${FILE_REGEXP}$")" ] && return 0;
- 
- 	return 1;
- }
- 
- ##### get_best_lib
- # reads libs from stdin and gets the most useable one
- # currently hust the one with the shortest path length
- get_best_lib ()
- {
- 	read LINE;
- 	SHORTEST_LEN="$(echo -n "$LINE"|wc -c)";
- 	SHORTEST_LINE="$LINE";
- 
- 	while read LINE;
- 	do
- 		LINE_LEN="$(echo -n "$LINE"|wc -c)";
- 
- 		if [ "$LINE_LEN" -lt "$SHORTEST_LEN" ];
- 		then
- 			SHORTEST_LEN="$LINE_LEN";
- 			SHORTEST_LINE="$LINE";
- 		fi;
- 	done;
- 
- 	echo "$SHORTEST_LINE";
- }
- 
- ##### ask_path [regexp]
- # asks the user to submit a new path
- # the regexp is to check the validity of the user's input
- ask_path ()
- {
- 	[ "$2" != "skip" ] && echo "not found." >&2;
- 	SUPPLIED_PATH="";
- 
- 	[ "$(echo "$1"|grep 'so$')" ] && LIB_OR_INC="library" || LIB_OR_INC="include";
- 
- 	while [ ! -d "$SUPPLIED_PATH" ] && ! regexp_exist "${SUPPLIED_PATH}/${1}";
- 	do
- 		echo "Please enter the correct $LIB_OR_INC directory," >&2;
- 		echo -n "or just press enter to skip: " >&2;
- 		read SUPPLIED_PATH;
- 		echo >&2;
- 
- 		if [ ! "$SUPPLIED_PATH" ];
- 		then
- 			break;
- 		fi
- 	done;
- 
- 	echo "$SUPPLIED_PATH";
- }
- 
- ##### check_version [package] [path]
- # check version of package using the file/dir in path
- check_version ()
- {
- 	if [ ! "$2" ];
- 	then
- 		echo "Error! You can't skip required stuff!" >&2;
- 		LIB_PATH="(skipped)";
- 	else
- 		LIB_PATH="$2";
- 	fi;
- 
- 	case "$1" in
- 		python-inc)
- 			VERSION_REGEXP='^[  ]*#[    ]*define[       ]*PY_VERSION[^"]*"\([^"]*\)".*$';
- 			VERSION="$(grep "$VERSION_REGEXP" "${LIB_PATH}/patchlevel.h" 2> /dev/null|sed -e "s/$VERSION_REGEXP/\1/")";
- 			[ ! "$VERSION" ] && VERSION="not available";
- 			if [ ! "$(echo "$VERSION"|grep '^2\.3')" ];
- 			then
- 				cat >&2 <<-EOF
- 				Python version is ${VERSION}, but should be 2.3.x!
- 				Please install the appropriate version from:
- 				    http://www.python.org/2.3.4/
- 				or use ${0} --help for help with specifying the correct path.
- 				EOF
- 				exit 1;
- 			fi;
- 			;;
- 		python-lib)
- 			if [ ! -e "${LIB_PATH}/libpython2.3.so" ] && [ ! -e "${LIB_PATH}/libpython2.3.a" ];
- 			then
- 				cat >&2 <<-EOF
- 				Python 2.3.x library files not found in ${LIB_PATH}!
- 				Please install the appropriate version from:
- 				    http://www.python.org/2.3.3/
- 				or use ${0} --help for help with specifying the correct path.
- 				EOF
- 				exit 1;
- 			fi;
- 			;;
- 		qt)
- 			VERSION_REGEXP='^.*version:[^(]*([^     ]*[     ]*\([^)]*\)).*$';
- 			VERSION="$(eval "${LIB_PATH} -v" 2>&1|grep "$VERSION_REGEXP"|sed -e "s/$VERSION_REGEXP/\1/")";
- 			[ ! "$VERSION" ] && VERSION="not available";
- 			if [ ! "$(echo "$VERSION"|grep '^3\.')" ];
- 			then
- 				cat >&2 <<-EOF
- 				error!
- 				Your Qt version is ${VERSION} and hence too old.
- 				Please install version 3.x.x from:
- 				    http://www.trolltech.com/download/qt/x11.html
- 				or use ${0} --help for help with specifying the correct path.
- 
- 				Please note, that Qt has to be installed multi threaded!
- 				To compile qt multi threaded, use -thread there as a ./configure option.
- 				EOF
- 				exit 1;
- 			fi;
- 			;;
- 	esac;
- }
- 
- ##### print_usage
- # prints usage information
- print_usage ()
- {
- 	cat <<-EOF
- 	Usage: ${0} [options]
- 	where options are:
- 
- 	        --enable-mysql             Enable MySQL support.
- 	           --mysql-includes=dir    The MySQL include directory.
- 	           --mysql-libraries=dir   The MySQL library path.
- 
- 	        --python-includes=dir      Python include directory.
- 	        --python-libraries=dir     Python library path.
- 
- 	        --qt-directory=dir         Base directory of Qt.
- 
- 	        --static                   Static linking.
- 
- 	enforcement options:
- 
- 	        --force-python *           Disable Python version check.
- 	        --force-qt *               Disable Qt version check.
- 	        --force-stlport            Enforce usage of stlport.
- 
- 	        --force-all                Enforce all options marked with *.
- 
- 	options for developers:
- 
- 	        --enable-debug             Enable debugging.
- 	        --cscriptdebug             Debug into ${0}.
- 
- 	EOF
- 	exit 1;
- }
- 
- while [ "$1" ];
- do
- 	if [ "$(echo "$1"|grep '^--[^=]\+=')" ];
- 	then
- 		ITEM="$(echo "$1"|sed -e 's/\([^-]*-\)\+\([^-]\+-[^=]\+=.\+\)$/\2/')";
- 	else
- 		ITEM="$(echo "$1"|sed -e 's/^--\([^-]\+-\)\?//')";
- 	fi;
- 
- 	if [ "x$ITEM" == "x$1" ];
- 	then
- 		echo "Unknown option \"$1\"!" >&2;
- 		print_usage >&2;
- 
- 	elif [ "x$1" == "x--help" ];
- 	then
- 		print_usage;
- 	fi;
- 
- 	if [ "$(echo "$ITEM"|grep '^[^-]\+-inc[^=]*=.\+$')" ];
- 	then
- 		CUR_INC="$(echo "$ITEM"|sed -e 's/^[^=]\+=\(.*\)$/\1/')";
- 		CUR_INC="$(normalize_path "$CUR_INC")";
- 		ITEM="$(echo "$ITEM"|sed -e 's/^\([^-]\+-\).*$/\1inc/')";
- 
- 	elif [ "$(echo "$ITEM"|grep '^[^-]\+-\(path\|dir\)[^=]*=.\+$')" ];
- 	then
- 		CUR_PATH="$(echo "$ITEM"|sed -e 's/^[^=]\+=\(.*\)$/\1/')";
- 		CUR_PATH="$(normalize_path "$CUR_PATH")";
- 		ITEM="$(echo "$ITEM"|sed -e 's/^\([^-]\+-\).*$/\1path/')";
- 
- 	elif [ "$(echo "$ITEM"|grep '^[^-]\+-lib[^=]*=.\+$')" ];
- 	then
- 		CUR_LIB="$(echo "$ITEM"|sed -e 's/^[^=]\+=\(.*\)$/\1/')";
- 		CUR_LIB="$(normalize_path "$CUR_LIB")";
- 		ITEM="$(echo "$ITEM"|sed -e 's/^\([^-]\+-\).*$/\1lib/')";
- 	fi;
- 
- 	YES_NO="$(echo "$1"|grep -q '^--\(enable-\|[^-]*$\)' && echo 'y' || echo 'n')";
- 
- 	FORCE="";
- 	FORCE="$(echo "$1"|grep -q '^--force-' && echo 'y' || echo 'n')";
- 	[ "$FORCE" = "y" ] && ITEM="${1#--}";
- 
- 	case "$ITEM" in
- 		cscriptdebug)		_CONFIGURE_DEBUG="$YES_NO";;
- 		debug)			_DEBUG="$YES_NO";;
- 		mysql)			_MYSQL="$YES_NO";;
- 		mysql-inc)		_MYSQL_INC="$CUR_INC";;
- 		mysql-lib)		_MYSQL_LIB="$CUR_LIB";;
- 		python-inc)		_PYTHON_INC="$CUR_INC";;
- 		python-lib)		_PYTHON_LIB="$CUR_LIB";;
- 		qt-path)		_QT_PATH="$CUR_PATH";;
- 		static)			_STATIC="$YES_NO";;
- 		force-python)		_FORCE_PYTHON="$FORCE";;
- 		force-qt)		_FORCE_QT="$FORCE";;
- 		force-stlport)		_FORCE_STLPORT="$FORCE";;
- 		force-all)
- 					_FORCE_PYTHON="$FORCE";
- 					_FORCE_QT="$FORCE";
- 					;;
- 		*)
- 			echo "Unknown option \"$1\"!" >&2;
- 			print_usage >&2;
- 			;;
- 	esac;
- 
- 	shift;
- done;
- 
- [ "${_CONFIGURE_DEBUG}" = "y" ] && set -x;
- 
- # first of all, let's assassinate the Makefile ;)
- rm -f Makefile;
- 
- if [ "${_STATIC}" = "y" ];
- then
- 	QMAKE_LFLAGS="-static";
- fi;
- 
- if [ "${_DEBUG}" = "y" ];
- then
- 	echo "Debug: Yes";
- 	DEFINES="_DEBUG";
- 	QMAKE_CXXFLAGS="-g";
- 	QMAKE_CFLAGS="-g";
- 	CONFIG="warn_on";
- fi;
- 
- if [ "${_MYSQL}" = "y" ];
- then
- 	# <mysql>
- 	MYSQL_DISABLED="n";
- 
- 	echo -n "Searching for MySQL includes... ";
- 
- 	if [ "${_MYSQL_INC}" ];
- 	then
- 		if ! regexp_exist "${_MYSQL_INC}/mysql\.h";
- 		then
- 			MYSQL_INC="$(ask_path 'mysql\.h')";
- 			if [ ! "$MYSQL_INC" ];
- 			then
- 				echo "MySQL support disabled.";
- 				MYSQL_DISABLED="y";
- 			fi;
- 		else
- 			MYSQL_INC="${_MYSQL_INC}";
- 			echo "( $MYSQL_INC )";
- 		fi;
- 
- 	else
- 		MYSQL_INC="$(mysql_config --cflags|sed -e "s/^\([^-]*-I\)*['\"]\?\([^ '\"$]*\).*$/\2/")";
- 
- 		if ! [ "$MYSQL_INC" ];
- 		then
- 			MYSQL_INC="$(ask_path 'mysql\.h')";
- 			if [ ! "$MYSQL_INC" ];
- 			then
- 				echo "MySQL support disabled.";
- 				MYSQL_DISABLED="y";
- 			fi;
- 		else
- 			[ "$MYSQL_DISABLED" != "y" ] && echo "( $MYSQL_INC )";
- 		fi;
- 	fi;
- 
- 	echo -n "Searching for MySQL libraries... ";
- 	if [ "${_MYSQL_LIB}" ];
- 	then
- 		if ! regexp_exist "${_MYSQL_LIB}/libmysqlclient.*\.so";
- 		then
- 			MYSQL_LIB="$(ask_path 'libmysqlclient.*\.so')";
- 			if [ ! "$MYSQL_LIB" ];
- 			then
- 				echo "MySQL support disabled.";
- 				MYSQL_DISABLED="y";
- 			fi;
- 		else
- 			MYSQL_LIB="${_MYSQL_LIB}";
- 			echo "( $MYSQL_LIB )";
- 		fi;
- 	else
- 		MYSQL_LIB="$(mysql_config --libs|sed -e "s/^\([^-]*-L\)*['\"]\?\([^ '\"$]*\).*$/\2/")";
- 
- 		if ! [ "$MYSQL_LIB" ] && [ "$MYSQL_DISABLED" != "y" ];
- 		then
- 			MYSQL_LIB="$(ask_path 'libmysqlclient.*\.so')";
- 			if [ ! "$MYSQL_LIB" ];
- 			then
- 				echo "MySQL support disabled.";
- 				MYSQL_DISABLED="y";
- 			fi;
- 		else
- 			[ "$MYSQL_DISABLED" != "y" ] && echo "( $MYSQL_LIB )";
- 		fi;
- 	fi;
- 
- 	if [ "$MYSQL_DISABLED" != "y" ];
- 	then
- 		MYSQL_LIB="-L$MYSQL_LIB -lmysqlclient";
- 		DEFINES="$DEFINES MYSQL_DRIVER";
- 	fi;
- 	# </mysql>
- fi;
- 
- # <python>
- echo -n "Searching for Python includes... ";
- 
- if [ ! "${_PYTHON_INC}" ];
- then
- 	for py_incpath in \
- 			/usr/local/include/[Pp]ython*/Python.h \
- 			/usr/include/[Pp]ython*/Python.h \
- 			;
- 	do
- 		if [ -e "$py_incpath" ];
- 		then
- 			py_pathes="$py_pathes\n$py_incpath";
- 		fi;
- 	done;
  
! 	py_pathes="$(make_newlines "$py_pathes")";
! 
! 	[ "$py_pathes" ] && PYTHON_INC="$(echo "$py_pathes"|sort -nr|get_best_lib|sed -e 's/^\(\([^\/]*\/\)*\).*$/\1/;s/\/\+$//')";
! 
! 	if [ ! "$PYTHON_INC" ];
! 	then
! 		PYTHON_INC="$(ask_path 'Python.h')";
! 	else
! 		echo "( $PYTHON_INC )";
! 	fi;
! else
! 	if ! regexp_exist "${_PYTHON_INC}/Python\.h";
! 	then
! 		PYTHON_INC="$(ask_path 'Python.h')";
! 	else
! 		PYTHON_INC="${_PYTHON_INC}";
! 		echo "( $PYTHON_INC )";
! 	fi;
! fi;
! 
! [ "${_FORCE_PYTHON}" != "y" ] && check_version "python-inc" "${PYTHON_INC}";
! 
! echo -n "Searching for Python library.... ";
! 
! STATIC_PRESENT="";
! if [ ! "${_PYTHON_LIB}" ];
! then
! 	for py_libpath in \
! 			/usr/local/lib/libpython*.so \
! 			/usr/local/lib/libpython*.a \
! 			/usr/local/lib/[Pp]ython*/libpython*.so \
! 			/usr/local/lib/[Pp]ython*/libpython*.a \
! 			/usr/lib/libpython*.so \
! 			/usr/lib/libpython*.a \
! 			/usr/lib/[Pp]ython*/libpython*.so \
! 			/usr/lib/[Pp]ython*/libpython*.a \
! 			/usr/lib/[Pp]ython*/config/libpython*.so \
! 			/usr/lib/[Pp]ython*/config/libpython*.a \
! 			/usr/local/lib/[Pp]ython*/config/libpython*.so \
! 			/usr/local/lib/[Pp]ython*/config/libpython*.a \
! 			;
! 	do
! 		if [ -e "$py_libpath" ];
! 		then
! 			if [ "${py_libpath%%*.so}" ];
! 			then
! 				STATIC_PRESENT="y";
! 			else
! 				py_libs="$py_libs\n$py_libpath";
! 			fi;
! 		fi;
! 	done;
! 
! 	py_libs="$(make_newlines "$py_libs")";
! 
! 	[ "$py_libs" ] && PYTHON_LIB="$(echo "$py_libs"|sort -nr|get_best_lib|sed -e 's/^\(\([^\/]*\/\)*\).*$/\1/;s/\/\+$//')";
! 
! 	if [ ! "$PYTHON_LIB" ];
! 	then
! 		if [ "$STATIC_PRESENT" = "y" ];
! 		then
! 			echo "error:" >&2;
! 			echo "No dynamically linked Python libraries were found." >&2;
! 			echo "Please make sure that .so files are available!" >&2;
! 			echo "You can do this using --enable-shared at the Python" >&2;
! 			echo "./configure script." >&2;
! 		fi;
! 		PYTHON_LIB="$(ask_path 'libpython.*\.so' 'skip')";
! 	else
! 		echo "( $PYTHON_LIB )";
! 	fi;
! else
! 	if ! regexp_exist "${_PYTHON_LIB}/libpython.*\.so";
! 	then
! 		PYTHON_LIB="$(ask_path 'libpython.*\.so')";
! 	else
! 		PYTHON_LIB="${_PYTHON_LIB}";
! 		echo "( $PYTHON_LIB )";
! 	fi;
! fi;
! 
! [ "${_FORCE_PYTHON}" != "y" ] && check_version "python-lib" "${PYTHON_LIB}";
! PYTHON_LIB="-L$PYTHON_LIB -lpython2.3";
! # </python>
! 
! # <stlport>
! echo -n "Checking if we need to add stlport... ";
! 
! # this check is currently disabled.
! #CC="";
! #CC="$(which g++)";
! #[ ! "$CC" ] && CC="$(which c++)";
! 
! #CC_VERSION="$(eval "$CC -dumpversion")";
! 
! if [ "${_FORCE_STLPORT}" != "y" ] #&& [ "$(echo "$CC_VERSION"|cut -d. -f1)" -ge "3" ];
! then
! 	echo -n "no";
! else
! 	echo -n "yes";
! 	[ -x "/usr/include/stlport" ] && STLPORT_INC="/usr/include/stlport" || STLPORT_INC="/usr/local/include/stlport";
! 	STLPORT_LIB="-lstlport";
! fi;
! 
! echo ".";
! # </stlport>
! 
! PASSED_VARIABLES="";
! for i in MYSQL_INC MYSQL_LIB PYTHON_INC PYTHON_LIB STLPORT_INC STLPORT_LIB DEFINES QMAKE_CXXFLAGS QMAKE_CFLAGS QMAKE_LFLAGS CONFIG;
! do
! 	PASSED_VARIABLES="$PASSED_VARIABLES $i+='$(eval "echo \$$i")'";
! done;
! 
! echo -n "Creating Makefile using qmake... ";
! 
! if [ -d "${_QT_PATH}" ];
! then
! 	QTDIR="${_QT_PATH}";
! 	export QTDIR;
! fi;
! 
! if [ -x "$QTDIR/bin/qmake" ];
! then
! 	QMAKE_BIN="$QTDIR/bin/qmake";
! else
! 	QMAKE_BIN="$(which qmake)";
! fi;
! 
! if [ -x "$QMAKE_BIN" ];
! then
! 	[ "${_FORCE_QT}" != "y" ] && check_version "qt" "$QMAKE_BIN";
! 
! 	QMAKE_OUTPUT="$(eval "$QMAKE_BIN -o Makefile $PASSED_VARIABLES wolfpack.pro" 2>&1)";
! 	if [ "$?" -gt "0" ];
! 	then
! 		echo "failed:" >&2;
! 		echo "$QMAKE_OUTPUT" >&2;
! 		exit 1;
! 	fi;
! else
! 	echo "not found." >&2;
! 	exit 1;
! fi;
! 
! if [ ! "$(grep '^LIBS' Makefile | grep -- '-lqt-mt')" ];
! then
! 	echo "failed!" >&2;
! 	cat >&2 <<-EOF
! 	Sorry, Qt has to be installed multi threaded.
! 	To compile qt multi threaded, use -thread there as a ./configure option.
! 	EOF
  
! 	if [ "${_FORCE_QT}" != "y" ];
! 	then
! 		rm -f Makefile;
! 		exit 1;
! 	fi;
! fi;
  
! echo "done.";
  
- echo "Configure finished. Please run make now.";
--- 1,12 ----
  #!/bin/sh
  
! echo "This is a link to configure.py"
! echo "Your system requires Python-2.3 for this to work."
! echo "Executing: python2.3 ./configure.py ${@}"
! echo ""
  
! python2.3 configure.py $@
  
! echo ""
! echo "Now please execute 'make' to compile Wolfpack."
  

[wpdev-commits] wolfpack configure.py,1.17,1.18

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

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

Modified Files:
	configure.py 
Log Message:
I forgot -DMYSQL_DRIVER


Index: configure.py
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** configure.py	5 Aug 2004 21:34:26 -0000	1.17
--- configure.py	5 Aug 2004 22:07:55 -0000	1.18
***************
*** 242,245 ****
--- 242,246 ----
  	if options.enable_mysql:
  		CONFIG += "mysql "
+ 		DEFINES += "MYSQL_DRIVER "
  		checkMySQL(options)
  	checkQt()

[wpdev-commits] wolfpack wolfpack.pro,1.204,1.205

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

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

Modified Files:
	wolfpack.pro 
Log Message:
Ack, I just noticed this... 
Fix should work better for windows now.


Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.204
retrieving revision 1.205
diff -C2 -d -r1.204 -r1.205
*** wolfpack.pro	5 Aug 2004 21:34:26 -0000	1.204
--- wolfpack.pro	5 Aug 2004 21:36:37 -0000	1.205
***************
*** 119,122 ****
--- 119,127 ----
  }
  
+ win32 {
+ 	INCLUDEPATH += $$PY_INCDIR $$MySQL_INCDIR $$SQLite_INCDIR
+ 	LIBS += $$PY_LIBDIR $$MySQL_LIBDIR $$SQLite_LIBDIR
+ }
+ 
  RC_FILE = res.rc
  OBJECTS_DIR = obj

[wpdev-commits] wolfpack configure.py,1.16,1.17 wolfpack.pro,1.203,1.204

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

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

Modified Files:
	configure.py wolfpack.pro 
Log Message:
OK, done for now, leaving this as it is.


Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.203
retrieving revision 1.204
diff -C2 -d -r1.203 -r1.204
*** wolfpack.pro	5 Aug 2004 21:28:15 -0000	1.203
--- wolfpack.pro	5 Aug 2004 21:34:26 -0000	1.204
***************
*** 24,60 ****
  	# This will use custom installs over package installs.
  
  	# MySQL Checks
! 	isEmpty( MySQL_INCDIR ) {
! 		message( "Warning: MySQL_INCDIR was not defined!" )
! 		exists( /usr/local/include/mysql/mysql.h ) {
! 			message( "MySQL included found in: /usr/local/include/mysql" )
! 			MySQL_INCDIR = /usr/local/include/mysql
! 		}
! 		else:exists( /usr/include/mysql/mysql.h ) {
! 			message( "MySQL included found in: /usr/include/mysql" )
! 			MySQL_INCDIR = /usr/include/mysql
! 		}
! 	}
! 	isEmpty( MySQL_LIBDIR ) {
! 		message( "Warning: MySQL_LIBDIR was not defined!" )
! 		exists( /usr/local/lib/mysql/libmysqlclient.so ) {
! 			message( "Found libmysqlclient.so in: /usr/local/lib/mysql" )
! 			MySQL_LIBDIR = -L/usr/local/lib/mysql -lmysqlclient
  		}
! 		else:exists( /usr/lib/mysql/libmysqlclient.so ) {
! 			message( "Found libmysqlclient.so in: /usr/lib/mysql" )
! 			MySQL_LIBDIR = -L/usr/lib/mysql -lmysqlclient
  		}
- 
  	}
  
  	# SQLite Checks
! 	isEmpty( SQLite_INCDIR ) {
! 		message( "Warning: SQLite_INCDIR was not defined!" )
! 		SQLite_INCDIR = sqlite
! 	}
! 	isEmpty( SQLite_LIBDIR ) {
! 		message( "Warning: SQLite_LIBDIR was not defined!" )
! 		SQLite_LIBDIR = -Lsqlite
  	}
  
--- 24,64 ----
  	# This will use custom installs over package installs.
  
+ 
  	# MySQL Checks
! 	mysql {
! 		isEmpty( MySQL_INCDIR ) {
! 			message( "Warning: MySQL_INCDIR was not defined!" )
! 			exists( /usr/local/include/mysql/mysql.h ) {
! 				message( "MySQL included found in: /usr/local/include/mysql" )
! 				MySQL_INCDIR = /usr/local/include/mysql
! 			}
! 			else:exists( /usr/include/mysql/mysql.h ) {
! 				message( "MySQL included found in: /usr/include/mysql" )
! 				MySQL_INCDIR = /usr/include/mysql
! 			}
  		}
! 		isEmpty( MySQL_LIBDIR ) {
! 			message( "Warning: MySQL_LIBDIR was not defined!" )
! 			exists( /usr/local/lib/mysql/libmysqlclient.so ) {
! 				message( "Found libmysqlclient.so in: /usr/local/lib/mysql" )
! 				MySQL_LIBDIR = -L/usr/local/lib/mysql -lmysqlclient
! 			}
! 			else:exists( /usr/lib/mysql/libmysqlclient.so ) {
! 				message( "Found libmysqlclient.so in: /usr/lib/mysql" )
! 				MySQL_LIBDIR = -L/usr/lib/mysql -lmysqlclient
! 			}
  		}
  	}
  
  	# SQLite Checks
! 	sqlite {
! 		isEmpty( SQLite_INCDIR ) {
! 			message( "Warning: SQLite_INCDIR was not defined!" )
! 			SQLite_INCDIR = sqlite
! 		}
! 		isEmpty( SQLite_LIBDIR ) {
! 			message( "Warning: SQLite_LIBDIR was not defined!" )
! 			SQLite_LIBDIR = -Lsqlite
! 		}
  	}
  

Index: configure.py
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** configure.py	5 Aug 2004 21:28:15 -0000	1.16
--- configure.py	5 Aug 2004 21:34:26 -0000	1.17
***************
*** 223,226 ****
--- 223,229 ----
  # Entry point
  def main():
+ 	# Options for qmake
+ 	DEFINES = ""
+ 	CONFIG = ""
  
  	# Setup command line parser
***************
*** 237,241 ****
  
  	checkPython(options)
! 	checkMySQL(options)
  	checkQt()
  
--- 240,246 ----
  
  	checkPython(options)
! 	if options.enable_mysql:
! 		CONFIG += "mysql "
! 		checkMySQL(options)
  	checkQt()
  
***************
*** 272,281 ****
  	config.write("MySQL_LIBDIR = %s\n" % MySQL_LIBDIR )
  
! 	# Build MySQL Libs and Includes
  	config.write("SQLite_INCDIR = sqlite\n" )
  	config.write("SQLite_LIBDIR = -lsqlite\n" )
  
- 	DEFINES = ""
- 	CONFIG = ""
  	# if --debug
  	if options.enable_debug:
--- 277,285 ----
  	config.write("MySQL_LIBDIR = %s\n" % MySQL_LIBDIR )
  
! 	# Build SQLite Libs and Includes
! 	CONFIG += "sqlite "
  	config.write("SQLite_INCDIR = sqlite\n" )
  	config.write("SQLite_LIBDIR = -lsqlite\n" )
  
  	# if --debug
  	if options.enable_debug:

[wpdev-commits] wolfpack configure.py,1.15,1.16 wolfpack.pro,1.202,1.203

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

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

Modified Files:
	configure.py wolfpack.pro 
Log Message:
This is a bit cleaner :D


Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.202
retrieving revision 1.203
diff -C2 -d -r1.202 -r1.203
*** wolfpack.pro	5 Aug 2004 21:21:15 -0000	1.202
--- wolfpack.pro	5 Aug 2004 21:28:15 -0000	1.203
***************
*** 15,19 ****
  
  unix {
- 	QMAKE_LIBDIR_FLAGS = -L/usr/lib -L/usr/local/lib
  	LIBS = -ldl -lutil
  
--- 15,18 ----
***************
*** 51,61 ****
  
  	# SQLite Checks
! 	isEmpty( SQLITE_INCDIR ) {
! 		message( "Warning: SQLITE_INCDIR was not defined!" )
! 		SQLITE_INCDIR = sqlite
  	}
! 	isEmpty( SQLITE_LIBDIR ) {
! 		message( "Warning: SQLITE_LIBDIR was not defined!" )
! 		SQLITE_LIBDIR = -Lsqlite
  	}
  
--- 50,60 ----
  
  	# SQLite Checks
! 	isEmpty( SQLite_INCDIR ) {
! 		message( "Warning: SQLite_INCDIR was not defined!" )
! 		SQLite_INCDIR = sqlite
  	}
! 	isEmpty( SQLite_LIBDIR ) {
! 		message( "Warning: SQLite_LIBDIR was not defined!" )
! 		SQLite_LIBDIR = -Lsqlite
  	}
  
***************
*** 109,114 ****
  	}
  
! 	INCLUDEPATH += $$PY_INCDIR $$MySQL_INCDIR $$SQLITE_INCDIR
! 	LIBS += $$PY_LIBDIR $$MySQL_LIBDIR $$SQLITE_LIBDIR
  
  	# We need to remove these to be safe
--- 108,113 ----
  	}
  
! 	INCLUDEPATH += $$PY_INCDIR $$MySQL_INCDIR $$SQLite_INCDIR
! 	LIBS += $$PY_LIBDIR $$MySQL_LIBDIR $$SQLite_LIBDIR
  
  	# We need to remove these to be safe
***************
*** 374,376 ****
  }
  
! message( "For additional options please try executing: python configure.py" )
--- 373,375 ----
  }
  
! message( "Please make sure you execute: python configure.py" )

Index: configure.py
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** configure.py	5 Aug 2004 21:21:15 -0000	1.15
--- configure.py	5 Aug 2004 21:28:15 -0000	1.16
***************
*** 117,121 ****
  	global mysql_incpath
  	mysql_incfile = None
! 	sys.stdout.write( "Searching for Python includes... " )
  	mysql_incfile, mysql_incpath = findFile( MySQL_INCSEARCHPATH )
  	if ( mysql_incfile ):
--- 117,121 ----
  	global mysql_incpath
  	mysql_incfile = None
! 	sys.stdout.write( "Searching for MySQL includes... " )
  	mysql_incfile, mysql_incpath = findFile( MySQL_INCSEARCHPATH )
  	if ( mysql_incfile ):
***************
*** 258,275 ****
  		PY_LIBDIR = os.path.join( py_libpath, py_libfile )
  	else:
! 		PY_LIBDIR = "-lpython2.3 -L%s" % ( py_libpath )
  	config.write("PY_INCDIR = %s\n" % ( py_incpath ) )
  	config.write("PY_LIBDIR = %s\n" % PY_LIBDIR)
  
  
! 	# Build MySQL Libs
  	MySQL_LIBDIR = ""
  	if sys.platform == "win32":
  		MySQL_LIBDIR = os.path.join( mysql_libpath, mysql_libfile )
  	else:
! 		MySQL_LIBDIR = "-lmysqlclient -L%s" % ( mysql_libpath )
  	config.write("MySQL_INCDIR = %s\n" % mysql_incpath )
  	config.write("MySQL_LIBDIR = %s\n" % MySQL_LIBDIR )
  
  	DEFINES = ""
  	CONFIG = ""
--- 258,279 ----
  		PY_LIBDIR = os.path.join( py_libpath, py_libfile )
  	else:
! 		PY_LIBDIR = "-L%s -lpython2.3" % ( py_libpath )
  	config.write("PY_INCDIR = %s\n" % ( py_incpath ) )
  	config.write("PY_LIBDIR = %s\n" % PY_LIBDIR)
  
  
! 	# Build MySQL Libs and Includes
  	MySQL_LIBDIR = ""
  	if sys.platform == "win32":
  		MySQL_LIBDIR = os.path.join( mysql_libpath, mysql_libfile )
  	else:
! 		MySQL_LIBDIR = "-L%s -lmysqlclient" % ( mysql_libpath )
  	config.write("MySQL_INCDIR = %s\n" % mysql_incpath )
  	config.write("MySQL_LIBDIR = %s\n" % MySQL_LIBDIR )
  
+ 	# Build MySQL Libs and Includes
+ 	config.write("SQLite_INCDIR = sqlite\n" )
+ 	config.write("SQLite_LIBDIR = -lsqlite\n" )
+ 
  	DEFINES = ""
  	CONFIG = ""

[wpdev-commits] wolfpack ChangeLog,1.2,1.3 configure.py,1.14,1.15 wolfpack.pro,1.201,1.202

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

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

Modified Files:
	ChangeLog configure.py wolfpack.pro 
Log Message:
Updates
MySQL checking.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ChangeLog	4 Aug 2004 22:51:15 -0000	1.2
--- ChangeLog	5 Aug 2004 21:21:15 -0000	1.3
***************
*** 26,29 ****
--- 26,30 ----
  		(See Anti Speed Hack settings in the General group)
  	- New Windows Release builds should now include MySQL support by default.
+ 	- Added some additional checking to wolfpack.pro
  
  Wolfpack 12.9.7 Beta (4. July 2004)

Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.201
retrieving revision 1.202
diff -C2 -d -r1.201 -r1.202
*** wolfpack.pro	5 Aug 2004 20:14:52 -0000	1.201
--- wolfpack.pro	5 Aug 2004 21:21:15 -0000	1.202
***************
*** 6,20 ****
  #################################################################
  
  PROJECT = wolfpack
  TARGET = wolfpack
  TEMPLATE = app
  
! CONFIG += qt thread exceptions rtti debug
  
  unix {
- 	debug {
- 		message( "Debugging is enabled!" )
- 		DEFINES +=_DEBUG _AIDEBUG
- 	}
  	QMAKE_LIBDIR_FLAGS = -L/usr/lib -L/usr/local/lib
  	LIBS = -ldl -lutil
--- 6,18 ----
  #################################################################
  
+ include( config.pri )
+ 
  PROJECT = wolfpack
  TARGET = wolfpack
  TEMPLATE = app
  
! CONFIG += qt thread exceptions rtti
  
  unix {
  	QMAKE_LIBDIR_FLAGS = -L/usr/lib -L/usr/local/lib
  	LIBS = -ldl -lutil
***************
*** 28,51 ****
  
  	# MySQL Checks
! 	isEmpty( MYSQL_INCDIR ) {
! 		message( "Warning: MYSQL_INCDIR was not defined!" )
  		exists( /usr/local/include/mysql/mysql.h ) {
  			message( "MySQL included found in: /usr/local/include/mysql" )
! 			MYSQL_INCDIR = /usr/local/include/mysql
  		}
  		else:exists( /usr/include/mysql/mysql.h ) {
  			message( "MySQL included found in: /usr/include/mysql" )
! 			MYSQL_INCDIR = /usr/include/mysql
  		}
  	}
! 	isEmpty( MYSQL_LIBDIR ) {
! 		message( "Warning: MYSQL_LIBDIR was not defined!" )
  		exists( /usr/local/lib/mysql/libmysqlclient.so ) {
  			message( "Found libmysqlclient.so in: /usr/local/lib/mysql" )
! 			MYSQL_LIBDIR = -L/usr/local/lib/mysql -lmysqlclient
  		}
  		else:exists( /usr/lib/mysql/libmysqlclient.so ) {
  			message( "Found libmysqlclient.so in: /usr/lib/mysql" )
! 			MYSQL_LIBDIR = -L/usr/lib/mysql -lmysqlclient
  		}
  
--- 26,49 ----
  
  	# MySQL Checks
! 	isEmpty( MySQL_INCDIR ) {
! 		message( "Warning: MySQL_INCDIR was not defined!" )
  		exists( /usr/local/include/mysql/mysql.h ) {
  			message( "MySQL included found in: /usr/local/include/mysql" )
! 			MySQL_INCDIR = /usr/local/include/mysql
  		}
  		else:exists( /usr/include/mysql/mysql.h ) {
  			message( "MySQL included found in: /usr/include/mysql" )
! 			MySQL_INCDIR = /usr/include/mysql
  		}
  	}
! 	isEmpty( MySQL_LIBDIR ) {
! 		message( "Warning: MySQL_LIBDIR was not defined!" )
  		exists( /usr/local/lib/mysql/libmysqlclient.so ) {
  			message( "Found libmysqlclient.so in: /usr/local/lib/mysql" )
! 			MySQL_LIBDIR = -L/usr/local/lib/mysql -lmysqlclient
  		}
  		else:exists( /usr/lib/mysql/libmysqlclient.so ) {
  			message( "Found libmysqlclient.so in: /usr/lib/mysql" )
! 			MySQL_LIBDIR = -L/usr/lib/mysql -lmysqlclient
  		}
  
***************
*** 111,116 ****
  	}
  
! 	INCLUDEPATH += $$PY_INCDIR $$MYSQL_INCDIR $$SQLITE_INCDIR
! 	LIBS += $$PY_LIBDIR $$MYSQL_LIBDIR $$SQLITE_LIBDIR
  
  	# We need to remove these to be safe
--- 109,114 ----
  	}
  
! 	INCLUDEPATH += $$PY_INCDIR $$MySQL_INCDIR $$SQLITE_INCDIR
! 	LIBS += $$PY_LIBDIR $$MySQL_LIBDIR $$SQLITE_LIBDIR
  
  	# We need to remove these to be safe
***************
*** 374,376 ****
  unix {
  	INCPATH -= /usr/include/python2.2
! }
\ No newline at end of file
--- 372,376 ----
  unix {
  	INCPATH -= /usr/include/python2.2
! }
! 
! message( "For additional options please try executing: python configure.py" )

Index: configure.py
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** configure.py	5 Aug 2004 20:14:52 -0000	1.14
--- configure.py	5 Aug 2004 21:21:15 -0000	1.15
***************
*** 20,23 ****
--- 20,26 ----
  py_incpath = ""
  qt_qmake = ""
+ mysql_libpath = ""
+ mysql_libfile = ""
+ mysql_incpath = ""
  
  sys.stdout.write( "Wolfpack configure script\n"	)
***************
*** 64,67 ****
--- 67,130 ----
  	return True
  
+ def checkMySQL(options):
+ 	if sys.platform == "win32":
+ 		MySQL_LIBSEARCHPATH = [ sys.prefix + "\Libs\mysqlclient*.lib" ]
+ 		MySQL_INCSEARCHPATH = [ sys.prefix + "\include\mysql.h" ]
+ 	elif sys.platform == "linux2":
+ 		MySQL_LIBSEARCHPATH = [ "/usr/local/lib/mysql/libmysqlclient*.so", \
+ 					"/usr/lib/mysql/libmysqlclient*.so", \
+ 					"/usr/local/lib/libmysqlclient*.so", \
+ 					"/usr/lib/libmysqlclient*.so" ]
+ 		MySQL_LIBSTATICSEARCHPATH = [ "/usr/local/lib/mysql/libmysqlclient*.a", \
+ 					"/usr/lib/mysql/libmysqlclient*.a", \
+ 					"/usr/local/lib/libmysqlclient*.a", \
+ 					"/usr/lib/libmysqlclient*.a" ]
+ 		MySQL_INCSEARCHPATH = [ "/usr/local/include/mysql/mysql.h", \
+ 					"/usr/include/mysql/mysql.h", \
+ 					"/usr/local/include/mysql.h", \
+ 					"/usr/include/mysql.h" ]
+ 	elif sys.platform == "freebsd4":
+ 		MySQL_LIBSEARCHPATH = [ "/usr/local/lib/mysql/libmysqlclient*.so", \
+ 					"/usr/lib/mysql/libmysqlclient*.so", \
+ 					"/usr/local/lib/libmysqlclient*.so", \
+ 					"/usr/lib/libmysqlclient*.so" ]
+ 		MySQL_LIBSTATICSEARCHPATH = [ "/usr/local/lib/mysql/libmysqlclient*.a", \
+ 					"/usr/lib/mysql/libmysqlclient*.a", \
+ 					"/usr/local/lib/libmysqlclient*.a", \
+ 					"/usr/lib/libmysqlclient*.a" ]
+ 		MySQL_INCSEARCHPATH = [ "/usr/local/include/mysql/mysql.h", \
+ 					"/usr/include/mysql/mysql.h", \
+ 					"/usr/local/include/mysql.h", \
+ 					"/usr/include/mysql.h" ]
+ 	else:
+ 		sys.stdout.write("ERROR: Unknown platform %s to checkMySQL()" % sys.platform )
+ 		sys.exit()
+ 
+ 	# if --static
+ 	if options.staticlink:
+ 		MySQL_LIBSEARCHPATH = MySQL_LIBSTATICSEARCHPATH
+ 
+ 	global mysql_libpath
+ 	global mysql_libfile
+ 
+ 	mysql_libfile, mysql_libpath = findFile( MySQL_LIBSEARCHPATH )
+ 	if ( mysql_libfile ):
+ 		sys.stdout.write("%s\n" % os.path.join( py_libpath, py_libfile ) )
+ 	else:
+ 		sys.stdout.write("Not Found!\n")
+ 		sys.exit()
+ 
+ 	global mysql_incpath
+ 	mysql_incfile = None
+ 	sys.stdout.write( "Searching for Python includes... " )
+ 	mysql_incfile, mysql_incpath = findFile( MySQL_INCSEARCHPATH )
+ 	if ( mysql_incfile ):
+ 		sys.stdout.write( "%s\n" % mysql_incpath )
+ 	else:
+ 		sys.stdout.write("Not Found!\n")
+ 		sys.exit()
+ 
+ 	return True
+ 
  def checkPython(options):
  	if sys.platform == "win32":
***************
*** 103,109 ****
  		sys.exit()
  
!         # if --static
  	if options.staticlink:
!                 PYTHONLIBSEARCHPATH = PYTHONLIBSTATICSEARCHPATH
  
  	# if it was overiden...
--- 166,172 ----
  		sys.exit()
  
! 	# if --static
  	if options.staticlink:
! 		PYTHONLIBSEARCHPATH = PYTHONLIBSTATICSEARCHPATH
  
  	# if it was overiden...
***************
*** 123,136 ****
  	sys.stdout.write( "Checking unicode support... " )
  	if sys.maxunicode > 65535:
!                 sys.stdout.write( "failed\n" )
!                 sys.stdout.write( "Wolfpack currently requires python to be compiled with UCS2, its compiled with UCS4\n" )
!                 sys.exit();
!         else:
!                 sys.stdout.write( "ok\n" )
  
!         sys.stdout.write( "Checking CPU byte order... %s" % sys.byteorder )
!         if sys.byteorder != 'little':
!                 sys.stdout.write("\nError: Wolfpack currently only supports little endian systems\n" )
!                 sys.exit();
  
  	sys.stdout.write( "Searching for Python library... " )
--- 186,199 ----
  	sys.stdout.write( "Checking unicode support... " )
  	if sys.maxunicode > 65535:
! 		sys.stdout.write( "failed\n" )
! 		sys.stdout.write( "Wolfpack currently requires python to be compiled with UCS2, its compiled with UCS4\n" )
! 		sys.exit();
! 	else:
! 		sys.stdout.write( "ok\n" )
  
! 	sys.stdout.write( "Checking CPU byte order... %s" % sys.byteorder )
! 	if sys.byteorder != 'little':
! 		sys.stdout.write("\nError: Wolfpack currently only supports little endian systems\n" )
! 		sys.exit();
  
  	sys.stdout.write( "Searching for Python library... " )
***************
*** 167,174 ****
  	parser.add_option("--python-libraries", dest="py_libpath", help="Python library path")
  	parser.add_option("--qt-directory", dest="qt_dir", help="Base directory of Qt")
!         parser.add_option("--static", action="store_true", dest="staticlink", help="Build wokfpack using static libraries")
  	(options, args) = parser.parse_args()
  
  	checkPython(options)
  	checkQt()
  
--- 230,241 ----
  	parser.add_option("--python-libraries", dest="py_libpath", help="Python library path")
  	parser.add_option("--qt-directory", dest="qt_dir", help="Base directory of Qt")
! 	parser.add_option("--static", action="store_true", dest="staticlink", help="Build wokfpack using static libraries")
! 	parser.add_option("--enable-debug", action="store_true", dest="enable_debug", help="Enables basic debugging support.")
! 	parser.add_option("--enable-aidebug", action="store_true", dest="enable_aidebug", help="Enabled debugging of NPC AI.")
! 	parser.add_option("--enable-mysql", action="store_true", dest="enable_mysql", help="Enables MySQL support.")
  	(options, args) = parser.parse_args()
  
  	checkPython(options)
+ 	checkMySQL(options)
  	checkQt()
  
***************
*** 178,181 ****
--- 245,251 ----
  	global py_incpath
  	global qt_qmake
+ 	global mysql_libpath
+ 	global mysql_libfile
+ 	global mysql_incpath
  
  	config = file("config.pri", "w")
***************
*** 183,195 ****
  	config.write("#          any changes to this file will be lost!\n")
  
! 	config.write("INCLUDEPATH += %s\n" % ( py_incpath ) )
! 	# Build LIBS
! 	LIBS = ""
  	if sys.platform == "win32":
! 		LIBS = os.path.join( py_libpath, py_libfile )
  	else:
! 		LIBS = "-l%s -L%s" % ( py_libfile, py_libpath )
  
! 	config.write("LIBS += %s\n" % LIBS)
  	config.close()
  
--- 253,287 ----
  	config.write("#          any changes to this file will be lost!\n")
  
! 	# Build Python LIBS and Includes
! 	PY_LIBDIR = ""
  	if sys.platform == "win32":
! 		PY_LIBDIR = os.path.join( py_libpath, py_libfile )
  	else:
! 		PY_LIBDIR = "-lpython2.3 -L%s" % ( py_libpath )
! 	config.write("PY_INCDIR = %s\n" % ( py_incpath ) )
! 	config.write("PY_LIBDIR = %s\n" % PY_LIBDIR)
  
! 
! 	# Build MySQL Libs
! 	MySQL_LIBDIR = ""
! 	if sys.platform == "win32":
! 		MySQL_LIBDIR = os.path.join( mysql_libpath, mysql_libfile )
! 	else:
! 		MySQL_LIBDIR = "-lmysqlclient -L%s" % ( mysql_libpath )
! 	config.write("MySQL_INCDIR = %s\n" % mysql_incpath )
! 	config.write("MySQL_LIBDIR = %s\n" % MySQL_LIBDIR )
! 
! 	DEFINES = ""
! 	CONFIG = ""
! 	# if --debug
! 	if options.enable_debug:
! 		DEFINES += "_DEBUG "
! 		CONFIG += "debug "
! 	# if --aidebug
! 	if options.enable_aidebug:
! 		DEFINES += "_AIDEBUG "
! 
! 	config.write("DEFINES += %s\n" % DEFINES)
! 	config.write("CONFIG += %s\n" % CONFIG)
  	config.close()
  
***************
*** 203,205 ****
  
  if __name__ == "__main__":
!     main()
--- 295,297 ----
  
  if __name__ == "__main__":
! 	main()

[wpdev-commits] wolfpack AUTHORS,1.1,1.2 COPYRIGHT,1.1,1.2

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

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

Modified Files:
	AUTHORS COPYRIGHT 
Log Message:
Updates.


Index: COPYRIGHT
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/COPYRIGHT,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** COPYRIGHT	4 Aug 2004 22:20:58 -0000	1.1
--- COPYRIGHT	5 Aug 2004 20:26:28 -0000	1.2
***************
*** 9,13 ****
  
  Note, if you have contributed to Wolfpack, please contact us and we will add
! your name to this list.
  
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- 9,13 ----
  
  Note, if you have contributed to Wolfpack, please contact us and we will add
! your name to this list. This is for both the core code and the scripts.
  
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
***************
*** 36,38 ****
  
  Unknown (Kid_Sk8)
! 
--- 36,38 ----
  
  Unknown (Kid_Sk8)
! Unknown (Incarnus)

Index: AUTHORS
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AUTHORS	4 Aug 2004 22:20:58 -0000	1.1
--- AUTHORS	5 Aug 2004 20:26:28 -0000	1.2
***************
*** 5,10 ****
  Home: http://www.wpdev.org
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
! Known authors, in order by last name.
! 
  Anatoly (Ambassador Kosh)
  Biehunko, Michael (Aszlig)
--- 5,12 ----
  Home: http://www.wpdev.org
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
! Known authors whom are on the developer list.
! This is for both the core code and the scripts.
! Format: Last, First (Alias) :: Email
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  Anatoly (Ambassador Kosh)
  Biehunko, Michael (Aszlig)

[wpdev-commits] wolfpack wolfpack.pro,1.200,1.201 configure.py,1.13,1.14

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

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

Modified Files:
	wolfpack.pro configure.py 
Log Message:
Some stuff for future checking.
This should work better...
Also, configure.py now makes sure it looks for a 2.3 folder. It was finding
2.2 and selecting it rather than selecting 2.3. This is a problem since most
distros carry both 2.2 and 2.3 Python versions.


Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.200
retrieving revision 1.201
diff -C2 -d -r1.200 -r1.201
*** wolfpack.pro	4 Aug 2004 23:17:37 -0000	1.200
--- wolfpack.pro	5 Aug 2004 20:14:52 -0000	1.201
***************
*** 9,35 ****
  TARGET = wolfpack
  TEMPLATE = app
! CONFIG += qt thread exceptions rtti
  
  unix {
  
  	# Common unix settings
  	# Lets try to figure some paths
  
! 	CONFIG += console
  
! 	# MySQL
! 	LIBS += $$MYSQL_LIB
! 	INCLUDEPATH += $$MYSQL_INC
  
  	# Python includes. Run configure script to initialize it.
! 	LIBS  += $$PYTHON_LIB
! 	INCLUDEPATH += $$PYTHON_INC
  
! 	LIBS += $$STLPORT_LIB
! 	INCLUDEPATH += $$STLPORT_INC
  
! 	LIBS  += -L/usr/local/lib -L/usr/lib -ldl -lutil
  
! 	# we dont use those.
  	QMAKE_LIBS_X11 -= -lX11 -lXext -lm
  }
--- 9,118 ----
  TARGET = wolfpack
  TEMPLATE = app
! 
! CONFIG += qt thread exceptions rtti debug
  
  unix {
+ 	debug {
+ 		message( "Debugging is enabled!" )
+ 		DEFINES +=_DEBUG _AIDEBUG
+ 	}
+ 	QMAKE_LIBDIR_FLAGS = -L/usr/lib -L/usr/local/lib
+ 	LIBS = -ldl -lutil
+ 
+ 	CONFIG += console
  
  	# Common unix settings
  	# Lets try to figure some paths
+ 	# Checking in /usr first, then /usr/local
+ 	# This will use custom installs over package installs.
  
! 	# MySQL Checks
! 	isEmpty( MYSQL_INCDIR ) {
! 		message( "Warning: MYSQL_INCDIR was not defined!" )
! 		exists( /usr/local/include/mysql/mysql.h ) {
! 			message( "MySQL included found in: /usr/local/include/mysql" )
! 			MYSQL_INCDIR = /usr/local/include/mysql
! 		}
! 		else:exists( /usr/include/mysql/mysql.h ) {
! 			message( "MySQL included found in: /usr/include/mysql" )
! 			MYSQL_INCDIR = /usr/include/mysql
! 		}
! 	}
! 	isEmpty( MYSQL_LIBDIR ) {
! 		message( "Warning: MYSQL_LIBDIR was not defined!" )
! 		exists( /usr/local/lib/mysql/libmysqlclient.so ) {
! 			message( "Found libmysqlclient.so in: /usr/local/lib/mysql" )
! 			MYSQL_LIBDIR = -L/usr/local/lib/mysql -lmysqlclient
! 		}
! 		else:exists( /usr/lib/mysql/libmysqlclient.so ) {
! 			message( "Found libmysqlclient.so in: /usr/lib/mysql" )
! 			MYSQL_LIBDIR = -L/usr/lib/mysql -lmysqlclient
! 		}
  
! 	}
! 
! 	# SQLite Checks
! 	isEmpty( SQLITE_INCDIR ) {
! 		message( "Warning: SQLITE_INCDIR was not defined!" )
! 		SQLITE_INCDIR = sqlite
! 	}
! 	isEmpty( SQLITE_LIBDIR ) {
! 		message( "Warning: SQLITE_LIBDIR was not defined!" )
! 		SQLITE_LIBDIR = -Lsqlite
! 	}
  
  	# Python includes. Run configure script to initialize it.
! 	isEmpty( PY_INCDIR ) {
! 		message( "Warinng: PY_INCDIR was not defined!" )
! 		exists( /usr/local/include/python2.3/Python.h ) {
! 			message( "Python includes found in: /usr/local/include/python2.3" )
! 			PY_INCDIR = /usr/local/include/python2.3
! 		}
! 		else:exists( /usr/local/include/Python2.3/Python.h ) {
! 			message( "Python includes found in: /usr/local/include/Python2.3" )
! 			PY_INCDIR = /usr/local/include/Python2.3
! 		}
! 		else:exists( /usr/include/python2.3/Python.h ) {
! 			message( "Python includes found in: /usr/include/python2.3" )
! 			PY_INCDIR = /usr/include/python2.3
! 		}
! 		else:exists( /usr/include/Python2.3/Python.h ) {
! 			message( "Python includes found in: /usr/include/Python2.3" )
! 			PY_INCDIR = /usr/include/Python2.3
! 		}
  
! 	}
! 	isEmpty( PY_LIBDIR ) {
! 		message( "Warinng: PY_LIBDIR was not defined!" )
! 		shared {
! 			message( "Using Shared Python Configuration..." )
! 			exists( /usr/local/lib/python2.3/config/libpython2.3.a ) {
! 				message( "Found libpython2.3.a in /usr/local/lib/python2.3/config" )
! 				PY_LIBDIR = -L/usr/local/lib/python2.3/config -lpython2.3
! 			}
! 			else:exists( /usr/lib/python2.3/config/libpython2.3.a ) {
! 				message( "Found libpython2.3.a in /usr/lib/python2.3/config" )
! 				PY_LIBDIR = -L/usr/lib/python2.3/config -lpython2.3
! 			}
  
! 		}
! 		else {
! 			message( "Using Static Python Configuration..." )
! 			exists( /usr/local/lib/libpython2.3.so ) {
! 				message( "Found libpython2.3.so in /usr/local/lib" )
! 				PY_LIBDIR = -lpython2.3
! 			}
! 			exists( /usr/lib/libpython2.3.so ) {
! 				message( "Found libpython2.3.so in /usr/lib" )
! 				PY_LIBDIR = -lpython2.3
! 			}
  
! 		}
! 	}
! 
! 	INCLUDEPATH += $$PY_INCDIR $$MYSQL_INCDIR $$SQLITE_INCDIR
! 	LIBS += $$PY_LIBDIR $$MYSQL_LIBDIR $$SQLITE_LIBDIR
! 
! 	# We need to remove these to be safe
  	QMAKE_LIBS_X11 -= -lX11 -lXext -lm
  }
***************
*** 39,43 ****
  MOC_DIR = obj
  
! INCLUDEPATH += sqlite
  win32:DEFINES -= UNICODE
  
--- 122,126 ----
  MOC_DIR = obj
  
! win32:INCLUDEPATH += sqlite
  win32:DEFINES -= UNICODE
  
***************
*** 288,289 ****
--- 371,376 ----
  	data/AUTHORS.txt \
  	LICENSE.GPL
+ 
+ unix {
+ 	INCPATH -= /usr/include/python2.2
+ }
\ No newline at end of file

Index: configure.py
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** configure.py	2 Aug 2004 04:17:26 -0000	1.13
--- configure.py	5 Aug 2004 20:14:52 -0000	1.14
***************
*** 52,56 ****
  	sys.stdout.write( "Searching for qmake..." )
  	temp = ""
! 	
  	QMAKESEARCHPATH = [ os.path.join(os.path.join(os.environ["QTDIR"], "bin"), QMAKE_EXECUTABLE) ]
  	for dir in string.split( os.environ["PATH"], os.path.pathsep ):
--- 52,56 ----
  	sys.stdout.write( "Searching for qmake..." )
  	temp = ""
! 
  	QMAKESEARCHPATH = [ os.path.join(os.path.join(os.environ["QTDIR"], "bin"), QMAKE_EXECUTABLE) ]
  	for dir in string.split( os.environ["PATH"], os.path.pathsep ):
***************
*** 61,65 ****
  	qt_qmake = os.path.join(qmake_path, qmake_file)
  	sys.stdout.write( "%s\n" % qt_qmake )
! 	
  	return True
  
--- 61,65 ----
  	qt_qmake = os.path.join(qmake_path, qmake_file)
  	sys.stdout.write( "%s\n" % qt_qmake )
! 
  	return True
  
***************
*** 69,101 ****
  		PYTHONINCSEARCHPATH = [ sys.prefix + "\include\Python.h" ]
  	elif sys.platform == "linux2":
! 		PYTHONLIBSEARCHPATH = [ "/usr/local/lib/libpython*.so", \
! 					 "/usr/local/lib/[Pp]ython*/libpython*.so", \
! 					 "/usr/lib/libpython*.so", \
! 					 "/usr/lib/[Pp]ython*/libpython*.so", \
! 					 "/usr/lib/[Pp]ython*/config/libpython*.so", \
! 					 "/usr/local/lib/[Pp]ython*/config/libpython*.so"]
! 		PYTHONLIBSTATICSEARCHPATH = [ "/usr/local/lib/libpython*.a", \
! 					 "/usr/local/lib/[Pp]ython*/libpython*.a", \
! 					 "/usr/lib/libpython*.a", \
! 					 "/usr/lib/[Pp]ython*/libpython*.a", \
! 					 "/usr/lib/[Pp]ython*/config/libpython*.a", \
! 					 "/usr/local/lib/[Pp]ython*/config/libpython*.a"]
! 		PYTHONINCSEARCHPATH = [ "/usr/local/include/[Pp]ython*/Python.h", \
! 					 "/usr/include/[Pp]ython*/Python.h"]
  	elif sys.platform == "freebsd4":
! 		PYTHONLIBSEARCHPATH = [ "/usr/local/lib/libpython*.so", \
! 					 "/usr/local/lib/[Pp]ython*/libpython*.so", \
! 					 "/usr/lib/libpython*.so", \
! 					 "/usr/lib/[Pp]ython*/libpython*.so", \
! 					 "/usr/lib/[Pp]ython*/config/libpython*.so", \
! 					 "/usr/local/lib/[Pp]ython*/config/libpython*.so"]
! 		PYTHONLIBSTATICSEARCHPATH = [ "/usr/local/lib/libpython*.a", \
! 					 "/usr/local/lib/[Pp]ython*/libpython*.a", \
! 					 "/usr/lib/libpython*.a", \
! 					 "/usr/lib/[Pp]ython*/libpython*.a", \
! 					 "/usr/lib/[Pp]ython*/config/libpython*.a", \
! 					 "/usr/local/lib/[Pp]ython*/config/libpython*.a"]
! 		PYTHONINCSEARCHPATH = [ "/usr/local/include/[Pp]ython*/Python.h", \
! 					 "/usr/include/[Pp]ython*/Python.h"]
  
  	else:
--- 69,101 ----
  		PYTHONINCSEARCHPATH = [ sys.prefix + "\include\Python.h" ]
  	elif sys.platform == "linux2":
! 		PYTHONLIBSEARCHPATH = [ "/usr/local/lib/libpython2.3*.so", \
! 					 "/usr/local/lib/[Pp]ython*/libpython2.3*.so", \
! 					 "/usr/lib/libpython2.3*.so", \
! 					 "/usr/lib/[Pp]ython*/libpython2.3*.so", \
! 					 "/usr/lib/[Pp]ython*/config/libpython2.3*.so", \
! 					 "/usr/local/lib/[Pp]ython*/config/libpython2.3*.so"]
! 		PYTHONLIBSTATICSEARCHPATH = [ "/usr/local/lib/libpython2.3*.a", \
! 					 "/usr/local/lib/[Pp]ython2.3*/libpython2.3*.a", \
! 					 "/usr/lib/libpython2.3*.a", \
! 					 "/usr/lib/[Pp]ython2.3*/libpython2.3*.a", \
! 					 "/usr/lib/[Pp]ython2.3*/config/libpython2.3*.a", \
! 					 "/usr/local/lib/[Pp]ython2.3*/config/libpython2.3*.a"]
! 		PYTHONINCSEARCHPATH = [ "/usr/local/include/[Pp]ython2.3*/Python.h", \
! 					 "/usr/include/[Pp]ython2.3*/Python.h"]
  	elif sys.platform == "freebsd4":
! 		PYTHONLIBSEARCHPATH = [ "/usr/local/lib/libpython2.3*.so", \
! 					 "/usr/local/lib/[Pp]ython2.3*/libpython2.3*.so", \
! 					 "/usr/lib/libpython2.3*.so", \
! 					 "/usr/lib/[Pp]ython2.3*/libpython2.3*.so", \
! 					 "/usr/lib/[Pp]ython2.3*/config/libpython2.3*.so", \
! 					 "/usr/local/lib/[Pp]ython2.3*/config/libpython2.3*.so"]
! 		PYTHONLIBSTATICSEARCHPATH = [ "/usr/local/lib/libpython2.3*.a", \
! 					 "/usr/local/lib/[Pp]ython2.3*/libpython2.3*.a", \
! 					 "/usr/lib/libpython2.3*.a", \
! 					 "/usr/lib/[Pp]ython2.3*/libpython2.3*.a", \
! 					 "/usr/lib/[Pp]ython2.3*/config/libpython2.3*.a", \
! 					 "/usr/local/lib/[Pp]ython2.3*/config/libpython2.3*.a"]
! 		PYTHONINCSEARCHPATH = [ "/usr/local/include/[Pp]ython2.3*/Python.h", \
! 					 "/usr/include/[Pp]ython2.3*/Python.h"]
  
  	else:
***************
*** 112,116 ****
  	if options.py_libpath:
  		PYTHONLIBSEARCHPATH = [ options.py_libpath ]
! 	
  	sys.stdout.write( "Checking Python version... " )
  	if sys.hexversion >= 0x020300F0:
--- 112,116 ----
  	if options.py_libpath:
  		PYTHONLIBSEARCHPATH = [ options.py_libpath ]
! 
  	sys.stdout.write( "Checking Python version... " )
  	if sys.hexversion >= 0x020300F0:
***************
*** 133,139 ****
                  sys.stdout.write("\nError: Wolfpack currently only supports little endian systems\n" )
                  sys.exit();
!         
  	sys.stdout.write( "Searching for Python library... " )
! 	
  	global py_libpath
  	global py_libfile
--- 133,139 ----
                  sys.stdout.write("\nError: Wolfpack currently only supports little endian systems\n" )
                  sys.exit();
! 
  	sys.stdout.write( "Searching for Python library... " )
! 
  	global py_libpath
  	global py_libfile
***************
*** 155,159 ****
  		sys.stdout.write("Not Found!\n")
  		sys.exit()
! 	
  	return True
  
--- 155,159 ----
  		sys.stdout.write("Not Found!\n")
  		sys.exit()
! 
  	return True
  
***************
*** 169,173 ****
          parser.add_option("--static", action="store_true", dest="staticlink", help="Build wokfpack using static libraries")
  	(options, args) = parser.parse_args()
! 	
  	checkPython(options)
  	checkQt()
--- 169,173 ----
          parser.add_option("--static", action="store_true", dest="staticlink", help="Build wokfpack using static libraries")
  	(options, args) = parser.parse_args()
! 
  	checkPython(options)
  	checkQt()
***************
*** 178,186 ****
  	global py_incpath
  	global qt_qmake
! 		
  	config = file("config.pri", "w")
  	config.write("# WARNING: This file was automatically generated by configure.py\n ")
  	config.write("#          any changes to this file will be lost!\n")
! 	
  	config.write("INCLUDEPATH += %s\n" % ( py_incpath ) )
  	# Build LIBS
--- 178,186 ----
  	global py_incpath
  	global qt_qmake
! 
  	config = file("config.pri", "w")
  	config.write("# WARNING: This file was automatically generated by configure.py\n ")
  	config.write("#          any changes to this file will be lost!\n")
! 
  	config.write("INCLUDEPATH += %s\n" % ( py_incpath ) )
  	# Build LIBS
***************
*** 190,197 ****
  	else:
  		LIBS = "-l%s -L%s" % ( py_libfile, py_libpath )
! 	
  	config.write("LIBS += %s\n" % LIBS)
  	config.close()
! 	
  	sys.stdout.write("Generating makefile...\n")
  	os.spawnv(os.P_WAIT, qt_qmake, [qt_qmake, "wolfpack.pro"])
--- 190,197 ----
  	else:
  		LIBS = "-l%s -L%s" % ( py_libfile, py_libpath )
! 
  	config.write("LIBS += %s\n" % LIBS)
  	config.close()
! 
  	sys.stdout.write("Generating makefile...\n")
  	os.spawnv(os.P_WAIT, qt_qmake, [qt_qmake, "wolfpack.pro"])
***************
*** 201,205 ****
  	sys.stdout.write("Done\n")
  	sys.stdout.write("Configure finished. Please run make now.\n")
! 	
  if __name__ == "__main__":
      main()
--- 201,205 ----
  	sys.stdout.write("Done\n")
  	sys.stdout.write("Configure finished. Please run make now.\n")
! 
  if __name__ == "__main__":
      main()

[wpdev-commits] xmlscripts/definitions/npcs/monsters/juka index.xml,NONE,1.1

[Klaus M. \(naddel_tdv\) <nad...@us...>]

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/juka
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26082

Added Files:
	index.xml 
Log Message:
forgot this...

--- NEW FILE: index.xml ---
<!--
/*=========================================================
 *   )      (\_     | WOLFPACK 13.0.0 Scripts
 *  ((    _/{  "-;  |
 *   )).-' {{ ;'`   |
 *  ( (  ;._ \\     |
 *=======================================================*/
-->
<definitions>

	<!-- Juka -->
	<include file="definitions/npcs/monsters/juka/juka_lord.xml" />
	<include file="definitions/npcs/monsters/juka/juka_mage.xml" />
	<include file="definitions/npcs/monsters/juka/juka_warrior.xml" />

</definitions>

[wpdev-commits] xmlscripts/definitions/npcs/monsters/juka juka_lord.xml,NONE,1.1 juka_mage.xml,NONE,1.1 juka_warrior.xml,NONE,1.1

[Klaus M. \(naddel_tdv\) <nad...@us...>]

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/juka
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23678/juka

Added Files:
	juka_lord.xml juka_mage.xml juka_warrior.xml 
Log Message:
monster update by Incarnus

--- NEW FILE: juka_mage.xml ---
<!--
/*=========================================================
 *   )      (\_     | WOLFPACK 13.0.0 Scripts
 *  ((    _/{  "-;  | Created by:
 *   )).-' {{ ;'`   | Revised by:
 *  ( (  ;._ \\     | Last modification:
 *=======================================================*/
-->
<definitions>

	<!-- Juka Mage -->
	<npc id="juka_mage" inherit="monster_base">
		<name>juka mage</name>
		<id>765</id>
		<karma>-15000</karma>
		<fame>15000</fame>
		<!-- Stats -->
		<str><random min="201" max="300"/></str>
		<dex><random min="71" max="90"/></dex>
		<int><random min="451" max="500"/></int>
		<maxhitpoints><random min="121" max="180"/></maxhitpoints>
		<maxstamina><random min="71" max="90"/></maxstamina>
		<maxmana><random min="451" max="500"/></maxmana>
		<!-- Skills -->
		<wrestling><random min="801" max="900"/></wrestling>
		<tactics><random min="801" max="900"/></tactics>
		<magicresistance><random min="1401" max="1500"/></magicresistance>
		<anatomy><random min="801" max="900"/></anatomy>
		<magery><random min="802" max="1000"/></magery>
		<evaluatingintel><random min="802" max="1000"/></evaluatingintel>
		<meditation><random min="0" max="0"/></meditation>
		<!-- Damage -->
		<mindamage>11</mindamage>
		<maxdamage>27</maxdamage>
		<!-- Damage Properties -->
		<!--
		<tag name="dmg_fire" value="0" type="int" />
		<tag name="dmg_cold" value="0" type="int" />
		<tag name="dmg_poison" value="0" type="int" />
		<tag name="dmg_energy" value="0" type="int" />
		-->
		<!-- Resist Properties -->
		<tag name="res_physical" value="20,30" type="int" />
		<tag name="res_fire" value="35,45" type="int" />
		<tag name="res_cold" value="30,40" type="int" />
		<tag name="res_poison" value="10,20" type="int" />
		<tag name="res_energy" value="35,45" type="int" />
		<!-- Loot Packs -->
		<!-- Missing: 2 Medium Level Scrolls, Bag with 2-6 of each reagent, 1 Arcane Gem -->
		<lootpacks>gold_filthy_rich;gems</lootpacks>
		<!-- Misc. -->
		<category>Monsters\Juka\Juka Mage</category>
	</npc>

</definitions>

--- NEW FILE: juka_lord.xml ---
<!--
/*=========================================================
 *   )      (\_     | WOLFPACK 13.0.0 Scripts
 *  ((    _/{  "-;  | Created by:
 *   )).-' {{ ;'`   | Revised by:
 *  ( (  ;._ \\     | Last modification:
 *=======================================================*/
-->
<definitions>

	<!-- Juka Lord -->
	<npc id="juka_lord" inherit="monster_base">
		<name>juka lord</name>
		<id>766</id>
		<karma>-15000</karma>
		<fame>15000</fame>
		<!-- Stats -->
		<str><random min="401" max="500"/></str>
		<dex><random min="81" max="100"/></dex>
		<int><random min="151" max="200"/></int>
		<maxhitpoints><random min="241" max="300"/></maxhitpoints>
		<maxstamina><random min="81" max="100"/></maxstamina>
		<maxmana><random min="151" max="200"/></maxmana>
		<!-- Skills -->
		<wrestling><random min="901" max="1000"/></wrestling>
		<tactics><random min="951" max="1000"/></tactics>
		<magicresistance><random min="1201" max="1300"/></magicresistance>
		<anatomy><random min="901" max="1000"/></anatomy>
		<!-- Damage -->
		<mindamage>52</mindamage>
		<maxdamage>63</maxdamage>
		<!-- Damage Properties -->
		<!--
		<tag name="dmg_fire" value="0" type="int" />
		<tag name="dmg_cold" value="0" type="int" />
		<tag name="dmg_poison" value="0" type="int" />
		<tag name="dmg_energy" value="0" type="int" />
		-->
		<!-- Resist Properties -->
		<tag name="res_physical" value="40,50" type="int" />
		<tag name="res_fire" value="45,50" type="int" />
		<tag name="res_cold" value="40,50" type="int" />
		<tag name="res_poison" value="20,25" type="int" />
		<tag name="res_energy" value="40,50" type="int" />
		<!-- Loot Packs -->
		<!-- Missing: 10-30 Bandages, 50-70 Arrows, Magic Items, Juka Slayer Bow, 1 Arcane Gem -->
		<lootpacks>gems;gold_rich;gold_meager</lootpacks>
		<!-- Misc. -->
		<category>Monsters\Juka\Juka Lord</category>
	</npc>

</definitions>

--- NEW FILE: juka_warrior.xml ---
<!--
/*=========================================================
 *   )      (\_     | WOLFPACK 13.0.0 Scripts
 *  ((    _/{  "-;  | Created by:
 *   )).-' {{ ;'`   | Revised by:
 *  ( (  ;._ \\     | Last modification:
 *=======================================================*/
-->
<definitions>

	<!-- Juka Warrior -->
	<npc id="juka_warrior" inherit="monster_base">
		<name>juka warrior</name>
		<id>764</id>
		<karma>-10000</karma>
		<fame>10000</fame>
		<!-- Stats -->
		<str><random min="251" max="350"/></str>
		<dex><random min="61" max="80"/></dex>
		<int><random min="101" max="150"/></int>
		<maxhitpoints><random min="151" max="210"/></maxhitpoints>
		<maxstamina><random min="61" max="80"/></maxstamina>
		<maxmana><random min="101" max="150"/></maxmana>
		<!-- Skills -->
		<wrestling><random min="801" max="900"/></wrestling>
		<tactics><random min="801" max="900"/></tactics>
		<magicresistance><random min="1201" max="1300"/></magicresistance>
		<anatomy><random min="801" max="900"/></anatomy>
		<!-- Damage -->
		<mindamage>20</mindamage>
		<maxdamage>26</maxdamage>
		<!-- Damage Properties -->
		<!--
		<tag name="dmg_fire" value="0" type="int" />
		<tag name="dmg_cold" value="0" type="int" />
		<tag name="dmg_poison" value="0" type="int" />
		<tag name="dmg_energy" value="0" type="int" />
		-->
		<!-- Resist Properties -->
		<tag name="res_physical" value="40,50" type="int" />
		<tag name="res_fire" value="30,40" type="int" />
		<tag name="res_cold" value="25,35" type="int" />
		<tag name="res_poison" value="10,20" type="int" />
		<tag name="res_energy" value="10,20" type="int" />
		<!-- Loot Packs -->
		<lootpacks>gems;gold_good</lootpacks>
		<!-- Misc. -->
		<category>Monsters\Juka\Juka Warrior</category>
	</npc>

</definitions>

[wpdev-commits] xmlscripts/definitions/npcs/monsters monster_list.xml,1.11,1.12

[Klaus M. \(naddel_tdv\) <nad...@us...>]

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23678

Modified Files:
	monster_list.xml 
Log Message:
monster update by Incarnus

Index: monster_list.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/monster_list.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** monster_list.xml	4 Aug 2004 15:23:43 -0000	1.11
--- monster_list.xml	5 Aug 2004 13:20:01 -0000	1.12
***************
*** 38,41 ****
--- 38,44 ----
  	<!-- Insect / Arachnid -->
  	<include file="definitions/npcs/monsters/insect/index.xml" />
+ 	
+ 	<!-- Juka -->
+ 	<include file="definitions/npcs/monsters/juka/index.xml" />
  
  	<!-- Lizardmen -->

[wpdev-commits] xmlscripts/definitions/npcs/monsters/daemonic horde_minion.xml,1.13,1.14

[Klaus M. \(naddel_tdv\) <nad...@us...>]

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23678/daemonic

Modified Files:
	horde_minion.xml 
Log Message:
monster update by Incarnus

Index: horde_minion.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/horde_minion.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** horde_minion.xml	16 Jun 2004 18:58:15 -0000	1.13
--- horde_minion.xml	5 Aug 2004 13:20:00 -0000	1.14
***************
*** 52,54 ****
--- 52,60 ----
  	</npc>
  
+ 	<!-- Colored Horde Minion -->
+ 	<npc id="horde_minion_4" inherit="horde_minion">
+ 		<id>999</id>
+ 		<category>Monsters\Daemonic\Horde Minion (Colored)</category>
+ 	</npc>
+ 
  </definitions>

[wpdev-commits] xmlscripts/definitions/npcs/monsters/clockwork exodus_minion_lord.xml,NONE,1.1 index.xml,1.1,1.2

[Klaus M. \(naddel_tdv\) <nad...@us...>]

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/clockwork
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23678/clockwork

Modified Files:
	index.xml 
Added Files:
	exodus_minion_lord.xml 
Log Message:
monster update by Incarnus

Index: index.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/clockwork/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** index.xml	3 Jun 2004 19:06:25 -0000	1.1
--- index.xml	5 Aug 2004 13:20:00 -0000	1.2
***************
*** 14,17 ****
--- 14,18 ----
  	<include file="definitions/npcs/monsters/clockwork/centaur.xml" />
  	<include file="definitions/npcs/monsters/clockwork/exodus_minion.xml" />
+ 	<include file="definitions/npcs/monsters/clockwork/exodus_minion_lord.xml" />
  	<include file="definitions/npcs/monsters/clockwork/exodus_overseer.xml" />
  	<include file="definitions/npcs/monsters/clockwork/golem.xml" />

--- NEW FILE: exodus_minion_lord.xml ---
<!--
/*=========================================================
 *   )      (\_     | WOLFPACK 13.0.0 Scripts
 *  ((    _/{  "-;  | Created by: Dreoth
 *   )).-' {{ ;'`   | Revised by:
 *  ( (  ;._ \\     | Last modification:
 *=======================================================*/
-->
<definitions>

	<!-- Exodus Minion Lord-->
	<npc id="exodus_minion_lord" inherit="monster_base">
		<name>exodus minion lord</name>
		<id>763</id>
		<karma><random list="KARMA_L5" /></karma>
		<fame><random list="FAME_L5" /></fame>
		<!-- Stats -->
		<str><random min="851" max="950"/></str>
		<dex><random min="101" max="110"/></dex>
		<int><random min="81" max="110"/></int>
		<maxhitpoints><random min="811" max="1070" /></maxhitpoints>
		<!-- Skills -->
		<magicresistance><random min="951" max="1100"/></magicresistance>
		<tactics><random min="951" max="1000"/></tactics>
		<wrestling><random min="951" max="1000"/></wrestling>
		<anatomy>0</anatomy>
		<!-- Damage -->
		<mindamage>89</mindamage>
		<maxdamage>98</maxdamage>
		<!-- Resists -->
		<tag name="res_cold" value="25,35" type="int" />
		<tag name="res_energy" value="25,35" type="int" />
		<tag name="res_fire" value="45,55" type="int" />
		<tag name="res_physical" value="65,70" type="int" />
		<tag name="res_poison" value="20,30" type="int" />
		<!-- Misc. -->
		<!-- Missing: Arcane Gem, Clockwork Assembly, 2 Power Crystal -->
		<lootpacks>lootpack_rich;lootpack_average</lootpacks>
		<category>Monsters\Clockwork\Exodus Minion Lord</category>
	</npc>

</definitions>

[wpdev-commits] xmlscripts/definitions/npcs/monsters/juka - New directory

[Klaus M. \(naddel_tdv\) <nad...@us...>]

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/juka
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23568/juka

Log Message:
Directory /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/juka added to the repository

[wpdev-commits] wolfpack skills.cpp,1.228,1.229 targetrequests.cpp,1.101,1.102 targetrequests.h,1.71,1.72

[Correa <thi...@us...>]

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

Modified Files:
	skills.cpp targetrequests.cpp targetrequests.h 
Log Message:
Removed some skill leftover stuff, if something stopped working it's because it was missing in python, and should be scripted.

Index: targetrequests.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** targetrequests.cpp	4 Aug 2004 23:17:37 -0000	1.101
--- targetrequests.cpp	5 Aug 2004 01:48:38 -0000	1.102
***************
*** 47,156 ****
  #include <math.h>
  
- bool cSkStealing::responsed( cUOSocket* socket, cUORxTarget* target )
- {
- 	int i, skill;
- 	char temp2[512];
- 	char temp[512];
- 	tile_st tile;
- 	P_PLAYER pc_currchar = socket->player();
- 	int cansteal = QMAX( 1, pc_currchar->skillValue( STEALING ) / 10 );
- 	cansteal = cansteal * 10;
- 
- 	if ( isCharSerial( target->serial() ) )
- 	{
- 		Skills::instance()->RandomSteal( socket, target->serial() );
- 		return true;
- 	}
- 
- 	const P_ITEM pi = FindItemBySerial( target->serial() );
- 	if ( !pi )
- 	{
- 		socket->sysMessage( tr( "You cannot steal that." ) );
- 		return true;
- 	}
- 
- 	if ( pi->layer() != 0		// no stealing for items on layers other than 0 (equipped!) ,
- 		|| pi->newbie()			// newbie items,
- 		|| pi->isInWorld() )	// and items not being in containers allowed !
- 	{
- 		socket->sysMessage( tr( "You cannot steal that." ) );
- 		return true;
- 	}
- 	if ( ( pi->totalweight() ) > cansteal ) // LB, bugfix, (no weight check)
- 	{
- 		socket->sysMessage( tr( "That is too heavy." ) );
- 		return true;
- 	}
- 
- 	P_CHAR pc_npc = pi->getOutmostChar();
- 
- 	/*	if (pc_npc->npcaitype() == 17)
- 		{
- 			socket->sysMessage( tr("You cannot steal that.") );
- 			return true;
- 		}*/
- 
- 	if ( pc_npc == pc_currchar )
- 	{
- 		socket->sysMessage( tr( "You catch yourself red handed." ) );
- 		return true;
- 	}
- 
- 	skill = pc_currchar->checkSkill( STEALING, 0, 999 );
- 	if ( pc_currchar->inRange( pc_npc, 1 ) )
- 	{
- 		if ( skill )
- 		{
- 			P_ITEM pi_pack = pc_currchar->getBackpack();
- 			if ( pi_pack == NULL )
- 				return true;
- 			pi_pack->addItem( pi );
- 			socket->sysMessage( tr( "You successfully steal that item." ) );
- 			pi->update();
- 		}
- 		else
- 			socket->sysMessage( tr( "You failed to steal that item." ) );
- 
- 		if ( ( ( !( skill ) ) && ( rand() % 16 == 7 ) ) || ( pc_currchar->skillValue( STEALING ) < rand() % 1001 ) )
- 		{
- 			socket->sysMessage( tr( "You have been cought!" ) );
- 
- 			if ( pc_npc != NULL ) //lb
- 			{
- 				if ( pc_npc->objectType() == enNPC )
- 					pc_npc->talk( tr( "Guards!! A thief is amoung us!" ), -1, 0x09 );
- 
- 				pc_currchar->isCriminal();
- 
- 				if ( pc_npc->notoriety( pc_currchar ) == 0x01 )
- 				{
- 					pc_currchar->makeCriminal();
- 				}
- 
- 				if ( !pi->name().isNull() )
- 				{
- 					sprintf( ( char * ) temp, tr( "You notice %1 trying to steal %2 from you!" ).arg( pc_currchar->name() ).arg( pi->name() ) );
- 					sprintf( ( char * ) temp2, tr( "You notice %1 trying to steal %2 from %3!" ).arg( pc_currchar->name() ).arg( pi->name() ).arg( pc_npc->name() ) );
- 				}
- 				else
- 				{
- 					tile = TileCache::instance()->getTile( pi->id() );
- 					sprintf( ( char * ) temp, tr( "You notice %1 trying to steal %2 from you!" ).arg( pc_currchar->name() ).arg( ( char * ) tile.name ) );
- 					sprintf( ( char * ) temp2, tr( "You notice %1 trying to steal %2 from %3!" ).arg( pc_currchar->name() ).arg( ( char * ) tile.name ).arg( pc_npc->name() ) );
- 				}
- 				socket->sysMessage( ( char * ) temp ); //lb
- 			}
- 			for ( cUOSocket*mSock = Network::instance()->first(); mSock; mSock = Network::instance()->next() )
- 			{
- 				if ( mSock != socket && mSock->player() && mSock->player()->inRange( pc_currchar, mSock->viewRange() ) && ( rand() % 10 + 10 == 17 || ( rand() % 2 == 1 && mSock->player()->intelligence() >= pc_currchar->intelligence() ) ) )
- 					mSock->sysMessage( temp2 );
- 			}
- 		}
- 	}
- 	else
- 		socket->sysMessage( tr( "You are too far away to steal that item." ) );
- 	return true;
- }
- 
  bool cSetTarget::responsed( cUOSocket* socket, cUORxTarget* target )
  {
--- 47,50 ----

Index: targetrequests.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** targetrequests.h	9 Jul 2004 07:40:59 -0000	1.71
--- targetrequests.h	5 Aug 2004 01:48:38 -0000	1.72
***************
*** 43,150 ****
  #include "ai/ai.h"
  
- // Stealing
- class cSkStealing : public cTargetRequest
- {
- public:
- 	bool cSkStealing::responsed( cUOSocket* socket, cUORxTarget* target );
- };
- 
- 
- // Forensics Evaluation
- class cSkForensics : public cTargetRequest
- {
- public:
- 	virtual bool responsed( cUOSocket* socket, cUORxTarget* target )
- 	{
- 		P_ITEM pi = FindItemBySerial( target->serial() );
- 		P_PLAYER pc_currchar = socket->player();
- 
- 		if ( !pi || !pi->corpse() )
- 		{
- 			socket->sysMessage( tr( "That does not appear to be a corpse." ) );
- 			return true;
- 		}
- 
- 		cCorpse* corpse = dynamic_cast<cCorpse*>( pi );
- 		if ( !corpse )
- 			return true;
- 
- 		unsigned int currentTime = Server::instance()->time();
- 		unsigned int age = currentTime - corpse->murderTime();
- 		P_CHAR murderer = FindCharBySerial(corpse->murderer());
- 		QString murderername = QString::null;
- 
- 		if (murderer) {
- 			murderername = murderer->name();
- 		}
- 
- 		if ( pc_currchar->isGM() )
- 		{
- 			socket->sysMessage( tr( "The %1 is %2 seconds old and the killer was %3." ).arg( corpse->name() ).arg( age ).arg( murderername ) );
- 		}
- 		else
- 		{
- 			if ( !pc_currchar->checkSkill( FORENSICS, 0, 500 ) )
- 				socket->sysMessage( tr( "You are not certain about the corpse." ) );
- 			else
- 			{
- 				if ( age > 180 )
- 					socket->sysMessage( tr( "The %1 is many many seconds old." ).arg( corpse->name() ) );
- 				else if ( age > 60 )
- 					socket->sysMessage( tr( "The %1 is many seconds old." ).arg( corpse->name() ) );
- 				else if ( age <= 60 )
- 					socket->sysMessage( tr( "The %1 is few seconds old." ).arg( corpse->name() ) );
- 
- 				if ( !pc_currchar->checkSkill( FORENSICS, 500, 1000, false ) || murderername.isEmpty() )
- 					socket->sysMessage( tr( "You can't say who was the killer." ) );
- 				else
- 				{
- 					socket->sysMessage( tr( "The killer was %1." ).arg( murderername ) );
- 				}
- 			}
- 		}
- 		return true;
- 	}
- };
- 
- 
- // Poisoning
- class cSkPoisoning : public cTargetRequest
- {
- 	bool poisonSelected;
- 	P_ITEM pPoison;
- public:
- 	cSkPoisoning() : poisonSelected( false ), pPoison( 0 )
- 	{
- 	}
- 
- 	bool selectPoison( cUOSocket* socket, cUORxTarget* target )
- 	{
- 		pPoison = FindItemBySerial( target->serial() );
- 		if ( !pPoison || pPoison->type() != 19 || pPoison->type() != 6 )
- 		{
- 			socket->sysMessage( tr( "That is not a valid poison" ) );
- 			return true;
- 		}
- 		poisonSelected = true;
- 		return false; // Resend the target request
- 	}
- 
- 	bool poisonItem( cUOSocket* socket, cUORxTarget* target )
- 	{
- 		Q_UNUSED( socket );
- 		Q_UNUSED( target );
- 		return true;
- 	}
- 
- 	virtual bool responsed( cUOSocket* socket, cUORxTarget* target )
- 	{
- 		if ( poisonSelected )
- 			return poisonItem( socket, target );
- 		else
- 			return selectPoison( socket, target );
- 	}
- };
- 
  class cKillTarget : public cTargetRequest
  {
--- 43,46 ----

Index: skills.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/skills.cpp,v
retrieving revision 1.228
retrieving revision 1.229
diff -C2 -d -r1.228 -r1.229
*** skills.cpp	4 Aug 2004 23:17:36 -0000	1.228
--- skills.cpp	5 Aug 2004 01:48:38 -0000	1.229
***************
*** 95,119 ****
  	switch ( id )
  	{
- 	case STEALING:
- 		if ( !Config::instance()->stealingEnabled() )
- 		{
- 			socket->sysMessage( tr( "That skill has been disabled." ) );
- 			return;
- 		}
- 
- 		message = tr( "What do you wish to steal?" );
- 		targetRequest = new cSkStealing;
- 		break;
- 	case TRACKING:
- 		trackingMenu( socket );
- 		break;
- 	case FORENSICS:
- 		message = tr( "What corpse do you want to examine?" );
- 		targetRequest = new cSkForensics;
- 		break;
- 	case POISONING:
- 		message = tr( "What poison do you want to apply?" );
- 		targetRequest = new cSkPoisoning;
- 		break;
  	case MEDITATION:
  		Skills::instance()->Meditation( socket );
--- 95,98 ----

[wpdev-commits] wolfpack/network uosocket.cpp,1.385,1.386

[Correa <thi...@us...>]

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

Modified Files:
	uosocket.cpp 
Log Message:
Fixed bug  0000192
did some refactoring on cUOSocket::sendStatWindow. Reduced the 
number of branches ( duplicates. )

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.385
retrieving revision 1.386
diff -C2 -d -r1.385 -r1.386
*** uosocket.cpp	4 Aug 2004 23:17:38 -0000	1.385
--- uosocket.cpp	5 Aug 2004 01:29:04 -0000	1.386
***************
*** 611,615 ****
  	QValueVector<P_PLAYER> characters = _account->caracterList();
  
! 	if ( packet->slot() >= characters.size() )
  	{
  		cUOTxDenyLogin denyLogin;
--- 611,615 ----
  	QValueVector<P_PLAYER> characters = _account->caracterList();
  
! 	if ( packet->slot() > characters.size() )
  	{
  		cUOTxDenyLogin denyLogin;
***************
*** 2364,2367 ****
--- 2364,2370 ----
  	sendStats.setAllowRename( ( ( pChar->objectType() == enNPC && dynamic_cast<P_NPC>( pChar )->owner() == _player && !pChar->isHuman() ) || _player->isGM() ) && ( _player != pChar ) );
  
+ 	sendStats.setName( pChar->name() );
+ 	sendStats.setSerial( pChar->serial() );
+ 
  	if ( pChar != _player )
  	{
***************
*** 2376,2387 ****
  		sendStats.setMaxHp( pChar->maxHitpoints() );
  		sendStats.setHp( pChar->hitpoints() );
- 	}
- 
- 	sendStats.setName( pChar->name() );
- 	sendStats.setSerial( pChar->serial() );
- 
- 	// Set the rest - and reset if nec.
- 	if ( pChar == _player )
- 	{
  		sendStats.setStamina( _player->stamina() );
  		sendStats.setMaxStamina( _player->maxStamina() );
--- 2379,2382 ----
***************
*** 2418,2433 ****
  		stats.setLocks( _player->strengthLock(), _player->dexterityLock(), _player->intelligenceLock() );
  		send( &stats );
- 	}
  
! 	// Send the packet to our party members too
! 	if ( pChar == _player && _player->party() )
! 	{
! 		QPtrList<cPlayer> members = _player->party()->members();
! 
! 		for ( P_PLAYER member = members.first(); member; member = members.next() )
  		{
! 			if ( member->socket() && member != _player )
  			{
! 				member->socket()->send( &sendStats );
  			}
  		}
--- 2413,2428 ----
  		stats.setLocks( _player->strengthLock(), _player->dexterityLock(), _player->intelligenceLock() );
  		send( &stats );
  
! 		// Send the packet to our party members too
! 		if ( _player->party() )
  		{
! 			QPtrList<cPlayer> members = _player->party()->members();
! 
! 			for ( P_PLAYER member = members.first(); member; member = members.next() )
  			{
! 				if ( member->socket() && member != _player )
! 				{
! 					member->socket()->send( &sendStats );
! 				}
  			}
  		}

[wpdev-commits] wolfpack serverconfig.cpp,NONE,1.1 serverconfig.h,NONE,1.1 accounts.cpp,1.96,1.97 basechar.cpp,1.122,1.123 combat.cpp,1.172,1.173 commands.cpp,1.251,1.252 configure,1.34,1.35 console.cpp,1.21,1.22 corpse.cpp,1.59,1.60 definitions.cpp,1.11,1.12 dragdrop.cpp,1.237,1.238 gumps.cpp,1.167,1.168 items.cpp,1.427,1.428 log.cpp,1.18,1.19 npc.cpp,1.100,1.101 player.cpp,1.113,1.114 server.cpp,1.13,1.14 skills.cpp,1.227,1.228 spawnregions.cpp,1.65,1.66 speech.cpp,1.181,1.182 targetrequests.cpp,1.100,1.101 territories.cpp,1.50,1.51 timers.cpp,1.4,1.5 timing.cpp,1.8,1.9 trade.cpp,1.4,1.5 walking.cpp,1.129,1.130 wolf.dsp,1.268,1.269 wolfpack.pro,1.199,1.200 wolfpack.vcproj,1.38,1.39 world.cpp,1.106,1.107 config.cpp,1.8,NONE config.h,1.7,NONE

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

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

Modified Files:
	accounts.cpp basechar.cpp combat.cpp commands.cpp configure 
	console.cpp corpse.cpp definitions.cpp dragdrop.cpp gumps.cpp 
	items.cpp log.cpp npc.cpp player.cpp server.cpp skills.cpp 
	spawnregions.cpp speech.cpp targetrequests.cpp territories.cpp 
	timers.cpp timing.cpp trade.cpp walking.cpp wolf.dsp 
	wolfpack.pro wolfpack.vcproj world.cpp 
Added Files:
	serverconfig.cpp serverconfig.h 
Removed Files:
	config.cpp config.h 
Log Message:
config.h and config.cpp moved to serverconfig.h and serverconfig.cpp
This is to prevent a conflict with Automake.


Index: trade.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/trade.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** trade.cpp	2 Jun 2004 15:04:07 -0000	1.4
--- trade.cpp	4 Aug 2004 23:17:37 -0000	1.5
***************
*** 28,32 ****
  #include "trade.h"
  #include "inlines.h"
! #include "config.h"
  #include "typedefs.h"
  #include "basechar.h"
--- 28,32 ----
  #include "trade.h"
  #include "inlines.h"
! #include "serverconfig.h"
  #include "typedefs.h"
  #include "basechar.h"
***************
*** 315,319 ****
  				continue;
  
! 			if ( ( *it )->id() == pItem->id() && ( *it )->color() == pItem->color() && 
  				//					(*it)->amount() >= pItem->amount() &&
  				( *it )->eventList() == pItem->eventList() )
--- 315,319 ----
  				continue;
  
! 			if ( ( *it )->id() == pItem->id() && ( *it )->color() == pItem->color() &&
  				//					(*it)->amount() >= pItem->amount() &&
  				( *it )->eventList() == pItem->eventList() )

Index: wolf.dsp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v
retrieving revision 1.268
retrieving revision 1.269
diff -C2 -d -r1.268 -r1.269
*** wolf.dsp	29 Jul 2004 19:36:19 -0000	1.268
--- wolf.dsp	4 Aug 2004 23:17:37 -0000	1.269
***************
*** 8,24 ****
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
! !MESSAGE 
  !MESSAGE NMAKE /f "wolf.mak".
! !MESSAGE 
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
! !MESSAGE 
  !MESSAGE NMAKE /f "wolf.mak" CFG="wolf - Win32 Debug"
! !MESSAGE 
  !MESSAGE Possible choices for configuration are:
! !MESSAGE 
  !MESSAGE "wolf - Win32 Release" (based on "Win32 (x86) Console Application")
  !MESSAGE "wolf - Win32 Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE 
  
  # Begin Project
--- 8,24 ----
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
! !MESSAGE
  !MESSAGE NMAKE /f "wolf.mak".
! !MESSAGE
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
! !MESSAGE
  !MESSAGE NMAKE /f "wolf.mak" CFG="wolf - Win32 Debug"
! !MESSAGE
  !MESSAGE Possible choices for configuration are:
! !MESSAGE
  !MESSAGE "wolf - Win32 Release" (based on "Win32 (x86) Console Application")
  !MESSAGE "wolf - Win32 Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE
  
  # Begin Project
***************
*** 80,84 ****
  # SUBTRACT LINK32 /pdb:none /map
  
! !ENDIF 
  
  # Begin Target
--- 80,84 ----
  # SUBTRACT LINK32 /pdb:none /map
  
! !ENDIF
  
  # Begin Target
***************
*** 131,135 ****
  # Begin Source File
  
! SOURCE=.\config.cpp
  # End Source File
  # Begin Source File
--- 131,135 ----
  # Begin Source File
  
! SOURCE=.\serverconfig.cpp
  # End Source File
  # Begin Source File
***************
*** 366,370 ****
  # Begin Source File
  
! SOURCE=.\config.h
  # End Source File
  # Begin Source File
--- 366,370 ----
  # Begin Source File
  
! SOURCE=.\serverconfig.h
  # End Source File
  # Begin Source File
***************
*** 676,680 ****
  # PROP Ignore_Default_Tool 1
  
! !ENDIF 
  
  # End Source File
--- 676,680 ----
  # PROP Ignore_Default_Tool 1
  
! !ENDIF
  
  # End Source File

Index: gumps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/gumps.cpp,v
retrieving revision 1.167
retrieving revision 1.168
diff -C2 -d -r1.167 -r1.168
*** gumps.cpp	27 Jul 2004 06:35:21 -0000	1.167
--- gumps.cpp	4 Aug 2004 23:17:35 -0000	1.168
***************
*** 29,33 ****
  
  #include "gumps.h"
! #include "config.h"
  #include "definitions.h"
  #include "network/network.h"
--- 29,33 ----
  
  #include "gumps.h"
! #include "serverconfig.h"
  #include "definitions.h"
  #include "network/network.h"

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** basechar.cpp	20 Jul 2004 11:35:36 -0000	1.122
--- basechar.cpp	4 Aug 2004 23:17:35 -0000	1.123
***************
*** 54,58 ****
  #include "skills.h"
  #include "definitions.h"
! #include "config.h"
  
  cBaseChar::cBaseChar()
--- 54,58 ----
  #include "skills.h"
  #include "definitions.h"
! #include "serverconfig.h"
  
  cBaseChar::cBaseChar()

Index: log.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/log.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** log.cpp	2 Jun 2004 15:04:06 -0000	1.18
--- log.cpp	4 Aug 2004 23:17:36 -0000	1.19
***************
*** 29,33 ****
  #include "log.h"
  
! #include "config.h"
  #include "network/uosocket.h"
  #include "console.h"
--- 29,33 ----
  #include "log.h"
  
! #include "serverconfig.h"
  #include "network/uosocket.h"
  #include "console.h"

Index: speech.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v
retrieving revision 1.181
retrieving revision 1.182
diff -C2 -d -r1.181 -r1.182
*** speech.cpp	20 Jul 2004 11:35:37 -0000	1.181
--- speech.cpp	4 Aug 2004 23:17:36 -0000	1.182
***************
*** 35,39 ****
  #include "sectors.h"
  #include "uotime.h"
! #include "config.h"
  #include "network/network.h"
  #include "territories.h"
--- 35,39 ----
  #include "sectors.h"
  #include "uotime.h"
! #include "serverconfig.h"
  #include "network/network.h"
  #include "territories.h"

Index: targetrequests.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** targetrequests.cpp	20 Jul 2004 11:35:37 -0000	1.100
--- targetrequests.cpp	4 Aug 2004 23:17:37 -0000	1.101
***************
*** 34,38 ****
  #include "items.h"
  //#include "muls/tilecache.h"
! #include "config.h"
  #include "skills.h"
  #include "combat.h"
--- 34,38 ----
  #include "items.h"
  //#include "muls/tilecache.h"
! #include "serverconfig.h"
  #include "skills.h"
  #include "combat.h"

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.427
retrieving revision 1.428
diff -C2 -d -r1.427 -r1.428
*** items.cpp	24 Jul 2004 18:59:56 -0000	1.427
--- items.cpp	4 Aug 2004 23:17:35 -0000	1.428
***************
*** 36,40 ****
  #include "items.h"
  #include "muls/tilecache.h"
! #include "config.h"
  #include "definitions.h"
  #include "pythonscript.h"
--- 36,40 ----
  #include "items.h"
  #include "muls/tilecache.h"
! #include "serverconfig.h"
  #include "definitions.h"
  #include "pythonscript.h"
***************
*** 52,56 ****
  #include "player.h"
  #include "basics.h"
- #include "config.h"
  
  #include "inlines.h"
--- 52,55 ----
***************
*** 2068,2072 ****
  	*/
  	PY_PROPERTY( "watersource", isWaterSource() )
! 	
  	return cUObject::getProperty( name );
  }
--- 2067,2071 ----
  	*/
  	PY_PROPERTY( "watersource", isWaterSource() )
! 
  	return cUObject::getProperty( name );
  }

Index: spawnregions.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/spawnregions.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** spawnregions.cpp	27 Jul 2004 06:35:22 -0000	1.65
--- spawnregions.cpp	4 Aug 2004 23:17:36 -0000	1.66
***************
*** 39,43 ****
  #include "console.h"
  #include "sectors.h"
! #include "config.h"
  #include "inlines.h"
  #include "scriptmanager.h"
--- 39,43 ----
  #include "console.h"
  #include "sectors.h"
! #include "serverconfig.h"
  #include "inlines.h"
  #include "scriptmanager.h"
***************
*** 62,66 ****
  }
  
! void cSpawnRegion::add(cUObject *object) 
  {
  	if (object->isItem()) {
--- 62,66 ----
  }
  
! void cSpawnRegion::add(cUObject *object)
  {
  	if (object->isItem()) {
***************
*** 204,208 ****
  bool cSpawnRegion::findValidSpot(Coord_cl& pos) {
  	// Try up to 100 times.
! 	for(unsigned int i = 0; i < 100; ++i) 
  	{
  		int rndRectNum = RandomNum( 0, this->rectangles_.size() - 1 );
--- 204,208 ----
  bool cSpawnRegion::findValidSpot(Coord_cl& pos) {
  	// Try up to 100 times.
! 	for(unsigned int i = 0; i < 100; ++i)
  	{
  		int rndRectNum = RandomNum( 0, this->rectangles_.size() - 1 );
***************
*** 251,255 ****
  
  			return true;
! 		}	
  	}
  
--- 251,255 ----
  
  			return true;
! 		}
  	}
  
***************
*** 435,439 ****
  void cAllSpawnRegions::reload()
  {
! 	// Save a list of all objects and their spawnregions 
  	// So the references can be recreated later.
  	QMap<QString, QPtrList<cUObject> > objects;
--- 435,439 ----
  void cAllSpawnRegions::reload()
  {
! 	// Save a list of all objects and their spawnregions
  	// So the references can be recreated later.
  	QMap<QString, QPtrList<cUObject> > objects;
***************
*** 444,448 ****
  		if (region)
  		{
! 			if (!objects.contains(region->name())) 
  			{
  				objects[region->name()].setAutoDelete(false);
--- 444,448 ----
  		if (region)
  		{
! 			if (!objects.contains(region->name()))
  			{
  				objects[region->name()].setAutoDelete(false);
***************
*** 459,463 ****
  		if (region)
  		{
! 			if (!objects.contains(region->name())) 
  			{
  				objects[region->name()].setAutoDelete(false);
--- 459,463 ----
  		if (region)
  		{
! 			if (!objects.contains(region->name()))
  			{
  				objects[region->name()].setAutoDelete(false);

Index: corpse.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/corpse.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** corpse.cpp	20 Jul 2004 11:35:36 -0000	1.59
--- corpse.cpp	4 Aug 2004 23:17:35 -0000	1.60
***************
*** 26,30 ****
   */
  
! #include "config.h"
  #include "corpse.h"
  #include "network/network.h"
--- 26,30 ----
   */
  
! #include "serverconfig.h"
  #include "corpse.h"
  #include "network/network.h"

Index: player.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** player.cpp	27 Jul 2004 06:35:22 -0000	1.113
--- player.cpp	4 Aug 2004 23:17:36 -0000	1.114
***************
*** 37,41 ****
  #include "basics.h"
  #include "muls/maps.h"
! #include "config.h"
  #include "world.h"
  #include "definitions.h"
--- 37,41 ----
  #include "basics.h"
  #include "muls/maps.h"
! #include "serverconfig.h"
  #include "world.h"
  #include "definitions.h"
***************
*** 1233,1237 ****
  
  PyObject *cPlayer::getProperty(const QString& name) {
! 	PY_PROPERTY("account", account_)	
  	/*
  	\rproperty controlslots The amount of controlslots currently used for this
--- 1233,1237 ----
  
  PyObject *cPlayer::getProperty(const QString& name) {
! 	PY_PROPERTY("account", account_)
  	/*
  	\rproperty controlslots The amount of controlslots currently used for this

Index: console.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** console.cpp	20 Jul 2004 04:40:51 -0000	1.21
--- console.cpp	4 Aug 2004 23:17:35 -0000	1.22
***************
*** 33,37 ****
  #include "world.h"
  #include "network/network.h"
! #include "config.h"
  #include "player.h"
  #include "accounts.h"
--- 33,37 ----
  #include "world.h"
  #include "network/network.h"
! #include "serverconfig.h"
  #include "player.h"
  #include "accounts.h"

--- NEW FILE: serverconfig.h ---
/*
 *     Wolfpack Emu (WP)
 * UO Server Emulation Program
 *
 * Copyright 2001-2004 by holders identified in AUTHORS.txt
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Palace - Suite 330, Boston, MA 02111-1307, USA.
 *
 * In addition to that license, if you are running this program or modified
 * versions of it on a public system you HAVE TO make the complete source of
 * the version used by you available or provide people with a location to
 * download it.
 *
 * Wolfpack Homepage: http://wpdev.sf.net/
 */

#if !defined (__CONFIG_H__)
#define __CONFIG_H__

// System headers
#include <vector>

// Our own headers
#include "preferences.h"
#include "server.h"
#include "singleton.h"
#include "coord.h"

// Library Headers
#include <qstring.h>
#include <qstringlist.h>

// Structs

struct StartLocation_st
{
	QString name;
	Coord_cl pos;
};

struct ServerList_st
{
	Q_UINT16 uiIndex;
	QString sServer;
	Q_UINT8 uiFull;
	Q_UINT8 uiTime;
	Q_UINT32 ip;
	QCString sIP;
	Q_UINT16 uiPort;
};

// Constants
const unsigned int FIRST_YEAR = 1970;

class cConfig : public Preferences, public cComponent
{
protected:
	QString getGroupDoc( const QString& group );
	QString getEntryDoc( const QString& group, const QString& entry );

	std::vector<ServerList_st> serverList_;
	std::vector<StartLocation_st> startLocation_;

	// loaded data
	bool overwriteDefinitions_;
	bool antiSpeedHack_;
	unsigned int antiSpeedHackDelay_;
	unsigned int antiSpeedHackDelayMounted_;
	bool hashAccountPasswords_;
	bool convertUnhashedPasswords_;
	bool allowUnencryptedClients_;
	bool allowStatRequest_;
	unsigned int skillcap_;
	bool showSkillTitles_;
	unsigned int statcap_;
	QString commandPrefix_;
	unsigned int skillAdvanceModifier_;
	unsigned int statsAdvanceModifier_;
	unsigned short objectDelay_;
	bool stealing_;
	bool guardsActive_;
	bool saveSpawns_;
	bool dontStackSpawnedObjects_;
	bool autoAccountCreate_;
	float checkNPCTime_;
	float checkFollowTime_;
	float checkTamedTime_;
	unsigned int itemDecayTime_;
	unsigned int corpseDecayTime_;
	int niceLevel_;
	unsigned short loginPort_;
	unsigned int logMask_;
	bool enableLogin_;
	unsigned short gamePort_;
	bool enableGame_;
	unsigned int playercorpsedecaymultiplier_;
	bool lootdecayswithcorpse_;
	float invisTimer_;
	unsigned short skillDelay_;
	int skillLevel_;
	unsigned int poisonTimer_;
	signed int maxStealthSteps_;
	unsigned int runningStamSteps_;
	unsigned int hungerRate_;
	unsigned int hungerDamageRate_;
	unsigned char hungerDamage_;
	float boatSpeed_;
	unsigned int tamedDisappear_;
	unsigned int houseInTown_;
	unsigned int shopRestock_;
	unsigned int snoopdelay_;
	unsigned short int quittime_;
	unsigned long int housedecay_secs_;
	unsigned int spawnRegionCheckTime_;
	unsigned int secondsPerUOMinute_;
	bool cacheMulFiles_;
	QString databaseDriver_;
	QString databaseName_;
	QString databaseUsername_;
	QString databasePassword_;
	QString databaseHost_;
	QString accountsDriver_;
	QString accountsName_;
	QString accountsUsername_;
	QString accountsPassword_;
	QString accountsHost_;
	int saveInterval_;
	QString mulPath_;
	QString logPath_;
	bool logRotate_;
	bool categoryTagAddMenu_;
	double npcMoveTime_;
	double tamedNpcMoveTime_;
	unsigned int showNpcTitles_;

	// AI
	float checkAITime_;
	unsigned int animalWildFleeRange_;
	unsigned int guardDispelTime_;

	// Combat
	int attackstamina_;
	unsigned char attack_distance_;

	//Repsys
	long int murderdecay_;
	unsigned int maxkills_;
	int crimtime_;

	// Resources
	unsigned int resourceitemdecaytime_;

	// Light
	unsigned char worldBrightLevel_;
	unsigned char worldFixedLevel_;
	unsigned char worldDarkLevel_;
	unsigned char dungeonLightLevel_;
	unsigned char worldCurrentLevel_;

	// Path Finding
	int pathfindMaxSteps_;
	int pathfindMaxIterations_;
	bool pathfind4Follow_;
	bool pathfind4Combat_;
	int pathfindFollowRadius_;
	float pathfindFollowMinCost_;
	int pathfindFleeRadius_;

public:
	cConfig();

	void load();
	void unload();
	void reload();

	std::vector<ServerList_st>& serverList(); // read-only
	std::vector<StartLocation_st>& startLocation();

	// gets
	bool hashAccountPasswords() const;
	bool convertUnhashedPasswords() const;
	bool showSkillTitles() const;
	bool allowUnencryptedClients() const;
	bool allowStatRequest() const;
	unsigned int skillcap() const;
	unsigned int statcap() const;
	QString commandPrefix() const;
	unsigned int skillAdvanceModifier() const;
	unsigned int statsAdvanceModifier() const;
	bool stealingEnabled() const;
	bool guardsActive() const;
	void guardsActive( bool );
	unsigned short objectDelay() const;
	bool autoAccountCreate() const;
	bool saveSpawns() const;
	float checkNPCTime() const;
	float checkAITime() const;
	unsigned int animalWildFleeRange() const;
	float checkFollowTime() const;
	float checkTamedTime() const;
	bool antiSpeedHack() const {
		return antiSpeedHack_;
	}
	unsigned int antiSpeedHackDelay() const {
		return antiSpeedHackDelay_;
	}
	unsigned int antiSpeedHackDelayMounted() const {
		return antiSpeedHackDelayMounted_;
	}
	int niceLevel() const;
	unsigned int itemDecayTime() const;
	unsigned int corpseDecayTime() const;
	bool lootdecayswithcorpse() const;
	float invisTimer() const;
	unsigned short skillDelay() const;
	unsigned int poisonTimer() const;
	signed int maxStealthSteps() const;
	unsigned int runningStamSteps() const;
	unsigned int hungerRate() const;
	unsigned int hungerDamageRate() const;
	unsigned char hungerDamage() const;
	float boatSpeed() const;
	unsigned int tamedDisappear() const;
	unsigned int houseInTown() const;
	inline bool dontStackSpawnedObjects() const {
		return dontStackSpawnedObjects_;
	}

	unsigned int shopRestock() const;
	unsigned int snoopdelay() const;
	unsigned short int quittime() const;
	unsigned long int housedecay_secs() const;
	unsigned int default_jail_time() const;
	bool cacheMulFiles() const;
	unsigned int spawnRegionCheckTime() const;
	unsigned int secondsPerUOMinute() const;
	unsigned int logMask() const;
	void setSecondsPerUOMinute( unsigned int );
	int saveInterval() const;
	bool heartBeat() const;
	int defaultpriv2() const;
	QString mulPath() const;
	QString logPath() const;
	bool logRotate() const;
	void setMulPath( const QString& data );
	void setLogPath( const QString& data );
	bool addMenuByCategoryTag() const;
	double npcMoveTime() const;
	double tamedNpcMoveTime() const;
	unsigned int showNpcTitles() const;
	bool overwriteDefinitions() const;

	// Persistency Module
	QString databaseDriver() const;
	QString databaseHost() const;
	QString databasePassword() const;
	QString databaseUsername() const;
	QString databaseName() const;
	QString accountsDriver() const;
	QString accountsHost() const;
	QString accountsPassword() const;
	QString accountsUsername() const;
	QString accountsName() const;

	// Combat
	int attackstamina() const;
	unsigned char attack_distance() const;

	// Repsys
	long int murderdecay() const;
	unsigned int maxkills() const;
	int crimtime() const;

	// Resources
	unsigned int resitemdecaytime() const;

	// Light
	unsigned char worldBrightLevel() const;
	unsigned char worldFixedLevel() const;
	unsigned char worldDarkLevel() const;
	unsigned char dungeonLightLevel() const;
	unsigned char& worldCurrentLevel();

	void setWorldBrightLevel( unsigned char );
	void setWorldFixedLevel( unsigned char );
	void setWorldDarkLevel( unsigned char );
	void setDungeonLightLevel( unsigned char );

	// Network
	unsigned short loginPort() const;
	unsigned short gamePort() const;
	bool enableLogin() const;
	bool enableGame() const;

	// Path Finding
	int pathfindMaxSteps() const;
	int pathfindMaxIterations() const;
	bool pathfind4Follow() const;
	bool pathfind4Combat() const;
	int pathfindFollowRadius() const;
	float pathfindFollowMinCost() const;
	int pathfindFleeRadius() const;

	// AI
	unsigned int guardDispelTime() const;

private:
	void setDefaultStartLocation();
	void setDefaultServerList();
	void readData();
};

// inline members

inline double cConfig::npcMoveTime() const
{
	return npcMoveTime_;
}

inline double cConfig::tamedNpcMoveTime() const
{
	return tamedNpcMoveTime_;
}

inline unsigned int cConfig::skillcap() const
{
	return skillcap_;
}

inline unsigned int cConfig::statcap() const
{
	return statcap_;
}

inline unsigned int cConfig::logMask() const
{
	return logMask_;
}

inline QString cConfig::commandPrefix() const
{
	return commandPrefix_;
}

inline unsigned int cConfig::skillAdvanceModifier() const
{
	return skillAdvanceModifier_;
}

inline unsigned int cConfig::statsAdvanceModifier() const
{
	return statsAdvanceModifier_;
}

inline bool cConfig::stealingEnabled() const
{
	return stealing_;
}

inline bool cConfig::guardsActive() const
{
	return guardsActive_;
}

inline unsigned short cConfig::objectDelay() const
{
	return objectDelay_;
}

inline bool cConfig::allowUnencryptedClients() const
{
	return allowUnencryptedClients_;
}

inline bool cConfig::allowStatRequest() const
{
	return allowStatRequest_;
}

inline bool cConfig::autoAccountCreate() const
{
	return autoAccountCreate_;
}

inline bool cConfig::saveSpawns() const
{
	return saveSpawns_;
}

inline float cConfig::checkNPCTime() const
{
	return checkNPCTime_;
}

inline float cConfig::checkAITime() const
{
	return checkAITime_;
}

inline unsigned int cConfig::animalWildFleeRange() const
{
	return animalWildFleeRange_;
}

inline float cConfig::checkFollowTime() const
{
	return checkFollowTime_;
}

inline float cConfig::checkTamedTime() const
{
	return checkTamedTime_;
}

inline int cConfig::niceLevel() const
{
	return niceLevel_;
}

inline unsigned int cConfig::itemDecayTime() const
{
	return itemDecayTime_;
}

inline unsigned int cConfig::corpseDecayTime() const
{
	return corpseDecayTime_;
}

inline bool cConfig::lootdecayswithcorpse() const
{
	return lootdecayswithcorpse_;
}

inline unsigned short cConfig::skillDelay() const
{
	return skillDelay_;
}

inline unsigned int cConfig::poisonTimer() const
{
	return poisonTimer_;
}

inline signed int cConfig::maxStealthSteps() const
{
	return maxStealthSteps_;
}

inline unsigned int cConfig::runningStamSteps() const
{
	return runningStamSteps_;
}

inline unsigned int cConfig::hungerRate() const
{
	return hungerRate_;
}

inline unsigned int cConfig::hungerDamageRate() const
{
	return hungerDamageRate_;
}

inline unsigned char cConfig::hungerDamage() const
{
	return hungerDamage_;
}

inline float cConfig::boatSpeed() const
{
	return boatSpeed_;
}

inline unsigned int cConfig::tamedDisappear() const
{
	return tamedDisappear_;
}

inline unsigned int cConfig::houseInTown() const
{
	return houseInTown_;
}

inline unsigned int cConfig::shopRestock() const
{
	return shopRestock_;
}

inline int cConfig::attackstamina() const
{
	return attackstamina_;
}

inline unsigned char cConfig::attack_distance() const
{
	return attack_distance_;
}

inline unsigned int cConfig::snoopdelay() const
{
	return snoopdelay_;
}

inline unsigned short int cConfig::quittime() const
{
	return quittime_;
}

inline unsigned long int cConfig::housedecay_secs() const
{
	return housedecay_secs_;
}

inline long int cConfig::murderdecay() const
{
	return murderdecay_;
}

inline unsigned int cConfig::maxkills() const
{
	return maxkills_;
}

inline int cConfig::crimtime() const
{
	return crimtime_;
}

inline unsigned int cConfig::resitemdecaytime() const
{
	return resourceitemdecaytime_;
}

inline bool cConfig::cacheMulFiles() const
{
	return cacheMulFiles_;
}

inline unsigned int cConfig::spawnRegionCheckTime() const
{
	return spawnRegionCheckTime_;
}

inline unsigned int cConfig::secondsPerUOMinute() const
{
	return secondsPerUOMinute_;
}

inline unsigned char cConfig::worldBrightLevel() const
{
	return worldBrightLevel_;
}

inline unsigned char cConfig::worldFixedLevel() const
{
	return worldFixedLevel_;
}

inline unsigned char cConfig::worldDarkLevel() const
{
	return worldDarkLevel_;
}

inline unsigned char cConfig::dungeonLightLevel() const
{
	return dungeonLightLevel_;
}

inline int cConfig::saveInterval() const
{
	return saveInterval_;
}

inline unsigned int cConfig::showNpcTitles() const
{
	return showNpcTitles_;
}

inline QString cConfig::databaseDriver() const
{
	return databaseDriver_;
}

inline QString cConfig::databaseHost() const
{
	return databaseHost_;
}

inline QString cConfig::databaseName() const
{
	return databaseName_;
}

inline QString cConfig::databaseUsername() const
{
	return databaseUsername_;
}

inline QString cConfig::databasePassword() const
{
	return databasePassword_;
}

inline QString cConfig::accountsDriver() const
{
	return accountsDriver_;
}

inline QString cConfig::accountsHost() const
{
	return accountsHost_;
}

inline QString cConfig::accountsName() const
{
	return accountsName_;
}

inline QString cConfig::accountsUsername() const
{
	return accountsUsername_;
}

inline QString cConfig::accountsPassword() const
{
	return accountsPassword_;
}

inline bool cConfig::showSkillTitles() const
{
	return showSkillTitles_;
}

inline bool cConfig::enableLogin() const
{
	return enableLogin_;
}

inline bool cConfig::enableGame() const
{
	return enableGame_;
}

inline unsigned short cConfig::gamePort() const
{
	return gamePort_;
}

inline unsigned short cConfig::loginPort() const
{
	return loginPort_;
}

inline bool cConfig::addMenuByCategoryTag() const
{
	return categoryTagAddMenu_;
}

inline int cConfig::pathfindMaxSteps() const
{
	return pathfindMaxSteps_;
}

inline bool cConfig::pathfind4Follow() const
{
	return pathfind4Follow_;
}

inline bool cConfig::pathfind4Combat() const
{
	return pathfind4Combat_;
}

inline int cConfig::pathfindFollowRadius() const
{
	return pathfindFollowRadius_;
}

inline float cConfig::pathfindFollowMinCost() const
{
	return pathfindFollowMinCost_;
}

inline int cConfig::pathfindFleeRadius() const
{
	return pathfindFleeRadius_;
}

inline QString cConfig::logPath() const
{
	return logPath_;
}

inline bool cConfig::logRotate() const
{
	return logRotate_;
}

inline int cConfig::pathfindMaxIterations() const
{
	return pathfindMaxIterations_;
}

inline unsigned int cConfig::guardDispelTime() const
{
	return guardDispelTime_;
}

inline bool cConfig::hashAccountPasswords() const
{
	return hashAccountPasswords_;
}

inline bool cConfig::convertUnhashedPasswords() const
{
	return convertUnhashedPasswords_;
}

inline bool cConfig::overwriteDefinitions() const
{
	return overwriteDefinitions_;
}

typedef SingletonHolder<cConfig> Config;

#endif //__SRVPARAMS_H___


Index: server.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/server.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** server.cpp	27 Jul 2004 06:35:22 -0000	1.13
--- server.cpp	4 Aug 2004 23:17:36 -0000	1.14
***************
*** 46,50 ****
  #include "skills.h"
  #include "spawnregions.h"
! #include "config.h"
  #include "territories.h"
  #include "muls/tilecache.h"
--- 46,50 ----
  #include "skills.h"
  #include "spawnregions.h"
! #include "serverconfig.h"
  #include "territories.h"
  #include "muls/tilecache.h"

Index: combat.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/combat.cpp,v
retrieving revision 1.172
retrieving revision 1.173
diff -C2 -d -r1.172 -r1.173
*** combat.cpp	2 Jun 2004 15:04:03 -0000	1.172
--- combat.cpp	4 Aug 2004 23:17:35 -0000	1.173
***************
*** 31,35 ****
  #include "npc.h"
  #include "basics.h"
! #include "config.h"
  #include <qstring.h>
  
--- 31,35 ----
  #include "npc.h"
  #include "basics.h"
! #include "serverconfig.h"
  #include <qstring.h>
  

Index: timing.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/timing.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** timing.cpp	10 Jun 2004 00:27:12 -0000	1.8
--- timing.cpp	4 Aug 2004 23:17:37 -0000	1.9
***************
*** 35,39 ****
  #include "combat.h"
  #include "sectors.h"
! #include "config.h"
  #include "network/network.h"
  #include "spawnregions.h"
--- 35,39 ----
  #include "combat.h"
  #include "sectors.h"
! #include "serverconfig.h"
  #include "network/network.h"
  #include "spawnregions.h"
***************
*** 103,107 ****
  			++it;
  		}
! 		
  		QValueVector<SERIAL>::iterator sit;
  		for (sit = toRemove.begin(); sit != toRemove.end(); ++sit) {
--- 103,107 ----
  			++it;
  		}
! 
  		QValueVector<SERIAL>::iterator sit;
  		for (sit = toRemove.begin(); sit != toRemove.end(); ++sit) {

Index: configure
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** configure	13 May 2004 05:34:39 -0000	1.34
--- configure	4 Aug 2004 23:17:35 -0000	1.35
***************
*** 111,115 ****
  				Python version is ${VERSION}, but should be 2.3.x!
  				Please install the appropriate version from:
! 				    http://www.python.org/2.3.3/
  				or use ${0} --help for help with specifying the correct path.
  				EOF
--- 111,115 ----
  				Python version is ${VERSION}, but should be 2.3.x!
  				Please install the appropriate version from:
! 				    http://www.python.org/2.3.4/
  				or use ${0} --help for help with specifying the correct path.
  				EOF

--- config.h DELETED ---

Index: dragdrop.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v
retrieving revision 1.237
retrieving revision 1.238
diff -C2 -d -r1.237 -r1.238
*** dragdrop.cpp	27 Jul 2004 06:35:21 -0000	1.237
--- dragdrop.cpp	4 Aug 2004 23:17:35 -0000	1.238
***************
*** 30,34 ****
  #include "speech.h"
  #include "sectors.h"
! #include "config.h"
  #include "skills.h"
  #include "muls/maps.h"
--- 30,34 ----
  #include "speech.h"
  #include "sectors.h"
! #include "serverconfig.h"
  #include "skills.h"
  #include "muls/maps.h"
***************
*** 170,175 ****
  				pContainer->addItem( splitItem, false );
  			splitItem->SetOwnSerial( pItem->ownSerial() );
! 			
! 			splitItem->setSpawnregion(pItem->spawnregion());			
  
  			// He needs to see the new item
--- 170,175 ----
  				pContainer->addItem( splitItem, false );
  			splitItem->SetOwnSerial( pItem->ownSerial() );
! 
! 			splitItem->setSpawnregion(pItem->spawnregion());
  
  			// He needs to see the new item

Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.251
retrieving revision 1.252
diff -C2 -d -r1.251 -r1.252
*** commands.cpp	27 Jul 2004 04:15:19 -0000	1.251
--- commands.cpp	4 Aug 2004 23:17:35 -0000	1.252
***************
*** 34,38 ****
  #include "network/uosocket.h"
  #include "spawnregions.h"
! #include "config.h"
  #include "targetrequests.h"
  #include "territories.h"
--- 34,38 ----
  #include "network/uosocket.h"
  #include "spawnregions.h"
! #include "serverconfig.h"
  #include "targetrequests.h"
  #include "territories.h"

Index: wolfpack.vcproj
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** wolfpack.vcproj	22 Jul 2004 19:39:11 -0000	1.38
--- wolfpack.vcproj	4 Aug 2004 23:17:37 -0000	1.39
***************
*** 274,281 ****
  			</File>
  			<File
! 				RelativePath=".\config.cpp">
  			</File>
  			<File
! 				RelativePath=".\config.h">
  			</File>
  			<File
--- 274,281 ----
  			</File>
  			<File
! 				RelativePath=".\serverconfig.cpp">
  			</File>
  			<File
! 				RelativePath=".\serverconfig.h">
  			</File>
  			<File

Index: walking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** walking.cpp	21 Jul 2004 17:14:12 -0000	1.129
--- walking.cpp	4 Aug 2004 23:17:37 -0000	1.130
***************
*** 32,36 ****
  #include "walking.h"
  #include "sectors.h"
! #include "config.h"
  #include "network/network.h"
  #include "muls/maps.h"
--- 32,36 ----
  #include "walking.h"
  #include "sectors.h"
! #include "serverconfig.h"
  #include "network/network.h"
  #include "muls/maps.h"

Index: skills.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/skills.cpp,v
retrieving revision 1.227
retrieving revision 1.228
diff -C2 -d -r1.227 -r1.228
*** skills.cpp	27 Jul 2004 06:35:22 -0000	1.227
--- skills.cpp	4 Aug 2004 23:17:36 -0000	1.228
***************
*** 33,37 ****
  #include "targetrequests.h"
  #include "sectors.h"
! #include "config.h"
  #include "scriptmanager.h"
  #include "skills.h"
--- 33,37 ----
  #include "targetrequests.h"
  #include "sectors.h"
! #include "serverconfig.h"
  #include "scriptmanager.h"
  #include "skills.h"

--- config.cpp DELETED ---

Index: definitions.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/definitions.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** definitions.cpp	20 Jul 2004 04:40:51 -0000	1.11
--- definitions.cpp	4 Aug 2004 23:17:35 -0000	1.12
***************
*** 42,46 ****
  #include "world.h"
  #include "skills.h"
! #include "config.h"
  #include "basechar.h"
  #include "network/network.h"
--- 42,46 ----
  #include "world.h"
  #include "skills.h"
! #include "serverconfig.h"
  #include "basechar.h"
  #include "network/network.h"

Index: territories.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/territories.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** territories.cpp	27 Jul 2004 06:35:22 -0000	1.50
--- territories.cpp	4 Aug 2004 23:17:37 -0000	1.51
***************
*** 31,35 ****
  #include "network/uosocket.h"
  #include "defines.h"
! #include "config.h"
  #include "network/network.h"
  #include "basics.h"
--- 31,35 ----
  #include "network/uosocket.h"
  #include "defines.h"
! #include "serverconfig.h"
  #include "network/network.h"
  #include "basics.h"

--- NEW FILE: serverconfig.cpp ---
/*
 *     Wolfpack Emu (WP)
 * UO Server Emulation Program
 *
 * Copyright 2001-2004 by holders identified in AUTHORS.txt
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Palace - Suite 330, Boston, MA 02111-1307, USA.
 *
 * In addition to that license, if you are running this program or modified
 * versions of it on a public system you HAVE TO make the complete source of
 * the version used by you available or provide people with a location to
 * download it.
 *
 * Wolfpack Homepage: http://wpdev.sf.net/
 */

#include "serverconfig.h"

#include "verinfo.h"
#include "preferences.h"
#include "log.h"

// Library Includes
#include <qstring.h>
#include <qstringlist.h>
#include <qdir.h>
#include <qhostaddress.h>
#include <qdatetime.h>

#include <qglobal.h>
#if defined( Q_OS_WIN32 )
# include <winsock.h>
#elif defined ( Q_OS_UNIX )
# include <arpa/inet.h>
# include <sys/types.h>
# include <sys/socket.h>
# include <netinet/in.h>
# include <netdb.h>
#endif

const char preferencesFileVersion[] = "1.0";

#ifndef INADDR_NONE
#define INADDR_NONE (-1)
#endif

Q_INT32 resolveName( const QString& data )
{
	if ( data.isEmpty() )
		return INADDR_NONE;

	// we do a dns lookup on this

	Q_INT32 uiValue = inet_addr( ( char* ) data.latin1() ) ;
	if ( uiValue == INADDR_NONE )
	{
		hostent* ptrHost = gethostbyname( ( char* ) data.latin1() );
		if ( ptrHost != 0 )
		{
			char** ptrPtr = ptrHost->h_addr_list;
			//We only use the first one
			if ( *ptrPtr != NULL )
			{
				//  	I can think of no other way
				memcpy( &uiValue, *ptrPtr, sizeof( in_addr ) ) ;
			}
		}
	}

	// inet_addr returns the ip in reverse order
	return ntohl( uiValue );
}

cConfig::cConfig() : Preferences( "wolfpack.xml", "Wolfpack", "1.0" )
{
	readData();
}

void cConfig::readData()
{
	Preferences::readData();

	// Account Group
	autoAccountCreate_ = getBool( "Accounts", "Auto Create", false, true );
	accountsDriver_ = getString( "Accounts", "Database Driver", "sqlite", true );
	accountsHost_ = getString( "Accounts", "Database Host", "", true );
	accountsName_ = getString( "Accounts", "Database Name", "accounts.db", true );
	accountsUsername_ = getString( "Accounts", "Database Username", "", true );
	accountsPassword_ = getString( "Accounts", "Database Password", "", true );
	hashAccountPasswords_ = getBool( "Accounts", "Use MD5 Hashed Passwords", false, true );
	convertUnhashedPasswords_ = getBool( "Accounts", "Automatically Hash Loaded Passwords", false, true );

	// AI
	checkAITime_ = getDouble( "AI", "Default AI Check Time", 0.5, true );
	animalWildFleeRange_ = getNumber( "AI", "Wild animals flee range", 8, true );
	guardDispelTime_ = getNumber( "AI", "Guard dispel time (sec)", 25, true );

	// Persistency
	databasePassword_ = getString( "Database", "password", "", true );
	databaseUsername_ = getString( "Database", "username", "", true );
	databaseHost_ = getString( "Database", "host", "", true );
	databaseDriver_ = getString( "Database", "driver", "sqlite", true );
	databaseName_ = getString( "Database", "name", "world.db", true );

	// Repsys
	murderdecay_ = getNumber( "Repsys", "Murder Decay", 28800, true );
	maxkills_ = getNumber( "Repsys", "Max Kills", 5, true );
	crimtime_ = getNumber( "Repsys", "Criminal Time", 120, true );

	// Game Speed Group
	objectDelay_ = getNumber( "Game Speed", "ObjectDelay", 1, true );
	checkNPCTime_ = getDouble( "Game Speed", "NPCs Check Time", 0.8, true );
	checkTamedTime_ = getDouble( "Game Speed", "Tamed Check Time", 0.6, true );
	niceLevel_ = getNumber( "Game Speed", "Nice Level", 2, true );
	skillDelay_ = getNumber( "Game Speed", "SkillDelay", 7, true );
	skillLevel_ = getNumber( "Game Speed", "SkillLevel", 3, true );
	maxStealthSteps_ = getNumber( "Game Speed", "Max Stealth Steps", 10, true );
	runningStamSteps_ = getNumber( "Game Speed", "Running Stamina Steps", 15, true );
	hungerRate_ = getNumber( "Game Speed", "Hunger Rate", 6000, true );
	hungerDamageRate_ = getNumber( "Game Speed", "Hunger Damage Rate", 10, true );
	boatSpeed_ = getDouble( "Game Speed", "Boat Speed", 0.750000, true );
	snoopdelay_ = getNumber( "Game Speed", "Snoop Delay", 7, true );
	housedecay_secs_ = getNumber( "Game Speed", "House Decay-Sec.", 604800, true );
	spawnRegionCheckTime_ = getNumber( "Game Speed", "SpawnRegion Check Time", 300, true );
	itemDecayTime_ = getNumber( "Game Speed", "Item Decay Time", 300, true );
	corpseDecayTime_ = getNumber( "Game Speed", "Corpse Decay Time", 600, true );

	secondsPerUOMinute_ = getNumber( "Game Speed", "Seconds Per UO Minute", 5, true );
	npcMoveTime_ = getDouble( "Game Speed", "NPC Move Time", 0.8, true );
	tamedNpcMoveTime_ = getDouble( "Game Speed", "Tamed NPC Move Time", 0.6, true );

	// General Group
	showSkillTitles_ = getBool( "General", "ShowSkillTitles", true, true );
	skillcap_ = getNumber( "General", "SkillCap", 700, true );
	statcap_ = getNumber( "General", "StatsCap", 225, true );
	commandPrefix_ = getString( "General", "Command Prefix", "'", true );
	skillAdvanceModifier_ = getNumber( "General", "Skill Advance Modifier", 1000, true );
	statsAdvanceModifier_ = getNumber( "General", "Stats Advance Modifier", 500, true );
	stealing_ = getBool( "General", "Stealing Enabled", true, true );
	guardsActive_ = getBool( "General", "Guards Enabled", true, true );
	saveSpawns_ = getBool( "General", "Save Spawned Regions", true, true );
	lootdecayswithcorpse_ = getBool( "General", "Loot Decays With Corpse", true, true );
	invisTimer_ = getDouble( "General", "InvisTimer", 60, true );
	poisonTimer_ = getNumber( "General", "PoisonTimer", 180, true );
	hungerDamage_ = getNumber( "General", "Hunger Damage", 0, true );
	tamedDisappear_ = getNumber( "General", "Tamed Disappear", 0, true );
	houseInTown_ = getNumber( "General", "House In Town", 0, true );
	shopRestock_ = getNumber( "General", "Shop Restock", 1, true );
	quittime_ = getNumber( "General", "Char Time Out", 300, true );
	cacheMulFiles_ = getBool( "General", "Cache Mul Files", true, true );
	categoryTagAddMenu_ = getBool( "General", "Build AddMenu by Category Tags", true, true );
	showNpcTitles_ = getNumber( "General", "Show Npc Titles", 1, true );
	logMask_ = getNumber( "General", "Logging Mask", LOG_ALL, true );
	overwriteDefinitions_ = getBool( "General", "Overwrite Definitions", false, true );
	dontStackSpawnedObjects_ = getBool("General", "Don't Stack Spawned Objects", true, true);
	antiSpeedHack_ = getBool("General", "Anti Speed Hack", true, true);
	antiSpeedHackDelay_ = getNumber("General", "Anti Speed Hack Delay", 175, true);
	antiSpeedHackDelayMounted_ = getNumber("General", "Anti Speed Hack Delay Mounted", 75, true);

	saveInterval_ = getNumber( "General", "Save Interval", 900, true );
	mulPath_ = QDir::convertSeparators( getString( "General", "MulPath", "./muls/", true ) );
	logPath_ = QDir::convertSeparators( getString( "General", "LogPath", "./logs/", true ) );
	logRotate_ = getBool( "General", "LogRotate", true, true );

	// Network
	loginPort_ = getNumber( "Network", "Loginserver Port", 2593, true );
	gamePort_ = getNumber( "Network", "Gameserver Port", 2592, true );
	enableLogin_ = getBool( "Network", "Enable Loginserver", true, true );
	enableGame_ = getBool( "Network", "Enable Gameserver", true, true );
	allowUnencryptedClients_ = getBool( "Network", "Allow Unencrypted Clients", true, true );
	allowStatRequest_ = getBool( "Network", "Allow Stat Request", true, true );

	// Combat
	attackstamina_ = getNumber( "Combat", "Attack Stamina", -2, true );
	attack_distance_ = getNumber( "Combat", "Attack Distance", 13, true );

	// Resources 60*60*12
	resourceitemdecaytime_ = getNumber( "Resources", "ResourceItem Decay Time (not empty)", 43200, true );

	// Light
	worldBrightLevel_ = getNumber( "Light", "World Bright Level", 1, true );
	worldFixedLevel_ = getNumber( "Light", "World Fixed Level", 0, true );
	worldDarkLevel_ = getNumber( "Light", "World Dark Level", 18, true );
	dungeonLightLevel_ = getNumber( "Light", "Dungeon Level", 18, true );

	// Path Finding
	pathfind4Follow_ = getBool( "Path Finding", "Activate for Following", true, true );
	pathfind4Combat_ = getBool( "Path Finding", "Activate for Combat", false, true );
	pathfindMaxIterations_ = getNumber( "Path Finding", "Maximum Iterations during Calculation", 100, true );
	pathfindMaxSteps_ = getNumber( "Path Finding", "Maximum Steps for Calculation", 20, true );
	pathfindFollowRadius_ = getNumber( "Path Finding", "Follow Radius", 10, true );
	pathfindFollowMinCost_ = getDouble( "Path Finding", "Follow min. estimated Cost", 1.5, true );
	pathfindFleeRadius_ = getNumber( "Path Finding", "Flee Radius", 10, true );
}

void cConfig::load()
{
	// Load data into binary format
	// If value not found, create key.
	readData();

	if ( !containGroup( "StartLocation" ) )
		setDefaultStartLocation();

	if ( !containGroup( "LoginServer" ) )
		setDefaultServerList();

	flush(); // if any key created, save it.
	cComponent::load();
}

void cConfig::unload()
{
	serverList_.clear();
	startLocation_.clear();
	cComponent::unload();
}

void cConfig::reload()
{
	unload();
	load();
}

std::vector<StartLocation_st>& cConfig::startLocation()
{
	if ( startLocation_.empty() ) // Empty? Try to load
	{
		bool bKeepLooping = true;
		unsigned int i = 1;
		do
		{
			QString tmp = getString( "StartLocation", QString( "Location %1" ).arg( i++ ), "" ).simplifyWhiteSpace();
			bKeepLooping = ( tmp != "" );
			if ( bKeepLooping ) // valid data.
			{
				QStringList strList = QStringList::split( "=", tmp );
				if ( strList.size() == 2 )
				{
					StartLocation_st loc;
					loc.name = strList[0];
					QStringList strList2 = QStringList::split( ",", strList[1].stripWhiteSpace() );
					if ( strList2.size() == 4 )
					{
						loc.pos.x = strList2[0].toUShort();
						loc.pos.y = strList2[1].toUShort();
						loc.pos.z = strList2[2].toShort();
						loc.pos.map = strList2[3].toUShort();
						startLocation_.push_back( loc );
					}
				}
			}
		}
		while ( bKeepLooping );
	}
	return startLocation_;
}

void cConfig::setDefaultStartLocation()
{
	setString( "StartLocation", "Location 1", "Yew=567,978,0,1" );
	setString( "StartLocation", "Location 2", "Minoc=2477,407,15,1" );
	setString( "StartLocation", "Location 3", "Britain=1496,1629,10,1" );
	setString( "StartLocation", "Location 4", "Moonglow=4404,1169,0,1" );
	setString( "StartLocation", "Location 5", "Trinsic=1844,2745,0,1" );
	setString( "StartLocation", "Location 6", "Magincia=3738,2223,20,1" );
	setString( "StartLocation", "Location 7", "Jhelom=1378,3817,0,1" );
	setString( "StartLocation", "Location 8", "Skara Brae=594,2227,0,1" );
	setString( "StartLocation", "Location 9", "Vesper=2771,977,0,1" );
	flush(); // save
}

void cConfig::setDefaultServerList()
{
	setString( "LoginServer", "Shard 1", "Your Shard Name=127.0.0.1,2592" );
	flush(); // save.
}

void cConfig::setSecondsPerUOMinute( unsigned int data )
{
	secondsPerUOMinute_ = data;
	setNumber( "Game Speed", "Seconds Per UO Minute", secondsPerUOMinute_ );
	flush();
}

void cConfig::setWorldBrightLevel( unsigned char data )
{
	worldBrightLevel_ = data;
	setNumber( "Light", "World Bright Level", data );
	flush();
}

void cConfig::setWorldFixedLevel( unsigned char data )
{
	worldFixedLevel_ = data;
	setNumber( "Light", "World Fixed Level", data );
	flush();
}

void cConfig::setWorldDarkLevel( unsigned char data )
{
	worldDarkLevel_ = data;
	setNumber( "Light", "World Dark Level", data );
	flush();
}

void cConfig::setDungeonLightLevel( unsigned char data )
{
	dungeonLightLevel_ = data;
	setNumber( "Light", "Dungeon Level", data );
	flush();
}

void cConfig::setMulPath( const QString& data )
{
	mulPath_ = data;
	setString( "General", "MulPath", data );
	flush();
}

void cConfig::setLogPath( const QString& data )
{
	logPath_ = data;
	setString( "General", "LogPath", data );
	flush();
}

unsigned char& cConfig::worldCurrentLevel()
{
	return worldCurrentLevel_;
}

void cConfig::guardsActive( bool enabled )
{
	guardsActive_ = enabled;
	setBool( "General", "Guards Enabled", enabled );
}

struct stGroupDoc
{
	const char* group;
	const char* documentation;
};

static stGroupDoc group_doc[] =
{
	{"AI", "This group configures the NPC AI."}, {"Accounts", "This group configures the account management."}, {"Database", "This group configures access to the worldsave database."}, {0, 0}
};

QString cConfig::getGroupDoc( const QString& group )
{
	// Try to find documentation for a group in our table
	unsigned int i = 0;

	while ( group_doc[i].group )
	{
		if ( group == group_doc[i].group )
		{
			return group_doc[i].documentation;
		}
		++i;
	}

	return Preferences::getGroupDoc( group );
}

struct stEntryDoc
{
	const char* group;
	const char* entry;
	const char* documentation;
};

static stEntryDoc entry_doc[] =
{
	{"Accounts", "Database Driver", "Possible values are: sqlite, mysql"}, {0, 0, 0}
};

QString cConfig::getEntryDoc( const QString& group, const QString& entry )
{
	// Try to find documentation for an entry in our table
	unsigned int i = 0;

	while ( entry_doc[i].group && entry_doc[i].entry )
	{
		if ( group == entry_doc[i].group && entry == entry_doc[i].entry )
		{
			return entry_doc[i].documentation;
		}
		++i;
	}

	return Preferences::getEntryDoc( group, entry );
}

Index: timers.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/timers.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** timers.cpp	19 Jun 2004 02:06:51 -0000	1.4
--- timers.cpp	4 Aug 2004 23:17:37 -0000	1.5
***************
*** 34,38 ****
  #include "items.h"
  
! #include "config.h"
  #include "network/network.h"
  #include "definitions.h"
--- 34,38 ----
  #include "items.h"
  
! #include "serverconfig.h"
  #include "network/network.h"
  #include "definitions.h"

Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.199
retrieving revision 1.200
diff -C2 -d -r1.199 -r1.200
*** wolfpack.pro	27 Jul 2004 04:15:20 -0000	1.199
--- wolfpack.pro	4 Aug 2004 23:17:37 -0000	1.200
***************
*** 39,43 ****
  MOC_DIR = obj
  
! INCLUDEPATH += sqlite 
  win32:DEFINES -= UNICODE
  
--- 39,43 ----
  MOC_DIR = obj
  
! INCLUDEPATH += sqlite
  win32:DEFINES -= UNICODE
  
***************
*** 60,64 ****
  	combat.h \
  	commands.h \
! 	config.h \
  	console.h \
  	contextmenu.h \
--- 60,64 ----
  	combat.h \
  	commands.h \
! 	serverconfig.h \
  	console.h \
  	contextmenu.h \
***************
*** 124,128 ****
  	combat.cpp \
  	commands.cpp \
! 	config.cpp \
  	console.cpp \
  	contextmenu.cpp \
--- 124,128 ----
  	combat.cpp \
  	commands.cpp \
! 	serverconfig.cpp \
  	console.cpp \
  	contextmenu.cpp \
***************
*** 168,172 ****
  	walking.cpp \
  	world.cpp
! 	
  # Twofish Module
  SOURCES += twofish/twofish2.c
--- 168,172 ----
  	walking.cpp \
  	world.cpp
! 
  # Twofish Module
  SOURCES += twofish/twofish2.c

Index: accounts.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/accounts.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** accounts.cpp	15 Jun 2004 02:44:43 -0000	1.96
--- accounts.cpp	4 Aug 2004 23:17:35 -0000	1.97
***************
*** 28,32 ****
  // Wolfpack Includes
  #include "accounts.h"
! #include "config.h"
  #include "network/uosocket.h"
  #include "dbdriver.h"
--- 28,32 ----
  // Wolfpack Includes
  #include "accounts.h"
! #include "serverconfig.h"
  #include "network/uosocket.h"
  #include "dbdriver.h"

Index: world.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** world.cpp	27 Jul 2004 06:35:22 -0000	1.106
--- world.cpp	4 Aug 2004 23:17:37 -0000	1.107
***************
*** 30,34 ****
  #include "console.h"
  
! #include "config.h"
  #include "dbdriver.h"
  #include "progress.h"
--- 30,34 ----
  #include "console.h"
  
! #include "serverconfig.h"
  #include "dbdriver.h"
  #include "progress.h"

Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** npc.cpp	20 Jul 2004 11:35:37 -0000	1.100
--- npc.cpp	4 Aug 2004 23:17:36 -0000	1.101
***************
*** 41,45 ****
  #include "dbdriver.h"
  #include "sectors.h"
! #include "config.h"
  #include "log.h"
  #include "console.h"
--- 41,45 ----
  #include "dbdriver.h"
  #include "sectors.h"
! #include "serverconfig.h"
  #include "log.h"
  #include "console.h"

[wpdev-commits] wolfpack/python char.cpp,1.175,1.176 engine.cpp,1.32,1.33 global.cpp,1.143,1.144 pyaccount.cpp,1.34,1.35

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

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

Modified Files:
	char.cpp engine.cpp global.cpp pyaccount.cpp 
Log Message:
config.h and config.cpp moved to serverconfig.h and serverconfig.cpp
This is to prevent a conflict with Automake.


Index: global.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -d -r1.143 -r1.144
*** global.cpp	27 Jul 2004 06:35:23 -0000	1.143
--- global.cpp	4 Aug 2004 23:17:39 -0000	1.144
***************
*** 49,53 ****
  
  #include "../items.h"
! #include "../config.h"
  #include "../basechar.h"
  #include "../player.h"
--- 49,53 ----
  
  #include "../items.h"
! #include "../serverconfig.h"
  #include "../basechar.h"
  #include "../player.h"
***************
*** 355,359 ****
  	\param definition The id of the item definition to create the item from.
  	\return An <object id="item">item</object> object or None.
! 	\description Creates a new item from a given definition id and assigns a new serial to it.	
  */
  static PyObject* wpAdditem( PyObject* self, PyObject* args )
--- 355,359 ----
  	\param definition The id of the item definition to create the item from.
  	\return An <object id="item">item</object> object or None.
! 	\description Creates a new item from a given definition id and assigns a new serial to it.
  */
  static PyObject* wpAdditem( PyObject* self, PyObject* args )
***************
*** 431,435 ****
  	\param id The guild id to look for, an integer value.
  	\return A <object id="guild">guild</object> object or None.
! 	\description Tries to find a guild with the given id and returns a guild object for it. 
  	Returns None if no guild could be found.
  */
--- 431,435 ----
  	\param id The guild id to look for, an integer value.
  	\return A <object id="guild">guild</object> object or None.
! 	\description Tries to find a guild with the given id and returns a guild object for it.
  	Returns None if no guild could be found.
  */
***************
*** 504,510 ****
  	\param function The name of the function that should be called when this timer is triggered.
  	Please note that this is a string containing the full name of the function including the full
! 	module name (i.e. <code>"mymodule.mytimer"</code> if the <code>mytimer</code> function is in the 
! 	<code>mymodule.py</code> file). 
! 	
  	The function should have the following prototype:
  	<code>def expire(object, args):
--- 504,510 ----
  	\param function The name of the function that should be called when this timer is triggered.
  	Please note that this is a string containing the full name of the function including the full
! 	module name (i.e. <code>"mymodule.mytimer"</code> if the <code>mytimer</code> function is in the
! 	<code>mymodule.py</code> file).
! 
  	The function should have the following prototype:
  	<code>def expire(object, args):
***************
*** 514,518 ****
  	\param args This should be a list of custom arguments that will be passed on to the timer expire function.
  	If you don't want the timer to be saved you can pass on any type of obejcts. However. You should not pass
! 	character, item or guild objects directly but their serials instead. Use finditem, findguild and findchar to 
  	get a new object in the expirefunction afterwards.
  	\param serializable Defaults to false. If this boolean parameter is true, the timer will be saved on worldsaves
--- 514,518 ----
  	\param args This should be a list of custom arguments that will be passed on to the timer expire function.
  	If you don't want the timer to be saved you can pass on any type of obejcts. However. You should not pass
! 	character, item or guild objects directly but their serials instead. Use finditem, findguild and findchar to
  	get a new object in the expirefunction afterwards.
  	\param serializable Defaults to false. If this boolean parameter is true, the timer will be saved on worldsaves
***************
*** 590,602 ****
  	\param y The y component of the coordinate.
  	\param map The map of the coordinate.
! 	\param exact Defaults to false. If this boolean parameter is true, 
! 	not the entire 8x8 static block matching the coordinate is returned, 
  	but only the tiles that are exactly at the given coordinate.
! 	\return A list of dictionaries. Each dictionary included in the list has the 
  	following keys:
  	- <code>id</code> The art tile id of the static item as an integer value.
  	- <code>x</code> The absolute x component of the coordinate of the static tile. (Not relative to the
  	upper left block corner).
! 	- <code>y</code> The absolute y component of the coordinate of the static tile. (Not relative to the 
  	upper left block corner).
  	- <code>z</code> The z position of the static tile.
--- 590,602 ----
  	\param y The y component of the coordinate.
  	\param map The map of the coordinate.
! 	\param exact Defaults to false. If this boolean parameter is true,
! 	not the entire 8x8 static block matching the coordinate is returned,
  	but only the tiles that are exactly at the given coordinate.
! 	\return A list of dictionaries. Each dictionary included in the list has the
  	following keys:
  	- <code>id</code> The art tile id of the static item as an integer value.
  	- <code>x</code> The absolute x component of the coordinate of the static tile. (Not relative to the
  	upper left block corner).
! 	- <code>y</code> The absolute y component of the coordinate of the static tile. (Not relative to the
  	upper left block corner).
  	- <code>z</code> The z position of the static tile.
***************
*** 666,674 ****
  	\param y The y component of the coordinate.
  	\param map The map to look on.
! 	\param range Defaults to 1. 
! 	This is the range in which the server should search for items. Please remember that this is not 
  	a circle.
  	\return A list of <object id="item">item</object> objects.
! 	\description This function searches for dynamic items (no static items) at the given 
  	coordinate and in the given range and returns a list of found item objects.
  */
--- 666,674 ----
  	\param y The y component of the coordinate.
  	\param map The map to look on.
! 	\param range Defaults to 1.
! 	This is the range in which the server should search for items. Please remember that this is not
  	a circle.
  	\return A list of <object id="item">item</object> objects.
! 	\description This function searches for dynamic items (no static items) at the given
  	coordinate and in the given range and returns a list of found item objects.
  */
***************
*** 704,712 ****
  	\param y The y component of the coordinate.
  	\param map The map to look on.
! 	\param range Defaults to 1. 
! 	This is the range in which the server should search for characters. Please remember that this is not 
  	a circle.
  	\return A list of <object id="char">char</object> objects.
! 	\description This function searches for characters at the given 
  	coordinate and in the given range and returns a list of found objects.
  */
--- 704,712 ----
  	\param y The y component of the coordinate.
  	\param map The map to look on.
! 	\param range Defaults to 1.
! 	This is the range in which the server should search for characters. Please remember that this is not
  	a circle.
  	\return A list of <object id="char">char</object> objects.
! 	\description This function searches for characters at the given
  	coordinate and in the given range and returns a list of found objects.
  */
***************
*** 744,748 ****
  	\param speed This integer value indicates the animation speed that should be used.
  	\description This function shows a graphical effect at a given position to all players in range.
! 	The exact scale of the duration and speed parameters are unknown and passed on directly to the client. 
  	You'll have to experiment to find suitable values.
  */
--- 744,748 ----
  	\param speed This integer value indicates the animation speed that should be used.
  	\description This function shows a graphical effect at a given position to all players in range.
! 	The exact scale of the duration and speed parameters are unknown and passed on directly to the client.
  	You'll have to experiment to find suitable values.
  */
***************
*** 785,789 ****
  	- <code>id</code> The landtile art id for the maptile.
  	- <code>z</code> The height of the map at the given position. Please note that this
! 	is the height stored in the datafile and not the real height which is also influenced by 
  	the surrounding maptiles.
  	\description This function returns a dictionary with information about a tile of the map
--- 785,789 ----
  	- <code>id</code> The landtile art id for the maptile.
  	- <code>z</code> The height of the map at the given position. Please note that this
! 	is the height stored in the datafile and not the real height which is also influenced by
  	the surrounding maptiles.
  	\description This function returns a dictionary with information about a tile of the map
***************
*** 883,887 ****
  	- <code>name</code> The name of the tile.
  	- <code>height</code> The height of the tile.
! 	- <code>weight</code> The weight of the tile. This value is not used internally but can be used to check if the item is movable by the client. 
  	Items with a weight of 255 are not movable by default.
  	- <code>layer</code> The layer this item will be equipped on if equippable.
--- 883,887 ----
  	- <code>name</code> The name of the tile.
  	- <code>height</code> The height of the tile.
! 	- <code>weight</code> The weight of the tile. This value is not used internally but can be used to check if the item is movable by the client.
  	Items with a weight of 255 are not movable by default.
  	- <code>layer</code> The layer this item will be equipped on if equippable.
***************
*** 987,991 ****
  	\param script The name of a script that should be notified about the given event.
  	\description This function registers a script as a global hook for one given event type. Whenever the
! 	event is triggered, the given script will be called first. Please note that there can only be one 
  	hook per event at a time, but a script can hook more than one event to itself.
  */
--- 987,991 ----
  	\param script The name of a script that should be notified about the given event.
  	\description This function registers a script as a global hook for one given event type. Whenever the
! 	event is triggered, the given script will be called first. Please note that there can only be one
  	hook per event at a time, but a script can hook more than one event to itself.
  */
***************
*** 1021,1025 ****
  	\param command The name of the command as a string.
  	\param function The function that should handle the command. This is not a string but a callable
! 	python function object. The function should have the following prototype:	
  	<code>
  	def mycommand(socket, command, arguments):
--- 1021,1025 ----
  	\param command The name of the command as a string.
  	\param function The function that should handle the command. This is not a string but a callable
! 	python function object. The function should have the following prototype:
  	<code>
  	def mycommand(socket, command, arguments):
***************
*** 1029,1033 ****
  	command is the name of the command that has been issued if you want to use a single function
  	for multiple commands and arguments is a string containing the full list of arguments passed
! 	to the command.		
  	\description This function registers a python handler for the given command name. Using this function
  	you can implement custom ingame commands.
--- 1029,1033 ----
  	command is the name of the command that has been issued if you want to use a single function
  	for multiple commands and arguments is a string containing the full list of arguments passed
! 	to the command.
  	\description This function registers a python handler for the given command name. Using this function
  	you can implement custom ingame commands.
***************
*** 1049,1053 ****
  	Py_INCREF( function );
  	ScriptManager::instance()->setCommandHook( command, function );
! 	
  	Py_RETURN_NONE;
  }
--- 1049,1053 ----
  	Py_INCREF( function );
  	ScriptManager::instance()->setCommandHook( command, function );
! 
  	Py_RETURN_NONE;
  }
***************
*** 1060,1064 ****
  	<code>
  	def mycommand(socket, packet):
! 	&nbsp;&nbsp;pass	
  	</code>
  	Where socket is the <object id="socket">socket</object> object the packet was sent from,
--- 1060,1064 ----
  	<code>
  	def mycommand(socket, packet):
! 	&nbsp;&nbsp;pass
  	</code>
  	Where socket is the <object id="socket">socket</object> object the packet was sent from,
***************
*** 1118,1122 ****
  	\param definition The id of the multi definition.
  	\return An <object id="item">item</object> object or None.
! 	\description Creates a new multi from a given definition id and assigns a new serial to it.	
  	Please note that multis are represented by the item object.
  */
--- 1118,1122 ----
  	\param definition The id of the multi definition.
  	\return An <object id="item">item</object> object or None.
! 	\description Creates a new multi from a given definition id and assigns a new serial to it.
  	Please note that multis are represented by the item object.
  */
***************
*** 1350,1354 ****
  	It is often faster to use the currenttime function instead, but if you need
  	an accurate value for timing or similar tasks, use this function instead.
! */ 
  static PyObject* wpTickcount( PyObject* self, PyObject* args )
  {
--- 1350,1354 ----
  	It is often faster to use the currenttime function instead, but if you need
  	an accurate value for timing or similar tasks, use this function instead.
! */
  static PyObject* wpTickcount( PyObject* self, PyObject* args )
  {
***************
*** 1362,1366 ****
  	\return An integer value.
  	\description This function returns the number of registered characters in the world.
! */ 
  static PyObject* wpCharCount( PyObject* self, PyObject* args )
  {
--- 1362,1366 ----
  	\return An integer value.
  	\description This function returns the number of registered characters in the world.
! */
  static PyObject* wpCharCount( PyObject* self, PyObject* args )
  {
***************
*** 1374,1378 ****
  	\return An integer value.
  	\description This function returns the number of registered NPCs in the world.
! */ 
  static PyObject* wpNpcCount( PyObject* self, PyObject* args )
  {
--- 1374,1378 ----
  	\return An integer value.
  	\description This function returns the number of registered NPCs in the world.
! */
  static PyObject* wpNpcCount( PyObject* self, PyObject* args )
  {
***************
*** 1386,1390 ****
  	\return An integer value.
  	\description This function returns the number of registered player characters in the world.
! */ 
  static PyObject* wpPlayerCount( PyObject* self, PyObject* args )
  {
--- 1386,1390 ----
  	\return An integer value.
  	\description This function returns the number of registered player characters in the world.
! */
  static PyObject* wpPlayerCount( PyObject* self, PyObject* args )
  {
***************
*** 1398,1402 ****
  	\return An integer value.
  	\description This function returns the number of registered items in the world.
! */ 
  static PyObject* wpItemCount( PyObject* self, PyObject* args )
  {
--- 1398,1402 ----
  	\return An integer value.
  	\description This function returns the number of registered items in the world.
! */
  static PyObject* wpItemCount( PyObject* self, PyObject* args )
  {
***************
*** 1412,1416 ****
  	\return A <object id="packet">packet</object> object.
  	\description This function creates a new packet object with the given size and sets the first byte of the packet to the given packet id.
! */ 
  static PyObject* wpPacket( PyObject* self, PyObject* args )
  {
--- 1412,1416 ----
  	\return A <object id="packet">packet</object> object.
  	\description This function creates a new packet object with the given size and sets the first byte of the packet to the given packet id.
! */
  static PyObject* wpPacket( PyObject* self, PyObject* args )
  {
***************
*** 1430,1434 ****
  	Take a look at the "Action Constants" in the <module id="wolfpack.consts">wolfpack.consts</module> module.
  	\description This function queues an action to be executed in the next iteration of the mainloop.
! */ 
  static PyObject* wpQueueAction( PyObject* self, PyObject* args )
  {
--- 1430,1434 ----
  	Take a look at the "Action Constants" in the <module id="wolfpack.consts">wolfpack.consts</module> module.
  	\description This function queues an action to be executed in the next iteration of the mainloop.
! */
  static PyObject* wpQueueAction( PyObject* self, PyObject* args )
  {
***************
*** 1447,1451 ****
  /*
  	\function wolfpack.getdefinition
! 	\param type The definition type. 
  	Use one of the "Definition Constants" from <module id="wolfpack.consts">wolfpack.consts</module>.
  	\param id A string representing the id of the desired definition section.
--- 1447,1451 ----
  /*
  	\function wolfpack.getdefinition
! 	\param type The definition type.
  	Use one of the "Definition Constants" from <module id="wolfpack.consts">wolfpack.consts</module>.
  	\param id A string representing the id of the desired definition section.
***************
*** 1480,1484 ****
  /*
  	\function wolfpack.getdefinitions
! 	\param type The definition type. 
  	Use one of the "Definition Constants" from <module id="wolfpack.consts">wolfpack.consts</module>.
  	\return A tuple of strings.
--- 1480,1484 ----
  /*
  	\function wolfpack.getdefinitions
! 	\param type The definition type.
  	Use one of the "Definition Constants" from <module id="wolfpack.consts">wolfpack.consts</module>.
  	\return A tuple of strings.
***************
*** 1728,1732 ****
  	}
  
! 	cCharBaseDef *basedef = CharBaseDefs::instance()->get(baseid);	
  
  	if (!basedef) {
--- 1728,1732 ----
  	}
  
! 	cCharBaseDef *basedef = CharBaseDefs::instance()->get(baseid);
  
  	if (!basedef) {
***************
*** 1872,1876 ****
  	\function wolfpack.accounts.find
  	\param name A string containing the account name.
! 	\return An <object id="account">account</object> object if an account was found. 
  	None otherwise.
  	\description This function tries to find an account with the given name and returns it.
--- 1872,1876 ----
  	\function wolfpack.accounts.find
  	\param name A string containing the account name.
! 	\return An <object id="account">account</object> object if an account was found.
  	None otherwise.
  	\description This function tries to find an account with the given name and returns it.
***************
*** 2307,2311 ****
  	\function wolfpack.database.driver
  	\param database The id of the database you want to query. See the "Database Constants" in this module.
! 	\return A string.	
  	\description This function returns the name of the database driver in use for the given database.
  */
--- 2307,2311 ----
  	\function wolfpack.database.driver
  	\param database The id of the database you want to query. See the "Database Constants" in this module.
! 	\return A string.
  	\description This function returns the name of the database driver in use for the given database.
  */

Index: engine.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/engine.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** engine.cpp	15 Jul 2004 02:23:19 -0000	1.32
--- engine.cpp	4 Aug 2004 23:17:39 -0000	1.33
***************
*** 28,32 ****
  #include "engine.h"
  
! #include "../config.h"
  #include "../console.h"
  
--- 28,32 ----
  #include "engine.h"
  
! #include "../serverconfig.h"
  #include "../console.h"
  

Index: pyaccount.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/pyaccount.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** pyaccount.cpp	20 Jul 2004 11:35:38 -0000	1.34
--- pyaccount.cpp	4 Aug 2004 23:17:39 -0000	1.35
***************
*** 35,39 ****
  #include "../basechar.h"
  #include "../md5.h"
! #include "../config.h"
  
  #include "../player.h"
--- 35,39 ----
  #include "../basechar.h"
  #include "../md5.h"
! #include "../serverconfig.h"
  
  #include "../player.h"
***************
*** 309,313 ****
  	}
  	/*
! 		\rproperty account.rank Returns the integer rank of this account. This is inherited by the ACL of 
  		this account.
  	*/
--- 309,313 ----
  	}
  	/*
! 		\rproperty account.rank Returns the integer rank of this account. This is inherited by the ACL of
  		this account.
  	*/
***************
*** 331,335 ****
  	/*
  		\property account.multigems Indicates whether Multis should be sent as Worldgems to this account.
! 	*/		
  	else if ( !strcmp( name, "multigems" ) )
  	{
--- 331,335 ----
  	/*
  		\property account.multigems Indicates whether Multis should be sent as Worldgems to this account.
! 	*/
  	else if ( !strcmp( name, "multigems" ) )
  	{
***************
*** 345,351 ****
  	/*
  		\property account.password The password of this account. Please note that if MD5 hashing is activated,
! 		this property will only return the hashed password. But when setting this property you don't need to 
  		specify the MD5 hashed password as it will be automatically converted.
! 	*/		
  	else if ( !strcmp( name, "password" ) && PyString_Check( value ) )
  		self->account->setPassword( PyString_AsString( value ) );
--- 345,351 ----
  	/*
  		\property account.password The password of this account. Please note that if MD5 hashing is activated,
! 		this property will only return the hashed password. But when setting this property you don't need to
  		specify the MD5 hashed password as it will be automatically converted.
! 	*/
  	else if ( !strcmp( name, "password" ) && PyString_Check( value ) )
  		self->account->setPassword( PyString_AsString( value ) );

Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.175
retrieving revision 1.176
diff -C2 -d -r1.175 -r1.176
*** char.cpp	20 Jul 2004 11:35:38 -0000	1.175
--- char.cpp	4 Aug 2004 23:17:39 -0000	1.176
***************
*** 32,36 ****
  #include "../party.h"
  #include "../combat.h"
! #include "../config.h"
  #include "../walking.h"
  #include "../commands.h"
--- 32,36 ----
  #include "../party.h"
  #include "../combat.h"
! #include "../serverconfig.h"
  #include "../walking.h"
  #include "../commands.h"
***************
*** 400,404 ****
  	\description Play an animation for the character.
  	The animation id is automatically translated if the character is on a horse or
! 	if the current body id of the character doesn't	support the animation. 	
  	\param id The id of the animation that should be played.
  	See the "Animation Constants" in <module id="wolfpack.consts">wolfpack.consts</module> for a list.
--- 400,404 ----
  	\description Play an animation for the character.
  	The animation id is automatically translated if the character is on a horse or
! 	if the current body id of the character doesn't	support the animation.
  	\param id The id of the animation that should be played.
  	See the "Animation Constants" in <module id="wolfpack.consts">wolfpack.consts</module> for a list.
***************
*** 2088,2092 ****
  
  /*
! 	\method char.aiengine	
  	\description Get the ai engine associated with this NPC.
  	This only works for NPCs and returns None otherwise
--- 2088,2092 ----
  
  /*
! 	\method char.aiengine
  	\description Get the ai engine associated with this NPC.
  	This only works for NPCs and returns None otherwise
***************
*** 2204,2208 ****
  /*
  	\method char.showname
! 	\description Show the name of this character over the characters head for a given socket. 
  	This looks like the "Show Incoming Names" option in the client.
  	\param socket The <object id="SOCKET">socket</object> object of the receiving socket.
--- 2204,2208 ----
  /*
  	\method char.showname
! 	\description Show the name of this character over the characters head for a given socket.
  	This looks like the "Show Incoming Names" option in the client.
  	\param socket The <object id="SOCKET">socket</object> object of the receiving socket.

[wpdev-commits] wolfpack/win config_win.cpp,1.3,1.4

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

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

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


Index: config_win.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/win/config_win.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** config_win.cpp	2 Jun 2004 15:04:11 -0000	1.3
--- config_win.cpp	4 Aug 2004 23:17:40 -0000	1.4
***************
*** 26,30 ****
   */
  
! #include "../config.h"
  #include "../defines.h"
  #include "../console.h"
--- 26,30 ----
   */
  
! #include "../serverconfig.h"
  #include "../defines.h"
  #include "../console.h"

[wpdev-commits] wolfpack/network asyncnetio.cpp,1.47,1.48 network.cpp,1.2,1.3 uosocket.cpp,1.384,1.385

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

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

Modified Files:
	asyncnetio.cpp network.cpp uosocket.cpp 
Log Message:
config.h and config.cpp moved to serverconfig.h and serverconfig.cpp
This is to prevent a conflict with Automake.


Index: network.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/network.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** network.cpp	2 Jun 2004 15:04:09 -0000	1.2
--- network.cpp	4 Aug 2004 23:17:38 -0000	1.3
***************
*** 31,35 ****
  //Wolfpack Includes
  #include "network.h"
! #include "../config.h"
  
  #include "../console.h"
--- 31,35 ----
  //Wolfpack Includes
  #include "network.h"
! #include "../serverconfig.h"
  
  #include "../console.h"

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.384
retrieving revision 1.385
diff -C2 -d -r1.384 -r1.385
*** uosocket.cpp	27 Jul 2004 06:35:22 -0000	1.384
--- uosocket.cpp	4 Aug 2004 23:17:38 -0000	1.385
***************
*** 45,49 ****
  #include "../speech.h"
  #include "../commands.h"
! #include "../config.h"
  #include "../definitions.h"
  #include "../scriptmanager.h"
--- 45,49 ----
  #include "../speech.h"
  #include "../commands.h"
! #include "../serverconfig.h"
  #include "../definitions.h"
  #include "../scriptmanager.h"
***************
*** 106,110 ****
  PyObject* cUOSocket::handlers[255] =
  {
! 	0, 
  };
  
--- 106,110 ----
  PyObject* cUOSocket::handlers[255] =
  {
! 	0,
  };
  
***************
*** 263,267 ****
  	// This is always checked before anything else
  	if (packetId == 0x02 && Config::instance()->antiSpeedHack()) {
! 		if (_player && !_player->isGM()) {			
  			// There are two different delays for mounted and unmounted players
  			unsigned int delay;
--- 263,267 ----
  	// This is always checked before anything else
  	if (packetId == 0x02 && Config::instance()->antiSpeedHack()) {
! 		if (_player && !_player->isGM()) {
  			// There are two different delays for mounted and unmounted players
  			unsigned int delay;
***************
*** 272,276 ****
  			}
  
! 			// If the last movement of our player was not X ms in the past, 
  			// requeue the walk request until we can fullfil it.
  			//unsigned int time = getNormalizedTime();
--- 272,276 ----
  			}
  
! 			// If the last movement of our player was not X ms in the past,
  			// requeue the walk request until we can fullfil it.
  			//unsigned int time = getNormalizedTime();

Index: asyncnetio.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/asyncnetio.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** asyncnetio.cpp	27 Jul 2004 06:35:22 -0000	1.47
--- asyncnetio.cpp	4 Aug 2004 23:17:38 -0000	1.48
***************
*** 29,33 ****
  #include "uorxpackets.h"
  #include "uopacket.h"
! #include "../config.h"
  
  #include "../basics.h"
--- 29,33 ----
  #include "uorxpackets.h"
  #include "uopacket.h"
! #include "../serverconfig.h"
  
  #include "../basics.h"

[wpdev-commits] wolfpack/unix config_unix.cpp,1.5,1.6

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

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

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


Index: config_unix.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/unix/config_unix.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** config_unix.cpp	2 Jun 2004 15:04:11 -0000	1.5
--- config_unix.cpp	4 Aug 2004 23:17:39 -0000	1.6
***************
*** 27,31 ****
  
  // Wolfpack Includes
! #include "../config.h"
  #include "../console.h"
  #include "../log.h"
--- 27,31 ----
  
  // Wolfpack Includes
! #include "../serverconfig.h"
  #include "../console.h"
  #include "../log.h"

[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"

[wpdev-commits] wolfpack/muls maps.cpp,1.4,1.5 multiscache.cpp,1.3,1.4 tilecache.cpp,1.2,1.3

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

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

Modified Files:
	maps.cpp multiscache.cpp tilecache.cpp 
Log Message:
config.h and config.cpp moved to serverconfig.h and serverconfig.cpp
This is to prevent a conflict with Automake.


Index: maps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/maps.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** maps.cpp	21 Jul 2004 17:05:22 -0000	1.4
--- maps.cpp	4 Aug 2004 23:17:38 -0000	1.5
***************
*** 32,36 ****
  #include "../defines.h"
  #include "../items.h"
! #include "../config.h"
  
  // Library Includes
--- 32,36 ----
  #include "../defines.h"
  #include "../items.h"
! #include "../serverconfig.h"
  
  // Library Includes
***************
*** 144,149 ****
  	stadifdata.open( IO_ReadOnly );
  
! 	QFile stadiflist( basepath + QString( "stadifl%1.mul" ).arg( id ) );	
! 	QFile stadifindex( basepath + QString( "stadifi%1.mul" ).arg( id ) );	
  
  	if (stadifindex.open(IO_ReadOnly) && stadiflist.open(IO_ReadOnly)) {
--- 144,149 ----
  	stadifdata.open( IO_ReadOnly );
  
! 	QFile stadiflist( basepath + QString( "stadifl%1.mul" ).arg( id ) );
! 	QFile stadifindex( basepath + QString( "stadifi%1.mul" ).arg( id ) );
  
  	if (stadifindex.open(IO_ReadOnly) && stadiflist.open(IO_ReadOnly)) {
***************
*** 157,161 ****
  			unsigned int id;
  			listinput >> id;
!             
  			indexinput >> record.offset;
  			indexinput >> record.blocklength;
--- 157,161 ----
  			unsigned int id;
  			listinput >> id;
! 
  			indexinput >> record.offset;
  			indexinput >> record.blocklength;
***************
*** 165,169 ****
                  staticpatches.insert( id, record );
  			}
! 		}		
  	}
  
--- 165,169 ----
                  staticpatches.insert( id, record );
  			}
! 		}
  	}
  
***************
*** 623,627 ****
  	QValueVector<staticrecord>* p = mapRecord->staticsCache.find( cachePos );
  
! #if !defined(_DEBUG)	
  	if ( !p )
  #else
--- 623,627 ----
  	QValueVector<staticrecord>* p = mapRecord->staticsCache.find( cachePos );
  
! #if !defined(_DEBUG)
  	if ( !p )
  #else
***************
*** 647,651 ****
  		else
  		{
! 			stIndexRecord indexStructure; 
  			mapRecord->idxfile.at( indexPos );
  			mapRecord->idxfile.readBlock( ( char * ) &indexStructure, sizeof( indexStructure ) );
--- 647,651 ----
  		else
  		{
! 			stIndexRecord indexStructure;
  			mapRecord->idxfile.at( indexPos );
  			mapRecord->idxfile.readBlock( ( char * ) &indexStructure, sizeof( indexStructure ) );

Index: multiscache.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/multiscache.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** multiscache.cpp	19 Jun 2004 02:06:51 -0000	1.3
--- multiscache.cpp	4 Aug 2004 23:17:38 -0000	1.4
***************
*** 29,33 ****
  #include "../defines.h"
  #include "../exceptions.h"
! #include "../config.h"
  
  // Library Includes
--- 29,33 ----
  #include "../defines.h"
  #include "../exceptions.h"
! #include "../serverconfig.h"
  
  // Library Includes

Index: tilecache.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/tilecache.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tilecache.cpp	2 Jun 2004 15:04:09 -0000	1.2
--- tilecache.cpp	4 Aug 2004 23:17:38 -0000	1.3
***************
*** 32,36 ****
  #include "../defines.h"
  #include "../exceptions.h"
! #include "../config.h"
  
  #include <qfile.h>
--- 32,36 ----
  #include "../defines.h"
  #include "../exceptions.h"
! #include "../serverconfig.h"
  
  #include <qfile.h>

[wpdev-commits] wolfpack NEWS,1.1,1.2 ChangeLog,1.1,1.2 verinfo.h,1.38,1.39

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

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

Modified Files:
	NEWS ChangeLog verinfo.h 
Log Message:
Preparing


Index: verinfo.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/verinfo.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** verinfo.h	21 Jul 2004 14:34:34 -0000	1.38
--- verinfo.h	4 Aug 2004 22:51:16 -0000	1.39
***************
*** 36,40 ****
  inline const char* productVersion()
  {
! 	return "12.9.8cvs";
  }
  
--- 36,40 ----
  inline const char* productVersion()
  {
! 	return "12.9.9cvs";
  }
  

Index: NEWS
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/NEWS,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NEWS	4 Aug 2004 22:20:58 -0000	1.1
--- NEWS	4 Aug 2004 22:51:15 -0000	1.2
***************
*** 5,11 ****
  Wolfpack 12.9.8 Beta:
  
! 	Dreoth: Things are improving at a wonderful pace now... With this release we
! 	should have improved Linux/BSD compiling support, greater stability, improved
! 	performance and much much more!
  
  
--- 5,11 ----
  Wolfpack 12.9.8 Beta:
  
! 	Dreoth: Things are improving at a wonderful pace now... Following this release
! 	we should have improved Linux/BSD compiling support, greater stability,
! 	improved performance and much much more! Automake files are coming soon!
  
  

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ChangeLog	4 Aug 2004 19:41:50 -0000	1.1
--- ChangeLog	4 Aug 2004 22:51:15 -0000	1.2
***************
*** 1,5 ****
  Wolfpack ChangeLog
  
! Wolfpack 12.9.8 Beta (CVS)
  	- Gump Responses are now passed on as Unicode rather than in
  		the local codepage.
--- 1,8 ----
  Wolfpack ChangeLog
  
! Wolfpack 12.9.9 Beta (CVS)
! 
! 
! Wolfpack 12.9.8 Beta (4. August 2004)
  	- Gump Responses are now passed on as Unicode rather than in
  		the local codepage.

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.36,1.37

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

Update of /cvsroot/wpdev/xmlscripts/documentation/webroot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28976/documentation/webroot

Modified Files:
	ChangeLog.wolfpack 
Log Message:
Preparing


Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** ChangeLog.wolfpack	2 Aug 2004 16:28:37 -0000	1.36
--- ChangeLog.wolfpack	4 Aug 2004 22:47:22 -0000	1.37
***************
*** 1,5 ****
  Wolfpack 13.0.0 ChangeLog
  
! Wolfpack 12.9.8 Beta (CVS)
  	* Core Changes:
  		- Gump Responses are now passed on as Unicode rather than in the
--- 1,12 ----
  Wolfpack 13.0.0 ChangeLog
  
! Wolfpack 12.9.9 Beta (CVS)
! 	* Core Changes:
! 	* Definition Changes:
! 	* Python Script Changes:
! 	* Misc. Changes:
! 	* Known Issues, Bugs, and Missing Features:
! 
! Wolfpack 12.9.8 Beta (4. August, 2004)
  	* Core Changes:
  		- Gump Responses are now passed on as Unicode rather than in the
***************
*** 77,84 ****
  			Mass dispell can now wipe out these fields.
  		- Scrolls are now usable and actually cast the spell.
! 		  For scrolls the following rules are in effect:
! 		    50% decreased mana usage.
! 		   	The effective circle for measuring the skill requirement is lowered by two
! 		   	 when casting from a scroll.
  	* Misc. Changes:
  		- New Features:
--- 84,91 ----
  			Mass dispell can now wipe out these fields.
  		- Scrolls are now usable and actually cast the spell.
! 			For scrolls the following rules are in effect:
! 			50% decreased mana usage.
! 			The effective circle for measuring the skill requirement is lowered by two
! 			when casting from a scroll.
  	* Misc. Changes:
  		- New Features:
***************
*** 275,277 ****
  		- Fixed a drag and drop problem (bouncing).
  		- NPC kills no longer crash the server
- 
--- 282,283 ----