[Freeciv-Dev] Re: don't show "999" as the city turns to build (PR#1283)
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
On Mon, Feb 25, 2002 at 03:25:48PM -0800, jdorje@xxxxxxxxxxxxxxxxxxxxx wrote:
> Raimar Falke wrote:
> > On Mon, Feb 25, 2002 at 10:50:10AM -0800, jdorje@xxxxxxxxxxxxxxxxxxxxx
> > wrote:
> >
> >>The attached patch is a rewrite of a patch I submitted about a year ago.
> >> It was more-or-less ignored at the time, but recently a friend
> >>mentioned to me how much this bugged him as well, so I've brought it
> >>back out.
> >>
> >>The game shows "999" as the turns to build for production that will
> >>never finish. This has always annoyed me. This patch corrects that for
> >>the city descriptions in the mapview only. It takes out all of the
> >>identical code to assemble the mapview production description, and puts
> >>that into a function get_city_mapview_production() in
> >>mapview_common.[ch]. (Thus, it consolidates code overall.) It also
> >>special-cases the "999" that is returned, and prints a "-" in place of
> >>the number. (I had originally put "never" here instead of "-", but
> >>CivIII uses "-" so I figure that's just as good.)
> >>
> >>I've made changes to all GUI's, but I've only tested GTK and XAW, naturally.
> >>
> >>Finally, note this only changes the mapview, not the city dialog. These
> >>are pretty much completely separate, and the city dialog will probably
> >>be a bit more difficult since it varies between GUIs.
> >>
> >
> > Very nice. However this 999 in city_turns_to_build should really be a
> > FC_INFINITY. This will also force us to have special handling
> > everywhere. Can you do that?
>
> It's easy enough to change the 999's to FC_INFINITY, and makes things
> better (much more readible).
> The only problem is that it (kind of) forces us to have special handling
> everywhere _in this patch_, since otherwise people will use "10...000
> turns" everywhere, which just doesn't look good.
Yes I tought at all users of city_turns_to_build.
> But, here's the patch without that. It still just changes the mapview,
> makes the FC_INIFINITY change, and fixes the typos pointed out for win32
> and mui (the same typo).
I will apply this patch without the FC_INIFINITY change. Can you made
a patch which changes all callers of city_turns_to_build? Or do we
need to unify this first a bit?
Raimar
--
email: rf13@xxxxxxxxxxxxxxxxx
Two OS engineers facing a petri net chart:
"dead lock in four moves!"
|
|