cpp/openttd-patchpack/source Changeset - r17757:164e7fe4eed4

Changeset - r17757:164e7fe4eed4

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

frosch - 13 years ago 2011-06-11 20:40:46
frosch@openttd.org

(svn r22551) -Fix: Remove BaseStorageArrays from _changed_storage_arrays on destruction.

2 files changed with 9 insertions and 2 deletions:

src/newgrf_storage.cpp

src/newgrf_storage.h

0 comments (0 inline, 0 general)

src/newgrf_storage.cpp

➞

Show inline comments

 /* $Id$ */
 /*
  * This file is part of OpenTTD.
  * OpenTTD 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, version 2.
  * OpenTTD 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 OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file newgrf_storage.cpp Functionality related to the temporary and persistent storage arrays for NewGRFs. */
 #include "stdafx.h"
 #include "newgrf_storage.h"
 #include <set>
 /** The changed storage arrays */
 static std::set<BaseStorageArray*> _changed_storage_arrays;
 /**
  * Remove references to use.
  */
 BaseStorageArray::~BaseStorageArray()
+{
 	_changed_storage_arrays.erase(this);
+}
 /**
  * Add the changed storage array to the list of changed arrays.
  * This is done so we only have to revert/save the changed
  * arrays, which saves quite a few clears, etc. after callbacks.
  * @param storage the array that has changed
  */
 void AddChangedStorage(BaseStorageArray *storage)
+{
 	_changed_storage_arrays.insert(storage);
+}
 /**
  * Clear the changes made since the last ClearStorageChanges.
  * This is done for *all* storages that have been registered to with
  * AddChangedStorage since the previous ClearStorageChanges.
+ *
  * This can be done in two ways:
  *  - saving the changes permanently
  *  - reverting to the previous version
  * @param keep_changes do we save or revert the changes since the last ClearChanges?
  */
 void ClearStorageChanges(bool keep_changes)
+{
 	/* Loop over all changes arrays */
 	for (std::set<BaseStorageArray*>::iterator it = _changed_storage_arrays.begin(); it != _changed_storage_arrays.end(); it++) {

src/newgrf_storage.h

➞

Show inline comments

 /* $Id$ */
 /*
  * This file is part of OpenTTD.
  * OpenTTD 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, version 2.
  * OpenTTD 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 OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file newgrf_storage.h Functionality related to the temporary and persistent storage arrays for NewGRFs. */
 #ifndef NEWGRF_STORAGE_H
 #define NEWGRF_STORAGE_H
 #include "core/alloc_func.hpp"
 /**
  * Base class for all NewGRF storage arrays. Nothing fancy, only here
  * so we have a generalised class to use.
  */
 struct BaseStorageArray
+{
 	/** The needed destructor */
 	virtual ~BaseStorageArray() {}
 	virtual ~BaseStorageArray();
 	/**
 	 * Clear the changes made since the last ClearChanges.
 	 * This can be done in two ways:
 	 *  - saving the changes permanently
 	 *  - reverting to the previous version
 	 * @param keep_changes do we save or revert the changes since the last ClearChanges?
 	 */
 	virtual void ClearChanges(bool keep_changes) = 0;
 	/**
 	 * Stores some value at a given position.
 	 * @param pos   the position to write at
 	 * @param value the value to write
 	 */
 	virtual void Store(uint pos, int32 value) = 0;
 };
 /**
  * Class for persistent storage of data.
  * On ClearChanges that data is either reverted or saved.
  * @param TYPE the type of variable to store.
  * @param SIZE the size of the array.
  */

0 comments (0 inline, 0 general)