A_WeaponReady: WRF_USER1 (etc.)

[Major Cooke]

Yeah I figured not but still... Hell if I know where to find it, honestly.

[Xaser]

What's the issue at present? Should be able to get away with copying+pasting+renaming how the Reload and Zoom states do things, since it's the same thing.

[edward850]

Except it most certainly does.


Edit: Gah what. Stop deleting posts! D:
For the record, Major Cooke said that BT_USER1-4 did nothing in the playsim. I'm assume he then found something he might have been missing.

[Major Cooke]

Sorry! Found out what it was.

WeaponState is BYTE, and the flags for WF_USER#OKAY are 256 and above. Changing it to WORD fixed it. I hope this won't have any unforeseen consequences.

Pull Request and putting this on my first post on page 1.

[edward850]

WeaponState is serialized. You'll need to explicitly load a byte for older versions.

[Major Cooke]

(byte)WeaponState right?

[edward850]

You'll want to test that, but yes that should do it.

[Major Cooke]

Actually that doesn't work. Found something else that I think might though... Accuracy and stamina do this.

Code: Select all

if (SaveVersion < 4526)
	{
		BYTE oldWeaponState;
		arc << oldWeaponState;
		if (WeaponState != NULL)
		{
			WeaponState = oldWeaponState; //Shouldnt this be opposite? Looks like it should be but this is how accuracy and stamina did it...
		}
	}
	else
	{
		arc << WeaponState;
	}

[Graf Zahl]

'That piece of code just looks wrong. If you deserialize an old savegame you should always set WeaponState. Like this:

Code: Select all

if (SaveVersion < 4526)
   {
      BYTE oldWeaponState;
      arc << oldWeaponState;
      WeaponState = oldWeaponState;
   }
   else
   {
      arc << WeaponState;
   }

[Major Cooke]

And done.

[Edward-san]

imho, you should keep the consistency with the | operator here.

[Major Cooke]

No other flags are being passed into it. It's fine.

[Graf Zahl]

That may be, but it's bad style. Never use '+' with flag values, always use '|'. It's not the first time you did this and it was problematic in other cases. Better stop doing this altogether.

[Major Cooke]

Alright, done. Anything else?

[Major Cooke]

Randi has added this. This can be closed.