summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2010-03-21 11:05:39 +0000
committerfrosch <frosch@openttd.org>2010-03-21 11:05:39 +0000
commitc049bf3f388438c9901981b1943b35fc3add3e4d (patch)
tree2bd583c61b01cecbd8ad64c38b68bd16767904a2
parentb7b01bb9c703acdf93c36e7212e959b399442d93 (diff)
downloadopenttd-c049bf3f388438c9901981b1943b35fc3add3e4d.tar.xz
(svn r19497) -Fix: [NewGRF] Bytes and words get sign-extended for temporary/persistent storage. (Spotted by yexo)
-rw-r--r--src/industry.h2
-rw-r--r--src/newgrf_spritegroup.cpp6
-rw-r--r--src/newgrf_spritegroup.h2
-rw-r--r--src/newgrf_storage.h6
-rw-r--r--src/newgrf_text.cpp2
5 files changed, 9 insertions, 9 deletions
diff --git a/src/industry.h b/src/industry.h
index 63c647a77..919584589 100644
--- a/src/industry.h
+++ b/src/industry.h
@@ -26,7 +26,7 @@ extern IndustryPool _industry_pool;
* Defines the internal data of a functionnal industry
*/
struct Industry : IndustryPool::PoolItem<&_industry_pool> {
- typedef PersistentStorageArray<uint32, 16> PersistentStorage;
+ typedef PersistentStorageArray<int32, 16> PersistentStorage;
TileArea location; ///< Location of the industry
const Town *town; ///< Nearest town
diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp
index 993a75102..19b73c63c 100644
--- a/src/newgrf_spritegroup.cpp
+++ b/src/newgrf_spritegroup.cpp
@@ -42,7 +42,7 @@ TileLayoutSpriteGroup::~TileLayoutSpriteGroup()
free(this->dts);
}
-TemporaryStorageArray<uint32, 0x110> _temp_store;
+TemporaryStorageArray<int32, 0x110> _temp_store;
static inline uint32 GetVariable(const ResolverObject *object, byte variable, byte parameter, bool *available)
@@ -118,9 +118,9 @@ static U EvalAdjustT(const DeterministicSpriteGroupAdjust *adjust, ResolverObjec
case DSGA_OP_AND: return last_value & value;
case DSGA_OP_OR: return last_value | value;
case DSGA_OP_XOR: return last_value ^ value;
- case DSGA_OP_STO: _temp_store.Store(value, last_value); return last_value;
+ case DSGA_OP_STO: _temp_store.Store((U)value, (S)last_value); return last_value;
case DSGA_OP_RST: return value;
- case DSGA_OP_STOP: if (object->psa != NULL) object->psa->Store(value, last_value); return last_value;
+ case DSGA_OP_STOP: if (object->psa != NULL) object->psa->Store((U)value, (S)last_value); return last_value;
case DSGA_OP_ROR: return RotateRight(last_value, value);
case DSGA_OP_SCMP: return ((S)last_value == (S)value) ? 1 : ((S)last_value < (S)value ? 0 : 2);
case DSGA_OP_UCMP: return ((U)last_value == (U)value) ? 1 : ((U)last_value < (U)value ? 0 : 2);
diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h
index 1bcc7de7e..c606e147d 100644
--- a/src/newgrf_spritegroup.h
+++ b/src/newgrf_spritegroup.h
@@ -31,7 +31,7 @@
*/
static inline uint32 GetRegister(uint i)
{
- extern TemporaryStorageArray<uint32, 0x110> _temp_store;
+ extern TemporaryStorageArray<int32, 0x110> _temp_store;
return _temp_store.Get(i);
}
diff --git a/src/newgrf_storage.h b/src/newgrf_storage.h
index 4e43f124b..cff102ace 100644
--- a/src/newgrf_storage.h
+++ b/src/newgrf_storage.h
@@ -37,7 +37,7 @@ struct BaseStorageArray
* @param pos the position to write at
* @param value the value to write
*/
- virtual void Store(uint pos, uint32 value) = 0;
+ virtual void Store(uint pos, int32 value) = 0;
};
/**
@@ -70,7 +70,7 @@ struct PersistentStorageArray : BaseStorageArray {
* @param pos the position to write at
* @param value the value to write
*/
- void Store(uint pos, uint32 value)
+ void Store(uint pos, int32 value)
{
/* Out of the scope of the array */
if (pos >= SIZE) return;
@@ -138,7 +138,7 @@ struct TemporaryStorageArray : BaseStorageArray {
* @param pos the position to write at
* @param value the value to write
*/
- void Store(uint pos, uint32 value)
+ void Store(uint pos, int32 value)
{
/* Out of the scope of the array */
if (pos >= SIZE) return;
diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp
index 7cb94bd0a..6cf10f1c8 100644
--- a/src/newgrf_text.cpp
+++ b/src/newgrf_text.cpp
@@ -597,7 +597,7 @@ static TextRefStack *_newgrf_textrefstack = &_newgrf_normal_textrefstack;
*/
void PrepareTextRefStackUsage(byte numEntries)
{
- extern TemporaryStorageArray<uint32, 0x110> _temp_store;
+ extern TemporaryStorageArray<int32, 0x110> _temp_store;
_newgrf_textrefstack->ResetStack();