G_ActorInvMove and IA_RELOAD_SWAP

[DarkRain]

I found it while running tests for my Encumbrance and TU penalty work

When you swap ammo in combat the wrong item is placed back in the source container:

You can reproduce it: (I checked the latest rev without my changes)

1) Get a soldier equiped with Rocket Launcher with HE Rocket loaded and an spare IC Rocket, lets say in the belt
2) Enter combat
3) Open the soldier inventory and drag the IC Rocket to the Launcher -- Launcher loaded OK but a new IC Rocket will be placed in the belt instead of the HE Rocket that was unloaded
4) Drag the fake IC Rocket to the Launcher -- Launcher is now loaded with a HE Rocket and there is a (fake) HE Rocket in the belt

I've nailed it to G_ActorInvMove and the way it handles IA_RELOAD_SWAP cases
Should I submit a separate patch for this?

Edit: This seems to affect 2.3 as well

[Mattn]

yes - please make a separate patch for this.

[DarkRain]

Submited a patch to the tracker: 3066156

Swapping ammo during combat should work as expected EXCEPT . . .
I found a new bug while testing this, if the ammo you are trying to load is the last item in the floor (while swapping ammo) battlescape will crash with:

Code: [Select]

********************
ERROR: InvAdd message ignored... LE not found

********************
/home/eliab/GIT/ufoai/ufo(Sys_Backtrace+0x1f)[0x81acfcd]
/home/eliab/GIT/ufoai/ufo(Com_Error+0xd3)[0x814c34b]
/home/eliab/GIT/ufoai/ufo(CL_InvAdd+0x65)[0x80a316f]
/home/eliab/GIT/ufoai/ufo[0x809f9cd]
/home/eliab/GIT/ufoai/ufo(Qcommon_Frame+0x7b)[0x814e118]
/home/eliab/GIT/ufoai/ufo(main+0x5c)[0x81ab72f]
/lib/tls/i686/cmov/libc.so.6(__libc_start_main+0xe6)[0x463bd6]
/home/eliab/GIT/ufoai/ufo[0x806d381]
Shutdown server: Server crashed.
Shutdown the game thread
==== ShutdownGame ====
Free inventory slots in game on shutdown: 0
Unload the game library

I can reproduce this in the unmodified latest rev and in 2.3 this crashes the game as well (so I know I didn't introduce it)

Guess I'll go hunting this one now . . .

[DarkRain]

Submiting a new patch to the tracker (3067252), a work around for the LE not found error while trying to swap the last ammo in the floor, just a work around it.
The cause is the client will remove the floor le when removing the last item from it but then we are putting back the ammo we swapped from the weapon to a non existant floor in the client

I'm also attaching (in this post) a test case for test_inventory.c for reload and reload swap in case you are still interested.

[Mattn]

thanks a lot for both fixes - i've also applied the workaround to master, but this should get fixed in a different way - as the server should really not care about how the client handles this stuff.

and thanks for the testcase - it's applied, too.

if you are interested in commit rights, let me know

[Mattn]

maybe we should add a new event type for this - a real EV_INV_MOVE that is not splitted into remove and add events but handles this at once.

[DarkRain]

Workarounds are rarely true fixes, but they are faster to do . . .

There's already an EV_INV_RELOAD event, maybe that sould handle this particular case, but an EV_INV_MOVE still sounds good to me