Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv10846
Modified Files:
books.cpp customtags.cpp dbl_single_click.cpp items.cpp
items.h pythonscript.cpp pythonscript.h targetrequests.cpp
wolf.dsp wolfpack.cpp
Log Message:
Removed Books and Fixed Packetlengths.
Index: books.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/books.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** books.cpp 27 Aug 2003 23:20:56 -0000 1.45
--- books.cpp 30 Aug 2003 17:00:07 -0000 1.46
***************
*** 1,342 ****
- //==================================================================================
- //
- // Wolfpack Emu (WP)
- // UO Server Emulation Program
- //
- // Copyright 2001-2003 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/
- //==================================================================================
-
- // V2.0 20-jun-2002 rewritten - sereg
-
- #include "books.h"
- #include "network/uotxpackets.h"
- #include "network/uosocket.h"
- #include "wpdefmanager.h"
- #include "persistentbroker.h"
- #include "dbdriver.h"
- #include "globals.h"
-
- #include <qregexp.h>
- #include <qsqlcursor.h>
-
- #undef DBGFILE
- #define DBGFILE "books.cpp"
-
- static cUObject* productCreator()
- {
- return new cBook;
- }
-
- void cBook::registerInFactory()
- {
- QStringList fields, tables, conditions;
- buildSqlString( fields, tables, conditions ); // Build our SQL string
- QString sqlString = QString( "SELECT %1 FROM uobjectmap,%2 WHERE uobjectmap.type = 'cBook' AND %3" ).arg( fields.join( "," ) ).arg( tables.join( "," ) ).arg( conditions.join( " AND " ) );
- UObjectFactory::instance()->registerSqlQuery( "cBook", sqlString );
-
- UObjectFactory::instance()->registerType( "cBook", productCreator );
- }
-
- cBook::cBook()
- {
- cItem::Init( false );
- this->setType( 11 ); // book type
- this->predefined_ = false;
- this->readonly_ = false;
- this->title_ = QString::null;
- this->author_ = QString::null;
- this->section_ = QString::null;
- this->pages_ = 16;
- this->changed( TOOLTIP );
- changed_ = true;
- }
-
- void cBook::buildSqlString( QStringList &fields, QStringList &tables, QStringList &conditions )
- {
- cItem::buildSqlString( fields, tables, conditions );
- fields.push_back( "books.predefined,books.readonly,books.title,books.author,books.section,books.pages" );
- tables.push_back( "books" );
- conditions.push_back( "uobjectmap.serial = books.serial" );
- }
-
- void cBook::load( char **result, UINT16 &offset )
- {
- cItem::load( result, offset );
- predefined_ = atoi( result[offset++] );
- readonly_ = atoi( result[offset++] );
- title_ = result[offset++];
- author_ = result[offset++];
- section_ = result[offset++];
- pages_ = atoi( result[offset++] );
-
- // Load the pages
- cDBResult res = persistentBroker->query( QString( "SELECT page,text FROM bookpages WHERE serial = '%1'" ).arg( serial() ) );
-
- while( res.fetchrow() )
- {
- while( content_.size() <= res.getInt( 0 ) )
- content_.push_back( "" );
- content_[ res.getInt( 0 ) ] = res.getString( 1 );
- }
-
- res.free();
- changed_ = false;
- }
-
- enum eChunkTypes
- {
- BOOK_PREDEFINED = 0x01, // flag
- BOOK_READONLY, // flag
- BOOK_TITLE, // utf8
- BOOK_AUTHOR, // author
- BOOK_SECTION, // utf8
- BOOK_PAGES, // unsigned short + count * utf8
- };
-
- void cBook::save()
- {
- if ( changed_ )
- {
- initSave;
- setTable( "books" );
-
- addField( "serial", serial() );
- addField( "predefined", predefined_ ? 1 : 0 );
- addField( "readonly", readonly_ ? 1 : 0 );
- addStrField( "title", title_ );
- addStrField( "author", author_ );
- addStrField( "section", section_ );
- addField( "pages", content_.count() );
-
- addCondition( "serial", serial() );
- saveFields;
-
- // Delete all Pages from the DB and reinsert them
- // The Amount of pages CAN change!
- if( isPersistent )
- persistentBroker->executeQuery( QString( "DELETE FROM bookpages WHERE serial = '%1'" ).arg( serial() ) );
-
- UINT32 i = 0;
- for ( QStringList::iterator it = content_.begin(); it != content_.end(); ++it )
- {
- persistentBroker->executeQuery( QString( "INSERT INTO bookpages VALUES (%1,%2,'%3')" ).arg( serial() ).arg( i ).arg( persistentBroker->quoteString( *it ) ) );
- ++i;
- }
- }
- cItem::save();
- changed_ = false;
- }
-
- bool cBook::del()
- {
- if( !isPersistent )
- return false;
-
- persistentBroker->addToDeleteQueue( "books", QString( "serial = '%1'" ).arg( serial() ) );
- persistentBroker->addToDeleteQueue( "bookpages", QString( "serial = '%1'" ).arg( serial() ) );
- changed_ = true;
- return cItem::del();
- }
-
- void cBook::processNode( const cElement *Tag )
- {
- QString TagName = Tag->name();
- QString Value = Tag->getValue();
-
- // <title>blabla</title>
- if( TagName == "title" )
- {
- setTitle( Value );
- }
-
- // <author>blabla</author>
- else if( TagName == "author" )
- {
- setAuthor( Value );
- }
-
- // <content>
- // <page no="1">
- // sdjkjsdk
- // asdjkasdjk
- // </page>
- // <page>
- // ...
- // </page>
- // </content>
- else if( TagName == "content" )
- {
- for( unsigned int i = 0; i < Tag->childCount(); ++i )
- {
- const cElement *childTag = Tag->getChild( i );
-
- QString text = childTag->text();
- text = text.replace( QRegExp( "\\t" ), "" );
- while( text.left( 1 ) == "\n" || text.left( 1 ) == "\r" )
- text = text.right( text.length()-1 );
- while( text.right( 1 ) == "\n" || text.right( 1 ) == "\r" )
- text = text.left( text.length()-1 );
-
- if( childTag->hasAttribute( "no" ) )
- {
- UINT32 n = childTag->getAttribute( "no" ).toShort();
- while( content_.size() <= n )
- content_.push_back( "" );
- content_[ n - 1 ] = text;
- }
- else
- content_.push_back( text );
- }
- }
-
- // <readonly />
- else if( TagName == "readonly" )
- readonly_ = true;
-
- // <predefined />
- else if( TagName == "predefined" )
- predefined_ = true;
-
- // <pages>16</pages>
- else if( TagName == "pages" )
- pages_ = Value.toShort();
-
- else
- cItem::processNode( Tag );
- changed_ = true;
- }
-
- void cBook::refresh( void )
- {
- const cElement* section = DefManager->getDefinition( WPDT_ITEM, section_ );
- applyDefinition( section );
- }
-
- void cBook::open( cUOSocket* socket )
- {
- if( this->predefined_ )
- this->refresh();
-
- cUOTxBookTitle openBook;
- openBook.setSerial( this->serial() );
- openBook.setWriteable( writeable() );
- if( writeable() )
- openBook.setFlag( 1 );
- openBook.setPages( pages() );
- openBook.setTitle( title_ );
- openBook.setAuthor( author_ );
-
- socket->send( &openBook );
-
- // for writeable books we have to send the entire book...
- if( writeable() )
- {
- std::vector< QStringList > lines;
- UINT32 i, size = 9;
- for( i = 0; i < content_.count(); i++ )
- {
- QStringList tmpLines = QStringList::split( "\n", content_[i], true );
- size += 4;
- QStringList::const_iterator it = tmpLines.begin();
- while( it != tmpLines.end() )
- {
- size += (*it).length()+1; //null terminated lines!
- it++;
- }
- lines.push_back( tmpLines );
- }
-
- cUOTxBookPage readBook( size );
- readBook.setBlockSize( (UINT16)size );
- readBook.setSerial( this->serial() );
- readBook.setPages( content_.count() );
-
- std::vector< QStringList >::iterator it = lines.begin();
- i = 0;
- while( it != lines.end() )
- {
- readBook.setPage( i+1, (*it).size(), (*it) );
- ++i;
- ++it;
- }
-
- socket->send( &readBook );
- }
- }
-
- void cBook::readPage( cUOSocket *socket, UINT32 page )
- {
- if( this->predefined_ )
- this->refresh();
-
- if( page > content_.size() )
- return;
-
- QStringList lines = QStringList::split( "\n", content_[page-1], true );
-
- UINT32 size = 13;
- QStringList::const_iterator it = lines.begin();
- while( it != lines.end() )
- {
- size += (*it).length()+1; //null terminated lines!
- it++;
- }
-
- cUOTxBookPage readBook( size );
-
- readBook.setBlockSize( (UINT16)size );
- readBook.setSerial( this->serial() );
- readBook.setPages( 1 );
-
- readBook.setPage( page, lines.size(), lines );
-
- socket->send( &readBook );
- }
-
- stError *cBook::setProperty( const QString &name, const cVariant &value )
- {
- changed( TOOLTIP );
- changed_ = true;
- SET_BOOL_PROPERTY( "readonly", readonly_ )
- else SET_BOOL_PROPERTY( "predefined", predefined_ )
- else SET_STR_PROPERTY( "section", section_ )
- else SET_STR_PROPERTY( "title", title_ )
- else SET_STR_PROPERTY( "author", author_ )
- else SET_INT_PROPERTY( "pages", pages_ )
-
- return cItem::setProperty( name, value );
- }
-
- stError *cBook::getProperty( const QString &name, cVariant &value ) const
- {
- GET_PROPERTY( "readonly", readonly_ )
- else GET_PROPERTY( "predefined", predefined_ )
- else GET_PROPERTY( "section", predefined_ )
- else GET_PROPERTY( "title", predefined_ )
- else GET_PROPERTY( "author", predefined_ )
- else GET_PROPERTY( "pages", pages_ )
-
- return cItem::getProperty( name, value );
- }
--- 0 ----
Index: customtags.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/customtags.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** customtags.cpp 27 Aug 2003 21:11:41 -0000 1.28
--- customtags.cpp 30 Aug 2003 17:00:08 -0000 1.29
***************
*** 807,811 ****
--- 807,814 ----
if( tags_->count() == 0 )
+ {
delete tags_;
+ tags_ = 0;
+ }
}
}
Index: dbl_single_click.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dbl_single_click.cpp,v
retrieving revision 1.216
retrieving revision 1.217
diff -C2 -d -r1.216 -r1.217
*** dbl_single_click.cpp 28 Aug 2003 20:56:16 -0000 1.216
--- dbl_single_click.cpp 30 Aug 2003 17:00:08 -0000 1.217
***************
*** 34,38 ****
// Wolfpack Includes
- #include "books.h"
#include "globals.h"
#include "guildstones.h"
--- 34,37 ----
***************
*** 313,328 ****
// End Boats --^
return;
-
- // Book
- case 11:
- {
- cBook* pBook = dynamic_cast< cBook* >(pi);
- if( pBook )
- {
- pc_currchar->setObjectDelay( 0 );
- pBook->open( socket );
- }
- return;
- }
// Food, OSI style
--- 312,315 ----
Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.343
retrieving revision 1.344
diff -C2 -d -r1.343 -r1.344
*** items.cpp 29 Aug 2003 22:46:30 -0000 1.343
--- items.cpp 30 Aug 2003 17:00:08 -0000 1.344
***************
*** 42,46 ****
#include "debug.h"
#include "items.h"
- #include "books.h"
#include "tilecache.h"
#include "srvparams.h"
--- 42,45 ----
***************
*** 482,501 ****
QString cItem::getName( bool shortName )
{
- // Book Titles
- if( type_ == 11 )
- {
- cBook *pBook = dynamic_cast< cBook* >( this );
- if( pBook && !pBook->title().isEmpty() )
- {
- QString bookname = pBook->title();
-
- // Append author
- if( !shortName && !pBook->author().isEmpty() )
- bookname.append( tr( " by %1" ).arg( pBook->author() ) );
-
- return bookname;
- }
- }
-
if( !name_.isNull() )
return name_;
--- 481,484 ----
***************
*** 875,897 ****
}
! // books etc.
! QString type = DefSection->getAttribute( "type" );
!
! if( type == "book" )
! {
! cBook* nBook = new cBook();
! nBook->setSerial( World::instance()->findItemSerial() );
!
! nBook->applyDefinition( DefSection );
! nBook->setSection( Section );
!
! nItem = nBook;
! }
! else
! {
! nItem = new cItem;
! nItem->Init( true );
! nItem->applyDefinition( DefSection );
! }
nItem->onCreate( Section );
--- 858,864 ----
}
! nItem = new cItem;
! nItem->Init( true );
! nItem->applyDefinition( DefSection );
nItem->onCreate( Section );
***************
*** 996,999 ****
--- 963,1017 ----
}
+ bool cItem::onBookUpdateInfo( P_CHAR pChar, const QString &author, const QString &title )
+ {
+ if( scriptChain )
+ {
+ unsigned int i = 0;
+ while( scriptChain[i] )
+ {
+ if( scriptChain[ i ]->onBookUpdateInfo( pChar, this, author, title ) )
+ return true;
+
+ ++i;
+ }
+ }
+
+ return false;
+ }
+
+ bool cItem::onBookRequestPage( P_CHAR pChar, unsigned short page )
+ {
+ if( scriptChain )
+ {
+ unsigned int i = 0;
+ while( scriptChain[i] )
+ {
+ if( scriptChain[ i ]->onBookRequestPage( pChar, this, page ) )
+ return true;
+
+ ++i;
+ }
+ }
+
+ return false;
+ }
+
+ bool cItem::onBookUpdatePage( P_CHAR pChar, unsigned short page, const QString &content )
+ {
+ if( scriptChain )
+ {
+ unsigned int i = 0;
+ while( scriptChain[i] )
+ {
+ if( scriptChain[ i ]->onBookUpdatePage( pChar, this, page, content ) )
+ return true;
+
+ ++i;
+ }
+ }
+
+ return false;
+ }
+
bool cItem::onUnequip( P_CHAR pChar, unsigned char layer )
{
***************
*** 1450,1463 ****
if( socket->player() && socket->player()->account() && socket->player()->account()->isShowSerials() )
itemname.append( tr( " [%1]" ).arg( serial(), 8, 16 ) );
-
- // Pages
- if( type_ == 11 )
- {
- cBook *pBook = dynamic_cast< cBook* >( this );
-
- // Append pages
- if( pBook )
- itemname.append( tr( " [pages: %1]" ).arg( pBook->pages() ) );
- }
// Try a localized Message
--- 1468,1471 ----
Index: items.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.h,v
retrieving revision 1.177
retrieving revision 1.178
diff -C2 -d -r1.177 -r1.178
*** items.h 28 Aug 2003 20:56:16 -0000 1.177
--- items.h 30 Aug 2003 17:00:09 -0000 1.178
***************
*** 216,219 ****
--- 216,222 ----
bool onPickup( P_CHAR pChar );
bool onShowTooltip( P_PLAYER sender, cUOTxTooltipList* tooltip ); // Shows a tool tip for specific object
+ bool onBookUpdateInfo( P_CHAR pChar, const QString &author, const QString &title );
+ bool onBookRequestPage( P_CHAR pChar, unsigned short page );
+ bool onBookUpdatePage( P_CHAR pChar, unsigned short page, const QString &content );
QPtrList< cItem > getContainment() const;
Index: pythonscript.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/pythonscript.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pythonscript.cpp 27 Aug 2003 20:35:10 -0000 1.6
--- pythonscript.cpp 30 Aug 2003 17:00:09 -0000 1.7
***************
*** 627,630 ****
--- 627,671 ----
}
+ bool cPythonScript::onBookUpdateInfo( P_CHAR pChar, P_ITEM pBook, const QString &author, const QString &title )
+ {
+ PyHasMethod( "onBookUpdateInfo" )
+
+ // Create our args for the python function
+ PyObject *tuple = PyTuple_New( 4 );
+ PyTuple_SetItem( tuple, 0, PyGetCharObject( pChar ) );
+ PyTuple_SetItem( tuple, 1, PyGetItemObject( pBook ) );
+ PyTuple_SetItem( tuple, 2, PyString_FromString( author.latin1() ) );
+ PyTuple_SetItem( tuple, 3, PyString_FromString( title.latin1() ) );
+
+ return PyEvalMethod( "onBookUpdateInfo", tuple );
+ }
+
+ bool cPythonScript::onBookRequestPage( P_CHAR pChar, P_ITEM pBook, unsigned short page )
+ {
+ PyHasMethod( "onBookRequestPage" )
+
+ // Create our args for the python function
+ PyObject *tuple = PyTuple_New( 3 );
+ PyTuple_SetItem( tuple, 0, PyGetCharObject( pChar ) );
+ PyTuple_SetItem( tuple, 1, PyGetItemObject( pBook ) );
+ PyTuple_SetItem( tuple, 2, PyInt_FromLong( page ) );
+
+ return PyEvalMethod( "onBookRequestPage", tuple );
+ }
+
+ bool cPythonScript::onBookUpdatePage( P_CHAR pChar, P_ITEM pBook, unsigned short page, const QString &content )
+ {
+ PyHasMethod( "onBookUpdatePage" )
+
+ // Create our args for the python function
+ PyObject *tuple = PyTuple_New( 4 );
+ PyTuple_SetItem( tuple, 0, PyGetCharObject( pChar ) );
+ PyTuple_SetItem( tuple, 1, PyGetItemObject( pBook ) );
+ PyTuple_SetItem( tuple, 2, PyInt_FromLong( page ) );
+ PyTuple_SetItem( tuple, 3, PyString_FromString( content.latin1() ) );
+
+ return PyEvalMethod( "onBookUpdatePage", tuple );
+ }
+
QString cPythonScript::onShowPaperdollName( P_CHAR pChar, P_CHAR pOrigin )
{
Index: pythonscript.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/pythonscript.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pythonscript.h 27 Aug 2003 20:35:10 -0000 1.6
--- pythonscript.h 30 Aug 2003 17:00:09 -0000 1.7
***************
*** 126,129 ****
--- 126,134 ----
bool onCommand( cUOSocket *socket, const QString &name, const QString &args );
+ // RecvPacket Handler
+ bool onBookUpdateInfo( P_CHAR pChar, P_ITEM pBook, const QString &author, const QString &title );
+ bool onBookRequestPage( P_CHAR pChar, P_ITEM pBook, unsigned short page );
+ bool onBookUpdatePage( P_CHAR pChar, P_ITEM pBook, unsigned short page, const QString &content );
+
unsigned int onDamage( P_CHAR pChar, unsigned char type, unsigned int amount, cUObject *source );
Index: targetrequests.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** targetrequests.cpp 27 Aug 2003 20:35:10 -0000 1.73
--- targetrequests.cpp 30 Aug 2003 17:00:09 -0000 1.74
***************
*** 44,48 ****
#include "scriptmanager.h"
#include "pythonscript.h"
- #include "books.h"
#include "house.h"
#include "boats.h"
--- 44,47 ----
Index: wolf.dsp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v
retrieving revision 1.208
retrieving revision 1.209
diff -C2 -d -r1.208 -r1.209
*** wolf.dsp 28 Aug 2003 04:05:42 -0000 1.208
--- wolf.dsp 30 Aug 2003 17:00:09 -0000 1.209
***************
*** 1,23 ****
# Microsoft Developer Studio Project File - Name="wolf" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=wolf - Win32 Debug
! !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
--- 1,23 ----
# Microsoft Developer Studio Project File - Name="wolf" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=wolf - Win32 Debug
! !MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
! !MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "wolf.mak".
!MESSAGE
! !MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
!MESSAGE NMAKE /f "wolf.mak" CFG="wolf - Win32 Debug"
!MESSAGE
! !MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
! !MESSAGE "wolf - Win32 Release" (basierend auf "Win32 (x86) Console Application")
! !MESSAGE "wolf - Win32 Debug" (basierend auf "Win32 (x86) Console Application")
!MESSAGE
***************
*** 26,30 ****
# PROP Scc_ProjName "wolf"
# PROP Scc_LocalPath "."
! CPP=xicl6.exe
RSC=rc.exe
--- 26,30 ----
# PROP Scc_ProjName "wolf"
# PROP Scc_LocalPath "."
! CPP=cl.exe
RSC=rc.exe
***************
*** 50,54 ****
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
! LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt312.lib libmysql.lib /nologo /subsystem:console /map /machine:I386 /nodefaultlib:"libcmt MSVCRTD" /out:"D:\wolfpack\wolfpack.exe" /libpath:"lib\ZThread\lib" /libpath:"lib\Python\lib" /libpath:"lib\bugreport\lib" /libpath:"flatstore\Release" /opt:ref /opt:nowin98
--- 50,54 ----
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
! LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt312.lib libmysql.lib /nologo /subsystem:console /map /machine:I386 /nodefaultlib:"libcmt MSVCRTD" /out:"D:\wolfpack\wolfpack.exe" /libpath:"lib\ZThread\lib" /libpath:"lib\Python\lib" /libpath:"lib\bugreport\lib" /libpath:"flatstore\Release" /opt:ref /opt:nowin98
***************
*** 75,81 ****
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
! LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib libmysql.lib /nologo /version:12.9 /subsystem:console /map /debug /machine:I386 /out:"..\Wolfpack.exe" /pdbtype:sept /libpath:"lib\bugreport\lib" /libpath:"flatstore\Debug"
# SUBTRACT LINK32 /pdb:none
--- 75,81 ----
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
! LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt312.lib libmysql.lib /nologo /version:12.9 /subsystem:console /map /debug /machine:I386 /out:"..\Wolfpack.exe" /pdbtype:sept /libpath:"lib\bugreport\lib" /libpath:"flatstore\Debug"
# SUBTRACT LINK32 /pdb:none
Index: wolfpack.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.cpp,v
retrieving revision 1.445
retrieving revision 1.446
diff -C2 -d -r1.445 -r1.446
*** wolfpack.cpp 27 Aug 2003 23:20:56 -0000 1.445
--- wolfpack.cpp 30 Aug 2003 17:00:10 -0000 1.446
***************
*** 37,41 ****
#include "territories.h"
- #include "books.h"
#include "TmpEff.h"
#include "guildstones.h"
--- 37,40 ----
***************
*** 723,727 ****
cNPC::registerInFactory();
cItem::registerInFactory();
- cBook::registerInFactory();
cCorpse::registerInFactory();
cBoat::registerInFactory();
--- 722,725 ----
|