Will 2.3.1 fix reaction fire?

[Mattn]

feel free to just attach a patch here.

[bayo]

Or reset the reservation TU when we end the round, which make sens, cause reservation is only need when we are playing.

[Waldschrat]

What commit shall I base the patch on?
- Current master: Doesn't even build, so no way to test it.
- Older commit (94ad32cb) fixing some other reaction fire action check problem: Builds, but crashes on start.
- 2.3 branch: Builds and works, but won't merge into the current master.

So, pick your poison: Untested or merge conflicts?

[Mattn]

* why isn't the build working? what is the problem?
* backtrace available about the crash (or already fixed?)

if you have a patch for 2.3 available, just attach it - if it can't get merged into master we should fix you build problems and you should base it upon master

[DarkRain]

- Current master: Doesn't even build, so no way to test it.

Did you make clean before building? That solved the problem for me.

[Waldschrat]

OK, here is what I tried: I pulled the most recent master, did a "Build->Clean workspace" and then tried to build the various projects in the workspace, that's the result:
ufo, ufo_ded and ufo_tests: can't open file 'build/projects/ufo.exe.manifest': No such file or directory
ufo_radiant: can't open icon file 'build/projects/radiant.ico': No such file or directory
ufo_model:
undefined reference to `R_UseActorSkin'
undefined reference to `R_LoadActorSkinsFromModel'

Maybe I'm doing something wrong here, because both files complained about as missing are in the directories where it looks like they should be.

[Mattn]

c::b is looking for the printed path relative to build/projects - so creating a directory build/projects/build/projects with the two files in it should be a work-around.

about R_UseActorSkin, maybe a missing file.

[mor2]

off topic, request if there will be a 2.3.1 can there be a deferential patch, DL another 0.5GB on this crappy WIFI here its a nightmare.
dont mind me i am just browsing the forum.

[Waldschrat]

About the crash: That one vanished. I think I've just been too impatient. Looks like the loading screen is broken, but the game loads fine. I see the terminal when I start, then I get the loading screen with the progress bar still empty. Then the window just turns white and nothing seems to happen for a while. And then the main menu pops up.

[Waldschrat]

Btw, how do you like your patches? git-format-patch output (mbox) or git-diff -p output (textfile)?

[DarkRain]

I think Mattn preferes format-patch

[Waldschrat]

Well, here we go, two commits.
The first one fixes the build (at least the missing files problem, ufo_model still got undefined references).
The second one makes reaction fire ignore reserved TUs.

It's not tested, because starting a skirmish game gets stuck at the end of the load with "Awaiting game start (0)".

[Mattn]

thanks a lot - it would be better to post patches on the patch tracker - this time i've seen them - but they might get lost on the forum.

[Mattn]

i can't accept your first patch - at it break compilation via normal make

[Waldschrat]

I don't know enough about the build system to properly fix it, I just did the obvious thing such that it again worked for me. If make and c::b handle things differently, it must probably be fixed somewhere else.

I didn't know about the patch tracker, I just asked in the thread where to put the patches and was told to attach them. However I just had a look at the tracker and saw that there is another patch (3082295) that also fixes the reaction fire. I'm not sure which one is the better solution, I think this one work better on 2.3 and mine on master, but anyway: Do not apply both or we'll end up with negative TUs, I think.