mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26173) -Change: [NewGRF] Reset the temporary storage registers for every sprite resolving.

release/1.4
frosch 2013-12-23 18:08:36 +00:00
parent 3eea1befa7
commit a9e8d7a361
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/newgrf_spritegroup.cpp
View File

@ -33,6 +33,9 @@ TemporaryStorageArray<int32, 0x110> _temp_store;
/* static */ const SpriteGroup *SpriteGroup::Resolve(const SpriteGroup *group, ResolverObject &object, bool top_level) /* static */ const SpriteGroup *SpriteGroup::Resolve(const SpriteGroup *group, ResolverObject &object, bool top_level)
{ {
if (group == NULL) return NULL; if (group == NULL) return NULL;
if (top_level) {
_temp_store.ClearChanges();
}
return group->Resolve(object); return group->Resolve(object);
} }

12
src/newgrf_storage.h
View File

@ -29,13 +29,6 @@ struct BaseStorageArray {
* @param keep_changes do we save or revert the changes since the last #ClearChanges? * @param keep_changes do we save or revert the changes since the last #ClearChanges?
*/ */
virtual void ClearChanges(bool keep_changes) = 0; 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 StoreValue(uint pos, int32 value) = 0;
}; };
/** /**
@ -133,7 +126,7 @@ struct PersistentStorageArray : BaseStorageArray {
* @tparam SIZE the size of the array. * @tparam SIZE the size of the array.
*/ */
template <typename TYPE, uint SIZE> template <typename TYPE, uint SIZE>
struct TemporaryStorageArray : BaseStorageArray { struct TemporaryStorageArray {
TYPE storage[SIZE]; ///< Memory to for the storage array TYPE storage[SIZE]; ///< Memory to for the storage array
uint16 init[SIZE]; ///< Storage has been assigned, if this equals 'init_key'. uint16 init[SIZE]; ///< Storage has been assigned, if this equals 'init_key'.
uint16 init_key; ///< Magic key to 'init'. uint16 init_key; ///< Magic key to 'init'.
@ -158,7 +151,6 @@ struct TemporaryStorageArray : BaseStorageArray {
this->storage[pos] = value; this->storage[pos] = value;
this->init[pos] = this->init_key; this->init[pos] = this->init_key;
AddChangedStorage(this);
} }
/** /**
@ -179,7 +171,7 @@ struct TemporaryStorageArray : BaseStorageArray {
return this->storage[pos]; return this->storage[pos];
} }
void ClearChanges(bool keep_changes) void ClearChanges()
{ {
/* Increment init_key to invalidate all storage */ /* Increment init_key to invalidate all storage */
this->init_key++; this->init_key++;