cpp/openttd-patchpack/source Changeset - r18290:4e805de55757

Changeset - r18290:4e805de55757

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 13 years ago 2011-11-08 17:22:19
frosch@openttd.org

(svn r23136) -Change: [NewGRF v8] Deprecate old-style callback results 0xFF??.

3 files changed with 7 insertions and 6 deletions:

src/newgrf.cpp

src/newgrf_spritegroup.cpp

src/newgrf_spritegroup.h

0 comments (0 inline, 0 general)

src/newgrf.cpp

➞

Show inline comments

@@ @@ -4240,7 +4240,7 @@ static const SpriteGroup *GetGroupFromGr @@
+{
 	if (HasBit(groupid, 15)) {
 		assert(CallbackResultSpriteGroup::CanAllocateItem());
 		return new CallbackResultSpriteGroup(groupid);
+		return new CallbackResultSpriteGroup(groupid, _cur.grffile->grf_version >= 8);
+	}
 	if (groupid > MAX_SPRITEGROUP || _cur.spritegroups[groupid] == NULL) {
@@ @@ -4263,7 +4263,7 @@ static const SpriteGroup *CreateGroupFro @@
+{
 	if (HasBit(spriteid, 15)) {
 		assert(CallbackResultSpriteGroup::CanAllocateItem());
 		return new CallbackResultSpriteGroup(spriteid);
+		return new CallbackResultSpriteGroup(spriteid, _cur.grffile->grf_version >= 8);
+	}
 	if (!_cur.IsValidSpriteSet(feature, spriteid)) {

src/newgrf_spritegroup.cpp

➞

Show inline comments

@@ @@ -175,7 +175,7 @@ const SpriteGroup *DeterministicSpriteGr @@
 	if (this->num_ranges == 0) {
 		/* nvar == 0 is a special case -- we turn our value into a callback result */
 		if (value != CALLBACK_FAILED) value = GB(value, 0, 15);
 		static CallbackResultSpriteGroup nvarzero(0);
+		static CallbackResultSpriteGroup nvarzero(0, true);
 		nvarzero.result = value;
 		return &nvarzero;
+	}

src/newgrf_spritegroup.h

➞

Show inline comments

@@ @@ -240,14 +240,15 @@ struct CallbackResultSpriteGroup : Sprit @@
 	/**
 	 * Creates a spritegroup representing a callback result
 	 * @param value The value that was used to represent this callback result
 	 * @param grf_version8 True, if we are dealing with a new NewGRF which uses GRF version >= 8.
 	 */
 	CallbackResultSpriteGroup(uint16 value) :
+	CallbackResultSpriteGroup(uint16 value, bool grf_version8) :
 		SpriteGroup(SGT_CALLBACK),
 		result(value)
+	{
 		/* Old style callback results have the highest byte 0xFF so signify it is a callback result
+		/* Old style callback results (only valid for version < 8) have the highest byte 0xFF so signify it is a callback result.
 		 * New style ones only have the highest bit set (allows 15-bit results, instead of just 8) */
 		if ((this->result >> 8) == 0xFF) {
+		if (!grf_version8 && (this->result >> 8) == 0xFF) {
 			this->result &= ~0xFF00;
 		} else {
 			this->result &= ~0x8000;

0 comments (0 inline, 0 general)