[PlaneShift-svn] SF.net SVN: planeshift:[2020] stable

[<mg...@us...>]

Revision: 2020
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2020&view=rev
Author:   mgist
Date:     2008-08-07 01:34:44 +0000 (Thu, 07 Aug 2008)

Log Message:
-----------
- Merged r2019 from trunk.

Modified Paths:
--------------
    stable/docs/history.txt
    stable/src/server/bulkobjects/psquest.cpp

Property Changed:
----------------
    stable/


Property changes on: stable
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:1911,1915-1916,1918-1919,1923-1927,1930,1934,1936,1939,1941,1945-1949,1951-1953,1958,1960-1961,1964,1966,1968,1970-1972,1974,1978-1979,1981-1982,1986-1988,1990-1991,1994,1996-2001,2003-2004,2008
   + /trunk:1911,1915-1916,1918-1919,1923-1927,1930,1934,1936,1939,1941,1945-1949,1951-1953,1958,1960-1961,1964,1966,1968,1970-1972,1974,1978-1979,1981-1982,1986-1988,1990-1991,1994,1996-2001,2003-2004,2008,2019

Modified: stable/docs/history.txt
===================================================================
--- stable/docs/history.txt	2008-08-07 01:30:50 UTC (rev 2019)
+++ stable/docs/history.txt	2008-08-07 01:34:44 UTC (rev 2020)
@@ -1,3 +1,6 @@
+*** 2008-08-06 by Andreas Heinchen
+- Fixed a wrong handling of a referenced object
+
 *** 2008-08-06 by Mike Gist
 - Fixed FS#1373, patch from weltall.
 - Fixed FS#2084, patch from weltall.

Modified: stable/src/server/bulkobjects/psquest.cpp
===================================================================
--- stable/src/server/bulkobjects/psquest.cpp	2008-08-07 01:30:50 UTC (rev 2019)
+++ stable/src/server/bulkobjects/psquest.cpp	2008-08-07 01:34:44 UTC (rev 2020)
@@ -59,9 +59,6 @@
 
 psQuest::~psQuest()
 {
-    if (prerequisite)
-        delete prerequisite;
-    
     prerequisite = NULL;
 
     for(size_t i = 0;i < triggerPairs.GetSize(); i++)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.