|
From: <dar...@us...> - 2003-11-23 03:46:26
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1:/tmp/cvs-serv23286 Modified Files: ai.cpp gumps.cpp gumps.h makemenus.h multis.h resources.h targetrequests.h territories.cpp territories.h wolfpack.vcproj wpdefmanager.cpp wptargetrequests.h Log Message: Removed QObject inheritance from all objects. This could break tr(). BUT tr() was broken anyway as we were translating too much instead of using the cliloc files. Updated and checked the project file for VS.NET as well. Works fine for me now. Index: ai.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ai.cpp 23 Sep 2003 15:36:30 -0000 1.21 --- ai.cpp 23 Nov 2003 03:46:22 -0000 1.22 *************** *** 600,604 **** int v1 = newPos.x - fleePos.x; int v2 = newPos.y - fleePos.y; ! float v_norm = sqrt( v1 * v1 + v2 * v2 ); newPos.x = newPos.x + (INT16)floor( rnddist * v1 / v_norm ); newPos.y = newPos.y + (INT16)floor( rnddist * v2 / v_norm ); --- 600,604 ---- int v1 = newPos.x - fleePos.x; int v2 = newPos.y - fleePos.y; ! float v_norm = sqrt( (double)( v1 * v1 + v2 * v2 ) ); newPos.x = newPos.x + (INT16)floor( rnddist * v1 / v_norm ); newPos.y = newPos.y + (INT16)floor( rnddist * v2 / v_norm ); Index: gumps.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/gumps.cpp,v retrieving revision 1.146 retrieving revision 1.147 diff -C2 -d -r1.146 -r1.147 *** gumps.cpp 10 Oct 2003 21:13:45 -0000 1.146 --- gumps.cpp 23 Nov 2003 03:46:22 -0000 1.147 *************** *** 44,47 **** --- 44,48 ---- #include "player.h" #include "world.h" + #include "inlines.h" // System Includes Index: gumps.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/gumps.h,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** gumps.h 10 Jun 2003 00:55:24 -0000 1.32 --- gumps.h 23 Nov 2003 03:46:22 -0000 1.33 *************** *** 48,54 **** *****************************************************************************/ ! class cGump : public QObject { - Q_OBJECT protected: SERIAL serial_, type_; --- 48,53 ---- *****************************************************************************/ ! class cGump { protected: SERIAL serial_, type_; *************** *** 205,209 **** class cSpawnRegionInfoGump : public cGump { - Q_OBJECT protected: cSpawnRegion* region_; --- 204,207 ---- *************** *** 217,221 **** class cTagsInfoGump : public cGump { - Q_OBJECT protected: cUObject* object_; --- 215,218 ---- *************** *** 229,233 **** class cWhoMenuGump : public cGump { - Q_OBJECT private: UINT32 page_; --- 226,229 ---- *************** *** 242,246 **** class cSocketInfoGump : public cGump { - Q_OBJECT private: cUOSocket* socket_; --- 238,241 ---- *************** *** 254,258 **** class cPagesGump : public cGump { - Q_OBJECT private: UINT32 page_; --- 249,252 ---- *************** *** 269,273 **** class cPageInfoGump : public cGump { - Q_OBJECT private: cPage* page_; --- 263,266 ---- *************** *** 281,285 **** class cHelpGump : public cGump { - Q_OBJECT private: SERIAL char_; --- 274,277 ---- Index: makemenus.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/makemenus.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** makemenus.h 11 Sep 2003 16:19:50 -0000 1.30 --- makemenus.h 23 Nov 2003 03:46:22 -0000 1.31 *************** *** 119,125 **** }; ! class cMakeSection : public QObject, public cDefinable { - Q_OBJECT public: cMakeSection( const QString &name, cMakeAction* baseaction = NULL ); --- 119,124 ---- }; ! class cMakeSection : public cDefinable { public: cMakeSection( const QString &name, cMakeAction* baseaction = NULL ); *************** *** 147,151 **** class cMakeCustomSection : public cMakeSection { - Q_OBJECT public: cMakeCustomSection( const QString &name, cMakeAction* baseaction = NULL ); --- 146,149 ---- *************** *** 181,185 **** class cMakeNpcSection : public cMakeSection { - Q_OBJECT public: cMakeNpcSection( const QString &name, cMakeAction* baseaction = NULL ); --- 179,182 ---- *************** *** 213,217 **** class cMakeResourceSection : public cMakeCustomSection { - Q_OBJECT public: cMakeResourceSection( const QString &name, cMakeAction* baseaction = NULL ); --- 210,213 ---- *************** *** 229,233 **** class cMakeAmountSection : public cMakeCustomSection { - Q_OBJECT public: cMakeAmountSection( const QString &name, cMakeAction* baseaction = NULL ); --- 225,228 ---- *************** *** 245,249 **** class cDoCodeAction : public cMakeSection { - Q_OBJECT public: cDoCodeAction( const QString &name, cMakeAction* baseaction = NULL ); --- 240,243 ---- *************** *** 259,263 **** class cDoScriptAction : public cMakeSection { - Q_OBJECT public: cDoScriptAction( const QString &name, cMakeAction* baseaction = NULL ); --- 253,256 ---- *************** *** 426,430 **** class cMakeMenuGump : public cGump { - Q_OBJECT private: cMakeMenu* menu_; --- 419,422 ---- *************** *** 441,445 **** class cLastTenGump : public cGump { - Q_OBJECT private: cMakeMenu* prev_; --- 433,436 ---- Index: multis.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/multis.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** multis.h 27 Aug 2003 20:35:10 -0000 1.21 --- multis.h 23 Nov 2003 03:46:22 -0000 1.22 *************** *** 129,133 **** class cMultiGump : public cGump { - Q_OBJECT private: SERIAL char_; --- 129,132 ---- Index: resources.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/resources.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** resources.h 12 Sep 2003 15:39:55 -0000 1.18 --- resources.h 23 Nov 2003 03:46:22 -0000 1.19 *************** *** 46,52 **** #include <set> ! class cResource : public QObject, public cDefinable { - Q_OBJECT public: cResource( const cElement *Tag ); --- 46,51 ---- #include <set> ! class cResource : public cDefinable { public: cResource( const cElement *Tag ); *************** *** 149,153 **** class cFindResource : public cTargetRequest { - Q_OBJECT public: cFindResource( QString resname ) : resourcename_( resname ), tool_( INVALID_SERIAL ) {} --- 148,151 ---- *************** *** 162,166 **** class cConvertResource : public cTargetRequest { - Q_OBJECT public: cConvertResource( QString resname, cItem* pi ) : resourcename_( resname ), sourceserial_( pi->serial() ) {} --- 160,163 ---- Index: targetrequests.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/targetrequests.h,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** targetrequests.h 23 Sep 2003 23:55:24 -0000 1.47 --- targetrequests.h 23 Nov 2003 03:46:22 -0000 1.48 *************** *** 49,53 **** class cAddItemTarget: public cTargetRequest { - Q_OBJECT QString item_; bool nodecay; --- 49,52 ---- *************** *** 59,63 **** class cAddNpcTarget: public cTargetRequest { - Q_OBJECT QString npc_; public: --- 58,61 ---- *************** *** 68,72 **** class cBuildMultiTarget: public cTargetRequest { - Q_OBJECT QString multisection_; SERIAL deedserial_; --- 66,69 ---- *************** *** 79,83 **** class cSetMultiOwnerTarget: public cTargetRequest { ! Q_OBJECT SERIAL multi_; bool coowner_; --- 76,80 ---- class cSetMultiOwnerTarget: public cTargetRequest { ! SERIAL multi_; bool coowner_; *************** *** 90,94 **** class cMultiAddToListTarget: public cTargetRequest { ! Q_OBJECT SERIAL multi_; bool banlist_; --- 87,91 ---- class cMultiAddToListTarget: public cTargetRequest { ! SERIAL multi_; bool banlist_; *************** *** 101,105 **** class cMultiChangeLockTarget: public cTargetRequest { ! Q_OBJECT private: SERIAL multi_; --- 98,102 ---- class cMultiChangeLockTarget: public cTargetRequest { ! private: SERIAL multi_; *************** *** 113,117 **** class cSkStealing: public cTargetRequest { ! Q_OBJECT public: bool cSkStealing::responsed( cUOSocket *socket, cUORxTarget *target ); --- 110,114 ---- class cSkStealing: public cTargetRequest { ! public: bool cSkStealing::responsed( cUOSocket *socket, cUORxTarget *target ); *************** *** 122,126 **** class cSkForensics: public cTargetRequest { ! Q_OBJECT public: virtual bool responsed( cUOSocket *socket, cUORxTarget *target ) --- 119,123 ---- class cSkForensics: public cTargetRequest { ! public: virtual bool responsed( cUOSocket *socket, cUORxTarget *target ) *************** *** 170,174 **** class cSkPoisoning: public cTargetRequest { ! Q_OBJECT bool poisonSelected; P_ITEM pPoison; --- 167,171 ---- class cSkPoisoning: public cTargetRequest { ! bool poisonSelected; P_ITEM pPoison; *************** *** 204,208 **** class cSkRepairItem : public cTargetRequest { ! Q_OBJECT private: cDoCodeAction* makesection_; --- 201,205 ---- class cSkRepairItem : public cTargetRequest { ! private: cDoCodeAction* makesection_; *************** *** 214,218 **** class cResurectTarget: public cTargetRequest { ! Q_OBJECT public: virtual bool responsed( cUOSocket *socket, cUORxTarget *target ) --- 211,215 ---- class cResurectTarget: public cTargetRequest { ! public: virtual bool responsed( cUOSocket *socket, cUORxTarget *target ) *************** *** 234,238 **** class cKillTarget: public cTargetRequest { ! Q_OBJECT public: virtual bool responsed( cUOSocket *socket, cUORxTarget *target ) --- 231,235 ---- class cKillTarget: public cTargetRequest { ! public: virtual bool responsed( cUOSocket *socket, cUORxTarget *target ) *************** *** 256,260 **** class cSetTarget: public cTargetRequest { ! Q_OBJECT QString key,value; public: --- 253,257 ---- class cSetTarget: public cTargetRequest { ! QString key,value; public: *************** *** 265,269 **** class cRemoveTarget: public cTargetRequest { ! Q_OBJECT public: bool responsed( cUOSocket *socket, cUORxTarget *target ); --- 262,266 ---- class cRemoveTarget: public cTargetRequest { ! public: bool responsed( cUOSocket *socket, cUORxTarget *target ); *************** *** 272,276 **** class cTeleTarget: public cTargetRequest { ! Q_OBJECT public: virtual bool responsed( cUOSocket *socket, cUORxTarget *target ) --- 269,273 ---- class cTeleTarget: public cTargetRequest { ! public: virtual bool responsed( cUOSocket *socket, cUORxTarget *target ) *************** *** 297,301 **** class cShowTarget: public cTargetRequest { ! Q_OBJECT private: QString key; --- 294,298 ---- class cShowTarget: public cTargetRequest { ! private: QString key; *************** *** 307,311 **** class cSetTagTarget: public cTargetRequest { ! Q_OBJECT private: UINT8 type_; --- 304,308 ---- class cSetTagTarget: public cTargetRequest { ! private: UINT8 type_; *************** *** 353,357 **** class cGetTagTarget: public cTargetRequest { ! Q_OBJECT private: QString key_; --- 350,354 ---- class cGetTagTarget: public cTargetRequest { ! private: QString key_; *************** *** 388,392 **** class cRemoveTagTarget: public cTargetRequest { ! Q_OBJECT private: QString key_; --- 385,389 ---- class cRemoveTagTarget: public cTargetRequest { ! private: QString key_; *************** *** 453,457 **** class cTagsInfoTarget: public cTargetRequest { ! Q_OBJECT public: cTagsInfoTarget() {} --- 450,454 ---- class cTagsInfoTarget: public cTargetRequest { ! public: cTagsInfoTarget() {} *************** *** 485,489 **** class cAddEventTarget: public cTargetRequest { ! Q_OBJECT private: QString _event; --- 482,486 ---- class cAddEventTarget: public cTargetRequest { ! private: QString _event; *************** *** 496,500 **** class cRemoveEventTarget: public cTargetRequest { ! Q_OBJECT private: QString _event; --- 493,497 ---- class cRemoveEventTarget: public cTargetRequest { ! private: QString _event; *************** *** 532,536 **** class cMoveTarget: public cTargetRequest { ! Q_OBJECT private: INT16 x,y,z; --- 529,533 ---- class cMoveTarget: public cTargetRequest { ! private: INT16 x,y,z; *************** *** 578,582 **** class cTileTarget: public cTargetRequest { ! Q_OBJECT private: INT16 x1, y1; --- 575,579 ---- class cTileTarget: public cTargetRequest { ! private: INT16 x1, y1; *************** *** 591,595 **** class cRestockTarget: public cTargetRequest { ! Q_OBJECT public: virtual bool responsed( cUOSocket *socket, cUORxTarget *target ) --- 588,592 ---- class cRestockTarget: public cTargetRequest { ! public: virtual bool responsed( cUOSocket *socket, cUORxTarget *target ) *************** *** 616,620 **** class cDyeTubDyeTarget: public cTargetRequest { ! Q_OBJECT UINT16 _color; public: --- 613,617 ---- class cDyeTubDyeTarget: public cTargetRequest { ! UINT16 _color; public: *************** *** 625,629 **** class cStableTarget: public cTargetRequest { ! Q_OBJECT private: P_NPC m_npc; --- 622,626 ---- class cStableTarget: public cTargetRequest { ! private: P_NPC m_npc; *************** *** 644,648 **** class cFollowTarget : public cTargetRequest { ! Q_OBJECT private: P_NPC m_npc; --- 641,645 ---- class cFollowTarget : public cTargetRequest { ! private: P_NPC m_npc; Index: territories.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/territories.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** territories.cpp 23 Sep 2003 11:53:31 -0000 1.33 --- territories.cpp 23 Nov 2003 03:46:22 -0000 1.34 *************** *** 41,44 **** --- 41,45 ---- #include "basechar.h" #include "player.h" + #include "inlines.h" #include "globals.h" // needed for object SrvParams Index: territories.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/territories.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** territories.h 6 Jul 2003 13:48:02 -0000 1.20 --- territories.h 23 Nov 2003 03:46:22 -0000 1.21 *************** *** 120,126 **** }; ! class cAllTerritories : public QObject, public cAllBaseRegions { - Q_OBJECT public: --- 120,125 ---- }; ! class cAllTerritories : public cAllBaseRegions { public: Index: wolfpack.vcproj =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wolfpack.vcproj 21 Nov 2003 11:59:56 -0000 1.1 --- wolfpack.vcproj 23 Nov 2003 03:46:22 -0000 1.2 *************** *** 19,44 **** <Tool Name="VCCLCompilerTool" Optimization="0" ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" MinimalRebuild="TRUE" BasicRuntimeChecks="3" ! RuntimeLibrary="5" UsePrecompiledHeader="0" ! WarningLevel="3" Detect64BitPortabilityProblems="TRUE" ! DebugInformationFormat="4" ! AdditionalOptions=""/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" ! OutputFile="$(OutDir)/wolfpack.exe" LinkIncremental="2" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(OutDir)/wolfpack.pdb" SubSystem="2" ! TargetMachine="1" ! SuppressStartupBanner="1" ! AdditionalOptions=""/> <Tool Name="VCMIDLTool"/> --- 19,58 ---- <Tool Name="VCCLCompilerTool" + AdditionalOptions="/GR" Optimization="0" ! AdditionalIncludeDirectories="sqlite" ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;QT_DLL;QT_NO_STL;QT_THREAD_SUPPORT" MinimalRebuild="TRUE" BasicRuntimeChecks="3" ! RuntimeLibrary="1" ! ForceConformanceInForLoopScope="FALSE" UsePrecompiledHeader="0" ! BrowseInformation="1" ! WarningLevel="1" Detect64BitPortabilityProblems="TRUE" ! DebugInformationFormat="3"> ! <IntelOptions ! Optimization="0" ! MinimalRebuild="1" ! BasicRuntimeChecks="3" ! RuntimeLibrary="1" ! RuntimeTypeInfo="1" ! AllOptions="/c /I "sqlite" /Zi /nologo /W1 /Wp64 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "QT_DLL" /D "QT_NO_STL" /D "QT_THREAD_SUPPORT" /D "_MBCS" /Gm /EHsc /RTC1 /MTd /GR /Fo"Debug/" /Fd"Debug/vc70.pdb" /FR"Debug/" /Gd /TP /GR"/> ! </Tool> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" ! AdditionalDependencies="qt-mt321.lib ws2_32.lib" ! OutputFile="../wolfpack.exe" LinkIncremental="2" + SuppressStartupBanner="TRUE" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(OutDir)/wolfpack.pdb" SubSystem="2" ! TargetMachine="1"> ! <IntelOptions ! AllOptions="/NOLOGO /OUT:"../wolfpack.exe" /INCREMENTAL qt-mt321.lib ws2_32.lib /DEBUG /PDB:"Debug/wolfpack.pdb" /SUBSYSTEM:WINDOWS /TLBID:1 /MACHINE:IX86 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/> ! </Tool> <Tool Name="VCMIDLTool"/> *************** *** 61,64 **** --- 75,80 ---- <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + <IntelOptions + CompilerName="1"/> </Configuration> <Configuration *************** *** 70,93 **** <Tool Name="VCCLCompilerTool" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" RuntimeLibrary="4" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="3" ! AdditionalOptions=""/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" OutputFile="$(OutDir)/wolfpack.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" ! TargetMachine="1" ! SuppressStartupBanner="1" ! AdditionalOptions=""/> <Tool Name="VCMIDLTool"/> --- 86,125 ---- <Tool Name="VCCLCompilerTool" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_DLL;QT_NO_STL;QT_THREAD_SUPPORT" RuntimeLibrary="4" + ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" + BrowseInformation="1" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="3" ! CallingConvention="1"> ! <IntelOptions ! Optimization="2" ! InlineFunctionExpansion="1" ! OmitFramePointers="1" ! StringPooling="1" ! RuntimeLibrary="4" ! BufferSecurityCheck="1" ! EnableFunctionLevelLinking="1" ! RuntimeTypeInfo="1" ! AllOptions="/c /Zi /nologo /W3 /Wp64 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "QT_DLL" /D "QT_NO_STL" /D "QT_THREAD_SUPPORT" /D "_MBCS" /GF /FD /EHsc /ML /GS /Gy /GR /Fo"Release/" /Fd"Release/vc70.pdb" /FR"Release/" /Gr /TP"/> ! </Tool> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" + AdditionalDependencies="qt-mt321.lib ws2_32.lib" OutputFile="$(OutDir)/wolfpack.exe" LinkIncremental="1" + SuppressStartupBanner="TRUE" GenerateDebugInformation="TRUE" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" ! TargetMachine="1"> ! <IntelOptions ! AllOptions="/NOLOGO /OUT:"Release/wolfpack.exe" /INCREMENTAL:NO qt-mt321.lib ws2_32.lib /DEBUG /PDB:"Release/wolfpack.pdb" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /TLBID:1 /MACHINE:IX86 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/> ! </Tool> <Tool Name="VCMIDLTool"/> *************** *** 115,129 **** <Files> <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" ! UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"/> <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl;inc;xsd" ! UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"/> <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" ! UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"/> </Files> <Globals/> --- 147,574 ---- <Files> <Filter ! Name="Server" ! Filter=""> ! <File ! RelativePath=".\accounts.cpp"/> ! <File ! RelativePath=".\accounts.h"/> ! <File ! RelativePath=".\ai.cpp"/> ! <File ! RelativePath=".\ai.h"/> ! <File ! RelativePath=".\ai_animals.cpp"/> ! <File ! RelativePath=".\ai_humans.cpp"/> ! <File ! RelativePath=".\ai_monsters.cpp"/> ! <File ! RelativePath=".\basechar.cpp"/> ! <File ! RelativePath=".\basechar.h"/> ! <File ! RelativePath=".\basedef.cpp"/> ! <File ! RelativePath=".\basedef.h"/> ! <File ! RelativePath=".\baseregion.h"/> ! <File ! RelativePath=".\basics.cpp"/> ! <File ! RelativePath=".\basics.h"/> ! <File ! RelativePath=".\boats.cpp"/> ! <File ! RelativePath=".\boats.h"/> ! <File ! RelativePath=".\chars.cpp"/> ! <File ! RelativePath=".\chars.h"/> ! <File ! RelativePath=".\combat.cpp"/> ! <File ! RelativePath=".\combat.h"/> ! <File ! RelativePath=".\commands.cpp"/> ! <File ! RelativePath=".\commands.h"/> ! <File ! RelativePath=".\console.cpp"/> ! <File ! RelativePath=".\console.h"/> ! <File ! RelativePath=".\console_win.cpp"/> ! <File ! RelativePath=".\contextmenu.cpp"/> ! <File ! RelativePath=".\contextmenu.h"/> ! <File ! RelativePath=".\coord.cpp"/> ! <File ! RelativePath=".\coord.h"/> ! <File ! RelativePath=".\corpse.cpp"/> ! <File ! RelativePath=".\corpse.h"/> ! <File ! RelativePath=".\customtags.cpp"/> ! <File ! RelativePath=".\customtags.h"/> ! <File ! RelativePath=".\dbdriver.cpp"/> ! <File ! RelativePath=".\dbdriver.h"/> ! <File ! RelativePath=".\dbl_single_click.cpp"/> ! <File ! RelativePath=".\dbl_single_click.h"/> ! <File ! RelativePath=".\definable.cpp"/> ! <File ! RelativePath=".\definable.h"/> ! <File ! RelativePath=".\defines.h"/> ! <File ! RelativePath=".\dragdrop.cpp"/> ! <File ! RelativePath=".\dragdrop.h"/> ! <File ! RelativePath=".\encryption.cpp"/> ! <File ! RelativePath=".\encryption.h"/> ! <File ! RelativePath=".\exceptions.h"/> ! <File ! RelativePath=".\factory.h"/> ! <File ! RelativePath=".\globals.cpp"/> ! <File ! RelativePath=".\globals.h"/> ! <File ! RelativePath=".\gumps.cpp"/> ! <File ! RelativePath=".\gumps.h"/> ! <File ! RelativePath=".\house.cpp"/> ! <File ! RelativePath=".\house.h"/> ! <File ! RelativePath=".\inlines.h"/> ! <File ! RelativePath=".\itemid.cpp"/> ! <File ! RelativePath=".\itemid.h"/> ! <File ! RelativePath=".\items.cpp"/> ! <File ! RelativePath=".\items.h"/> ! <File ! RelativePath=".\log.cpp"/> ! <File ! RelativePath=".\log.h"/> ! <File ! RelativePath=".\makemenus.cpp"/> ! <File ! RelativePath=".\makemenus.h"/> ! <File ! RelativePath=".\maps.cpp"/> ! <File ! RelativePath=".\maps.h"/> ! <File ! RelativePath=".\mulstructs.h"/> ! <File ! RelativePath=".\multis.cpp"/> ! <File ! RelativePath=".\multis.h"/> ! <File ! RelativePath=".\multiscache.cpp"/> ! <File ! RelativePath=".\multiscache.h"/> ! <File ! RelativePath=".\network.cpp"/> ! <File ! RelativePath=".\network.h"/> ! <File ! RelativePath=".\npc.cpp"/> ! <File ! RelativePath=".\npc.h"/> ! <File ! RelativePath=".\pagesystem.h"/> ! <File ! RelativePath=".\persistentbroker.cpp"/> ! <File ! RelativePath=".\persistentbroker.h"/> ! <File ! RelativePath=".\persistentobject.cpp"/> ! <File ! RelativePath=".\persistentobject.h"/> ! <File ! RelativePath=".\platform.h"/> ! <File ! RelativePath=".\player.cpp"/> ! <File ! RelativePath=".\player.h"/> ! <File ! RelativePath=".\preferences.cpp"/> ! <File ! RelativePath=".\preferences.h"/> ! <File ! RelativePath=".\progress.h"/> ! <File ! RelativePath=".\pythonscript.cpp"/> ! <File ! RelativePath=".\pythonscript.h"/> ! <File ! RelativePath=".\resource.h"/> ! <File ! RelativePath=".\resources.cpp"/> ! <File ! RelativePath=".\resources.h"/> ! <File ! RelativePath=".\scriptmanager.cpp"/> ! <File ! RelativePath=".\scriptmanager.h"/> ! <File ! RelativePath=".\sectors.cpp"/> ! <File ! RelativePath=".\sectors.h"/> ! <File ! RelativePath=".\singleton.h"/> ! <File ! RelativePath=".\skills.cpp"/> ! <File ! RelativePath=".\skills.h"/> ! <File ! RelativePath=".\spawnregions.cpp"/> ! <File ! RelativePath=".\spawnregions.h"/> ! <File ! RelativePath=".\speech.cpp"/> ! <File ! RelativePath=".\speech.h"/> ! <File ! RelativePath=".\srvparams.cpp"/> ! <File ! RelativePath=".\srvparams.h"/> ! <File ! RelativePath=".\srvparams_win.cpp"/> ! <File ! RelativePath=".\structs.h"/> ! <File ! RelativePath=".\targetactions.cpp"/> ! <File ! RelativePath=".\targetactions.h"/> ! <File ! RelativePath=".\targetrequests.cpp"/> ! <File ! RelativePath=".\targetrequests.h"/> ! <File ! RelativePath=".\territories.cpp"/> ! <File ! RelativePath=".\territories.h"/> ! <File ! RelativePath=".\tilecache.cpp"/> ! <File ! RelativePath=".\tilecache.h"/> ! <File ! RelativePath=".\tileflags.h"/> ! <File ! RelativePath=".\Timing.cpp"/> ! <File ! RelativePath=".\Timing.h"/> ! <File ! RelativePath=".\tmpeff.cpp"/> ! <File ! RelativePath=".\TmpEff.h"/> ! <File ! RelativePath=".\tracking.cpp"/> ! <File ! RelativePath=".\tracking.h"/> ! <File ! RelativePath=".\Trade.cpp"/> ! <File ! RelativePath=".\Trade.h"/> ! <File ! RelativePath=".\typedefs.h"/> ! <File ! RelativePath=".\uobject.cpp"/> ! <File ! RelativePath=".\uobject.h"/> ! <File ! RelativePath=".\verinfo.h"/> ! <File ! RelativePath=".\walking.cpp"/> ! <File ! RelativePath=".\walking.h"/> ! <File ! RelativePath=".\wolfpack.cpp"/> ! <File ! RelativePath=".\wolfpack.h"/> ! <File ! RelativePath=".\world.cpp"/> ! <File ! RelativePath=".\world.h"/> ! <File ! RelativePath=".\wpdefmanager.cpp"/> ! <File ! RelativePath=".\wpdefmanager.h"/> ! <File ! RelativePath=".\wptargetrequests.cpp"/> ! <File ! RelativePath=".\wptargetrequests.h"/> ! </Filter> <Filter ! Name="Network" ! Filter=""> ! <File ! RelativePath=".\network\asyncnetio.cpp"/> ! <File ! RelativePath=".\network\asyncnetio.h"/> ! <File ! RelativePath=".\network\listener.cpp"/> ! <File ! RelativePath=".\network\listener.h"/> ! <File ! RelativePath=".\network\uopacket.cpp"/> ! <File ! RelativePath=".\network\uopacket.h"/> ! <File ! RelativePath=".\network\uorxpackets.cpp"/> ! <File ! RelativePath=".\network\uorxpackets.h"/> ! <File ! RelativePath=".\network\uosocket.cpp"/> ! <File ! RelativePath=".\network\uosocket.h"/> ! <File ! RelativePath=".\network\uotxpackets.cpp"/> ! <File ! RelativePath=".\network\uotxpackets.h"/> ! </Filter> <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" ! UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> ! <File ! RelativePath=".\res.rc"/> ! </Filter> ! <Filter ! Name="Python" ! Filter=""> ! <File ! RelativePath=".\python\char.cpp"/> ! <File ! RelativePath=".\python\content.h"/> ! <File ! RelativePath=".\python\engine.cpp"/> ! <File ! RelativePath=".\python\engine.h"/> ! <File ! RelativePath=".\python\global.cpp"/> ! <File ! RelativePath=".\python\gump.h"/> ! <File ! RelativePath=".\python\item.cpp"/> ! <File ! RelativePath=".\python\multi.cpp"/> ! <File ! RelativePath=".\python\objectcache.h"/> ! <File ! RelativePath=".\python\pyaccount.cpp"/> ! <File ! RelativePath=".\python\pycoord.cpp"/> ! <File ! RelativePath=".\python\pypacket.cpp"/> ! <File ! RelativePath=".\python\pypacket.h"/> ! <File ! RelativePath=".\python\pyregion.cpp"/> ! <File ! RelativePath=".\python\pytooltip.cpp"/> ! <File ! RelativePath=".\python\region.cpp"/> ! <File ! RelativePath=".\python\regioniterator.h"/> ! <File ! RelativePath=".\python\skills.h"/> ! <File ! RelativePath=".\python\socket.cpp"/> ! <File ! RelativePath=".\python\target.h"/> ! <File ! RelativePath=".\python\tempeffect.h"/> ! <File ! RelativePath=".\python\utilities.h"/> ! <File ! RelativePath=".\python\worlditerator.cpp"/> ! <File ! RelativePath=".\python\worlditerator.h"/> ! </Filter> ! <Filter ! Name="SQLite" ! Filter=""> ! <File ! RelativePath=".\sqlite\attach.c"/> ! <File ! RelativePath=".\sqlite\auth.c"/> ! <File ! RelativePath=".\sqlite\btree.c"/> ! <File ! RelativePath=".\sqlite\btree_rb.c"/> ! <File ! RelativePath=".\sqlite\build.c"/> ! <File ! RelativePath=".\sqlite\copy.c"/> ! <File ! RelativePath=".\sqlite\delete.c"/> ! <File ! RelativePath=".\sqlite\expr.c"/> ! <File ! RelativePath=".\sqlite\func.c"/> ! <File ! RelativePath=".\sqlite\hash.c"/> ! <File ! RelativePath=".\sqlite\insert.c"/> ! <File ! RelativePath=".\sqlite\main.c"/> ! <File ! RelativePath=".\sqlite\opcodes.c"/> ! <File ! RelativePath=".\sqlite\os.c"/> ! <File ! RelativePath=".\sqlite\pager.c"/> ! <File ! RelativePath=".\sqlite\parse.c"/> ! <File ! RelativePath=".\sqlite\pragma.c"/> ! <File ! RelativePath=".\sqlite\printf.c"/> ! <File ! RelativePath=".\sqlite\random.c"/> ! <File ! RelativePath=".\sqlite\select.c"/> ! <File ! RelativePath=".\sqlite\table.c"/> ! <File ! RelativePath=".\sqlite\tokenize.c"/> ! <File ! RelativePath=".\sqlite\trigger.c"/> ! <File ! RelativePath=".\sqlite\update.c"/> ! <File ! RelativePath=".\sqlite\util.c"/> ! <File ! RelativePath=".\sqlite\vacuum.c"/> ! <File ! RelativePath=".\sqlite\vdbe.c"/> ! <File ! RelativePath=".\sqlite\where.c"/> ! </Filter> ! <Filter ! Name="Encryption" ! Filter=""> ! <File ! RelativePath=".\twofish\twofish2.c"/> ! </Filter> </Files> <Globals/> Index: wpdefmanager.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wpdefmanager.cpp,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** wpdefmanager.cpp 8 Oct 2003 01:37:59 -0000 1.68 --- wpdefmanager.cpp 23 Nov 2003 03:46:22 -0000 1.69 *************** *** 356,364 **** if( mult <= 0 ) mult = 1; ! int i = 0; ! while( i < mult ) { list.push_back( data ); ! ++i; } } --- 356,365 ---- if( mult <= 0 ) mult = 1; ! ! int j = 0; ! while( j < mult ) { list.push_back( data ); ! ++j; } } Index: wptargetrequests.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wptargetrequests.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wptargetrequests.h 12 Apr 2003 00:58:50 -0000 1.13 --- wptargetrequests.h 23 Nov 2003 03:46:22 -0000 1.14 *************** *** 44,50 **** // Abstract base-class for target requests ! class cTargetRequest : public QObject { - Q_OBJECT protected: UI32 timeout_; // Timeout in MS --- 44,49 ---- // Abstract base-class for target requests ! class cTargetRequest { protected: UI32 timeout_; // Timeout in MS |
