jrk@sys.uea.ac.uk (Richard Kennaway) (07/22/89)
The budget screen ('B' command) doesnt display next year's treasury
correctly. In reports.c, line 360, I find this (reformatted for legibility):
mvprintw(18,COLS-50,"NEXT SEASON'S TREASURY........%8ld",
(startgold + money)*(100L-(long)curntn->charity)/100L);
That is, it's deducting charity as a proportion of your total assets,
instead of (as conquer.doc says, and reports.c line 358 agrees) as a
proportion of your net income.
This is only the status report, charity is actually deducted in update.c,
which is also consistent with conquer.doc. Therefore the quoted line should
be replaced by
mvprintw(18,COLS-50,"NEXT SEASON'S TREASURY........%8ld",
startgold + money*(100L-(long)curntn->charity)/100L);
In fact, that isn't right either, here's a diff listing of what I did to
reports.c. (BTW, I do know how to spell "charity", I just wanted to
make absolutely sure I didnt tread on any existing variable.:-))
I swapped screen lines 16 and 17 because the NET INCOME displayed is the
before-charity figure.
298c298
< long nummonst=0L,costmonst=0L,money;
---
> long nummonst=0L,costmonst=0L,money,charrity;
357,358c357,359
< mvprintw(17,COLS-50,"NET INCOME....................%8ld",money);
< mvprintw(16,COLS-50,"CHARITY.......................%8ld",max((money*(long)curntn->charity)/100L,0L));
---
> mvprintw(16,COLS-50,"NET INCOME....................%8ld",money);
> charrity = max((money*(long)curntn->charity)/100L,0L);
> mvprintw(17,COLS-50,"CHARITY.......................%8ld",charrity);
360c361
< mvprintw(18,COLS-50,"NEXT SEASON'S TREASURY........%8ld",(startgold + money)*(100L-(long)curntn->charity)/100L);
---
> mvprintw(18,COLS-50,"NEXT SEASON'S TREASURY........%8ld",startgold + money - charrity );
A day or two ago I mentioned a problem with conquer sometimes hanging up
when the cursor moved to the edge of the map. That was with version
4.1; since then I've installed the 4.2 patches, and I haven't seen the
hangup since. But that may just be coincidence, I dont know if it's
really gone.
--
Richard Kennaway SYS, University of East Anglia, Norwich, U.K.
uucp: ...mcvax!ukc!uea-sys!jrk Janet: kennaway@uk.ac.uea.sys