Build Templates (Copy&Paste) (r13911 + 0.6.3 + 0.6.2)

[Frostregen]

Doh, not again
-fixed-

[skidd13]

Another svn patch missmatch report:

Code: Select all

Hunk #1 FAILED at 167.
Hunk #2 FAILED at 406.
2 out of 2 hunks FAILED -- saving rejects to file unix.c.rej
Hunk #1 FAILED at 717.
Hunk #2 FAILED at 981.
2 out of 2 hunks FAILED -- saving rejects to file win32.c.rej

SVN 5767

[Frostregen]

New version:

-applies to trunk again. (Major changes in File-IO-System)
-FIXED: Bridges not loaded from template


updated win32 binaries + patchfile

[skidd13]

Just a small question (I'm not so familliar with C)
Why do you write in variables.h

Code: Select all

...
VARDEF int8 _copy_heightmap[COPY_MAX]; //Move terrain needed into this...
...

instead of

Code: Select all

VARDEF uint8 _copy_heightmap[COPY_MAX]; //Move terrain needed into this...

The lower one let the warning dissapper while compiling with gcc-4.1 and I don't notice any differences with gameplay.

[Frostregen]

You should notice an error if some terrain is lower than the "reference tile" (the upper right edge)

This field actually describes the height difference to the reference tile,
NOT the actual heightmap.
(so negative values are valid...)

I don't get a warning.
Where exactly do you get it?

[skidd13]

The warnings as they appear.

copy_paste_gui.c: In Funktion »RotateSelectionCW«:
copy_paste_gui.c Warnung: Zeigerziele bei Übergabe des Arguments 1 von »rotate1B« unterscheiden sich im Vorzeichenbesitz
copy_paste_gui.c: In Funktion »RotateSelectionCCW«:
copy_paste_gui.c Warnung: Zeigerziele bei Übergabe des Arguments 1 von »rotate1B« unterscheiden sich im Vorzeichenbesitz
copy_paste_gui.c: In Funktion »MirrorSelectionHorizontal«:
copy_paste_gui.c Warnung: Zeigerziele bei Übergabe des Arguments 1 von »mirror1B« unterscheiden sich im Vorzeichenbesitz
copy_paste_gui.c: In Funktion »MirrorSelectionVertical«:
copy_paste_gui.c Warnung: Zeigerziele bei Übergabe des Arguments 1 von »mirror1B« unterscheiden sich im Vorzeichenbesitz

They are all related with "_copy_heightmap" and the warning is about sign differeces with pointer-targets at argument #1.

Which compiler do you use?

[Frostregen]

I'll rewrite the mirror/rotateArray functions to accept generic memory pointers to remove the warnings.
(The warning is unnecessary since the array's content is just moved around, and their real values are not interpreted)

I use the compiler that came with MSys. At the moment I am away from my PC, so I can not look up the exact version.

[iNVERTED]

Suggestion for the GUI:

1st section - main buttons (copy, paste, save, load)
2nd section - rotation + mirror
3rd section - options

[skidd13]

And another patch apply reject:

Code: Select all

Hunk #1 FAILED at 48.
1 out of 4 hunks FAILED -- saving rejects to file openttd.c.rej

[Frostregen]

As always: thank you for reporting

Currently I cannot reach my developement PC.
The worst case may be till 21.8., but maybe earlier.

I'll use the time for a GUI Poll.

[skidd13]

I vote for this (posted a few time ago).

[Wolf01]

i like the iNVERTED's one

[Rens2Sea]

Me too

[ddream]

I vote for iNVERTED GUI, but it should be expandable.

[Frostregen]

Hmm, somehow i wrote invisible instead of iNVERTED. Sorry for that.

[iNVERTED]

I vote for iNVERTED GUI, but it should be expandable.

That's easily done.

edit: Should this be moved to the Development forum?

[Wolf01]

i like the new one expandable

[MeusH]

I prefer + and - over R and S (or whatever it will be after translation).
Common symbols would be much better than uncommon abbreviations.

Btw what does S stand for? I guess R is reversing, is that right?

[suit]

i guess r is for "rotation" or whatever and s for "settings" but who cares

[iNVERTED]

Suit is correct

wolf01: which one do you prefer out of the two I posted? the +/- or R/S?

Personally, I prefer R/S because you can choose to show the settings without the rotation, and you don't have to move the mouse between clicks (expanding or contracting the toolbar would change the position of the +/- buttons )