[wpdev-commits] wolfpack basechar.h,1.27,1.28 dragdrop.cpp,1.193,1.194 persistentbroker.cpp,1.16,1.17 player.h,1.19,1.20 wolf.dsp,1.207,1.208 world.cpp,1.33,1.34

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

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv15819

Modified Files:
	basechar.h dragdrop.cpp persistentbroker.cpp player.h wolf.dsp 
	world.cpp 
Log Message:
Fixed saving of players even if they didn't change

Index: basechar.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** basechar.h	27 Aug 2003 21:11:41 -0000	1.27
--- basechar.h	28 Aug 2003 04:05:42 -0000	1.28
***************
*** 145,148 ****
--- 145,149 ----
  	bool Owns( P_ITEM pi ) const;
  	virtual void callGuards();
+ 	virtual void flagUnchanged();
  
  	// Wrapper events
***************
*** 555,558 ****
--- 556,565 ----
      P_CHAR guarding_;
  };
+ 
+ inline void cBaseChar::flagUnchanged()
+ {
+ 	cBaseChar::changed_ = false;
+ 	cUObject::flagUnchanged();
+ }
  
  inline P_CHAR cBaseChar::guarding() const

Index: dragdrop.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v
retrieving revision 1.193
retrieving revision 1.194
diff -C2 -d -r1.193 -r1.194
*** dragdrop.cpp	27 Aug 2003 21:11:41 -0000	1.193
--- dragdrop.cpp	28 Aug 2003 04:05:42 -0000	1.194
***************
*** 54,81 ****
  #define DBGFILE "dragdrop.cpp"
  
- // Lord Binaries "Three Dimension" Drop-bug-fix
- /* if (clientDimension[s]==3)
- {
-   // UO:3D clients send SOMETIMES two dragg packets for a single dragg action.
-   // sometimes we HAVE to swallow it, sometimes it has to be interpreted
-   // if UO:3D specific item loss problems are reported, this is probably the code to blame :)
-   // LB
-   P_ITEM pi = FindItemBySerial(pp->Iserial);
- 
-   if( (pp->TxLoc==-1) && (pp->TyLoc==-1) && (pp->Tserial==0)  && (EVILDRAGG[s]==1) )
-   {
- 	  EVILDRAGG[s]=0;
- 	  return;
-   }
-   else if( (pp->TxLoc==-1) && (pp->TyLoc==-1) && (pp->Tserial==0)  && (EVILDRAGG[s]==0) )
-   {
- 	  bounceItem( ps, pi );
- 	  return;
-   }
-   else if( ( (pp->TxLoc!=-1) && (pp->TyLoc!=-1) && ( pp->Tserial!=-1)) || ( (isItemSerial(pp->Iserial)) && (isItemSerial(pp->Tserial)) ) ) 
- 	  EVILDRAGG[s] = 1;
-   else 
- 	  EVILDRAGG[s] = 0;
- } */
  
  // New Class implementation
--- 54,57 ----
***************
*** 1000,1035 ****
  void cDragItems::dropOnTrainer( cUOSocket* socket, P_ITEM pItem, P_CHAR pTrainer )
  {
- /*	P_CHAR pChar = socket->player();
- 
- 	if( pItem->id() != 0xEED )
- 	{
- 		pTrainer->talk( tr("You need to give me gold if you want me to train you!") );
- 		bounceItem( socket, pItem );
- 		return;
- 	}
- 
- 	pTrainer->talk( tr("I thank thee for thy payment. That should give thee a good start on thy way. Farewell!") );
- 
- 	Q_UINT8 skill = pTrainer->trainingplayerin();
- 	Q_INT32 skillSum = pChar->getSkillSum();
- 	Q_INT32 skillDelta = pTrainer->getTeachingDelta( pChar, skill, skillSum );
- 
- 	//goldsfx( client->socket(), pItem->amount() );
- 
- 	if( pItem->amount() > skillDelta )
- 	{
- 		pItem->ReduceAmount( skillDelta );
- 		bounceItem( socket, pItem );
- 	}
- 	else
- 	{
- 		skillDelta = pItem->amount();
- 		pItem->remove();
- 	}
- 	
- 	pChar->setSkillValue( skill, pChar->skillValue( skill ) + skillDelta );
- 	socket->sendSkill( skill );
- 
- 	// we will not reset the trainer id here because he may want to give him more money
- 	*/
  }
--- 976,978 ----

Index: persistentbroker.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/persistentbroker.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** persistentbroker.cpp	27 Aug 2003 15:29:18 -0000	1.16
--- persistentbroker.cpp	28 Aug 2003 04:05:42 -0000	1.17
***************
*** 157,160 ****
--- 157,161 ----
  		throw QString( "PersistentBroker not connected to database." );
  
+ 	//qWarning( query );
  	bool result = connection->exec(query);
  	if( !result )

Index: player.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** player.h	27 Aug 2003 20:35:10 -0000	1.19
--- player.h	28 Aug 2003 04:05:42 -0000	1.20
***************
*** 258,262 ****
  inline void cPlayer::flagUnchanged()
  {
! 	cPlayer::changed_ = true;
  	cBaseChar::flagUnchanged();
  }
--- 258,262 ----
  inline void cPlayer::flagUnchanged()
  {
! 	cPlayer::changed_ = false;
  	cBaseChar::flagUnchanged();
  }

Index: wolf.dsp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v
retrieving revision 1.207
retrieving revision 1.208
diff -C2 -d -r1.207 -r1.208
*** wolf.dsp	27 Aug 2003 15:29:18 -0000	1.207
--- wolf.dsp	28 Aug 2003 04:05:42 -0000	1.208
***************
*** 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 
  
--- 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 
  
***************
*** 26,30 ****
  # PROP Scc_ProjName "wolf"
  # PROP Scc_LocalPath "."
! CPP=cl.exe
  RSC=rc.exe
  
--- 26,30 ----
  # PROP Scc_ProjName "wolf"
  # PROP Scc_LocalPath "."
! CPP=xicl6.exe
  RSC=rc.exe
  
***************
*** 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
--- 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
***************
*** 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
  
--- 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
  
***************
*** 392,424 ****
  
  SOURCE=.\basechar.h
- 
- !IF  "$(CFG)" == "wolf - Win32 Release"
- 
  # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing basechar.h...
- InputDir=.
- InputPath=.\basechar.h
- InputName=basechar
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "wolf - Win32 Debug"
- 
- # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing basechar.h...
- InputDir=.
- InputPath=.\basechar.h
- InputName=basechar
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ENDIF 
- 
  # End Source File
  # Begin Source File
--- 392,396 ----
***************
*** 433,498 ****
  
  SOURCE=.\boats.h
- 
- !IF  "$(CFG)" == "wolf - Win32 Release"
- 
- # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing boats.h...
- InputDir=.
- InputPath=.\boats.h
- InputName=boats
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "wolf - Win32 Debug"
- 
  # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing boats.h...
- InputDir=.
- InputPath=.\boats.h
- InputName=boats
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ENDIF 
- 
  # End Source File
  # Begin Source File
  
  SOURCE=.\books.h
- 
- !IF  "$(CFG)" == "wolf - Win32 Release"
- 
  # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing books.h...
- InputDir=.
- InputPath=.\books.h
- InputName=books
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "wolf - Win32 Debug"
- 
- # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing books.h...
- InputDir=.
- InputPath=.\books.h
- InputName=books
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ENDIF 
- 
  # End Source File
  # Begin Source File
--- 405,414 ----
***************
*** 553,585 ****
  
  SOURCE=.\corpse.h
- 
- !IF  "$(CFG)" == "wolf - Win32 Release"
- 
  # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing corpse.h...
- InputDir=.
- InputPath=.\corpse.h
- InputName=corpse
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "wolf - Win32 Debug"
- 
- # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing corpse.h...
- InputDir=.
- InputPath=.\corpse.h
- InputName=corpse
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ENDIF 
- 
  # End Source File
  # Begin Source File
--- 469,473 ----
***************
*** 685,697 ****
  
  # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing house.h...
- InputDir=.
- InputPath=.\house.h
- InputName=house
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
  
  !ENDIF 
--- 573,576 ----
***************
*** 742,774 ****
  
  SOURCE=.\items.h
- 
- !IF  "$(CFG)" == "wolf - Win32 Release"
- 
- # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing items.h...
- InputDir=.
- InputPath=.\items.h
- InputName=items
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "wolf - Win32 Debug"
- 
  # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing items.h...
- InputDir=.
- InputPath=.\items.h
- InputName=items
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ENDIF 
- 
  # End Source File
  # Begin Source File
--- 621,625 ----
***************
*** 857,889 ****
  
  SOURCE=.\npc.h
- 
- !IF  "$(CFG)" == "wolf - Win32 Release"
- 
- # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing npc.h...
- InputDir=.
- InputPath=.\npc.h
- InputName=npc
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "wolf - Win32 Debug"
- 
  # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing npc.h...
- InputDir=.
- InputPath=.\npc.h
- InputName=npc
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ENDIF 
- 
  # End Source File
  # Begin Source File
--- 708,712 ----
***************
*** 922,954 ****
  
  SOURCE=.\persistentobject.h
- 
- !IF  "$(CFG)" == "wolf - Win32 Release"
- 
- # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing persistentobject.h...
- InputDir=.
- InputPath=.\persistentobject.h
- InputName=persistentobject
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "wolf - Win32 Debug"
- 
  # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing persistentobject.h...
- InputDir=.
- InputPath=.\persistentobject.h
- InputName=persistentobject
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ENDIF 
- 
  # End Source File
  # Begin Source File
--- 745,749 ----
***************
*** 963,995 ****
  
  SOURCE=.\player.h
- 
- !IF  "$(CFG)" == "wolf - Win32 Release"
- 
  # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing player.h...
- InputDir=.
- InputPath=.\player.h
- InputName=player
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "wolf - Win32 Debug"
- 
- # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing player.h...
- InputDir=.
- InputPath=.\player.h
- InputName=player
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ENDIF 
- 
  # End Source File
  # Begin Source File
--- 758,762 ----
***************
*** 1224,1256 ****
  
  SOURCE=.\uobject.h
- 
- !IF  "$(CFG)" == "wolf - Win32 Release"
- 
- # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing uobject.h...
- InputDir=.
- InputPath=.\uobject.h
- InputName=uobject
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "wolf - Win32 Debug"
- 
  # PROP Ignore_Default_Tool 1
- # Begin Custom Build - MOCing uobject.h...
- InputDir=.
- InputPath=.\uobject.h
- InputName=uobject
- 
- "$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- 	%qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp
- 
- # End Custom Build
- 
- !ENDIF 
- 
  # End Source File
  # Begin Source File
--- 991,995 ----
***************
*** 1498,1513 ****
  # Begin Source File
  
- SOURCE=.\moc_basechar.cpp
- # End Source File
- # Begin Source File
- 
- SOURCE=.\moc_boats.cpp
- # End Source File
- # Begin Source File
- 
- SOURCE=.\moc_books.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\moc_commands.cpp
  
--- 1237,1240 ----
***************
*** 1523,1546 ****
  # Begin Source File
  
- SOURCE=.\moc_corpse.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\moc_gumps.cpp
  # End Source File
  # Begin Source File
  
- SOURCE=.\moc_house.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\moc_iserialization.cpp
  # End Source File
  # Begin Source File
  
- SOURCE=.\moc_items.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\moc_makemenus.cpp
  # End Source File
--- 1250,1261 ----
***************
*** 1551,1566 ****
  # Begin Source File
  
- SOURCE=.\moc_npc.cpp
- # End Source File
- # Begin Source File
- 
- SOURCE=.\moc_persistentobject.cpp
- # End Source File
- # Begin Source File
- 
- SOURCE=.\moc_player.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\moc_resources.cpp
  # End Source File
--- 1266,1269 ----
***************
*** 1576,1592 ****
  
  SOURCE=.\moc_TmpEff.cpp
- # End Source File
- # Begin Source File
- 
- SOURCE=.\moc_uobject.cpp
- 
- !IF  "$(CFG)" == "wolf - Win32 Release"
- 
- !ELSEIF  "$(CFG)" == "wolf - Win32 Debug"
- 
- # ADD CPP /GR
- 
- !ENDIF 
- 
  # End Source File
  # Begin Source File
--- 1279,1282 ----

Index: world.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** world.cpp	27 Aug 2003 23:20:56 -0000	1.33
--- world.cpp	28 Aug 2003 04:05:42 -0000	1.34
***************
*** 65,69 ****
  
  // UNCOMMENT THIS IF YOU WANT TO USE A HASHMAP 
! #define WP_USE_HASH_MAP
  
  // Important compile switch
--- 65,69 ----
  
  // UNCOMMENT THIS IF YOU WANT TO USE A HASHMAP 
! //#define WP_USE_HASH_MAP
  
  // Important compile switch
***************
*** 463,467 ****
  	p->purgePendingObjects();
  
! 	persistentBroker->executeQuery( "BEGIN;" );
  
  	try
--- 463,467 ----
  	p->purgePendingObjects();
  
! 	//persistentBroker->executeQuery( "BEGIN;" );
  
  	try
***************
*** 477,481 ****
  	catch( QString &e )
  	{
! 		persistentBroker->executeQuery( "ROLLBACK;" );
  
  		clConsole.ChangeColor( WPC_RED );
--- 477,481 ----
  	catch( QString &e )
  	{
! 		//persistentBroker->executeQuery( "ROLLBACK;" );
  
  		clConsole.ChangeColor( WPC_RED );
***************
*** 487,491 ****
  	}
  
! 	persistentBroker->executeQuery( "COMMIT;" );
  
  	ISerialization *archive = cPluginFactory::serializationArchiver( "xml" );
--- 487,491 ----
  	}
  
! 	//persistentBroker->executeQuery( "COMMIT;" );
  
  	ISerialization *archive = cPluginFactory::serializationArchiver( "xml" );