From 3ac49bdaa0dde36c966328460421aa0c5c35508c Mon Sep 17 00:00:00 2001 From: "John \"Elwin\" Edwards" Date: Sat, 17 Apr 2021 15:41:12 -0400 Subject: [PATCH] Super-Rogue: fix some out-of-range constants. Constants K_ARROW etc., for causes of death other than monsters, are in the 240-255 range. They were often passed to functions taking char, which is usually signed, making the values out of range. The function declarations have been changed to unsigned char, which is also the type used by the scoreboard code. --- srogue/pstats.c | 2 +- srogue/rip.c | 6 +++--- srogue/rogue.ext | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/srogue/pstats.c b/srogue/pstats.c index b197c86..fc40065 100644 --- a/srogue/pstats.c +++ b/srogue/pstats.c @@ -21,7 +21,7 @@ int hungdam(void); * Changes players hit points */ void -chg_hpt(int howmany, bool alsomax, char what) +chg_hpt(int howmany, bool alsomax, unsigned char what) { nochange = FALSE; if(alsomax) diff --git a/srogue/rip.c b/srogue/rip.c index eeefc64..4337502 100644 --- a/srogue/rip.c +++ b/srogue/rip.c @@ -61,7 +61,7 @@ void showpack(bool winner, char *howso); #include void -death(char monst) +death(unsigned char monst) { reg char *killer; int dp; @@ -122,7 +122,7 @@ int oldpurse; * Figure score and post it. */ void -score(int amount, int aflag, char monst) +score(int amount, int aflag, unsigned char monst) { reg struct sc_ent *scp, *sc2; reg int i, prflags = 0; @@ -219,7 +219,7 @@ score(int amount, int aflag, char monst) showtop(prflags); /* print top ten list */ } -void writelog(int amount, int aflag, char monst) +void writelog(int amount, int aflag, unsigned char monst) { char logmessage[220], ltemp[80], mlev[40]; char *killer; diff --git a/srogue/rogue.ext b/srogue/rogue.ext index f70b745..86ee05b 100644 --- a/srogue/rogue.ext +++ b/srogue/rogue.ext @@ -62,14 +62,14 @@ bool cansee(int y, int x); char *charge_str(struct object *obj); void check_level(void); void chg_abil(int what, int amt, int how); -void chg_hpt(int howmany, bool alsomax, char what); +void chg_hpt(int howmany, bool alsomax, unsigned char what); void command(void); bool cordok(int y, int x); void create_obj(bool fscr); void cur_null(struct object *op); void dbotline(WINDOW *scr, char *message); bool dead_end(char ch); -void death(char monst); +void death(unsigned char monst); void del_pack(struct linked_list *what); bool diag_ok(struct coord *sp, struct coord *ep); void dip_it(void); @@ -208,7 +208,7 @@ void sapem(int fromfuse); bool save(int which); bool save_game(void); bool save_throw(int which, struct thing *tp); -void score(int amount, int aflag, char monst); +void score(int amount, int aflag, unsigned char monst); void sell_it(void); void setoflg(struct object *what, long bit); void setup(void); @@ -244,4 +244,4 @@ void wghtchk(int fromfuse); void whatis(struct linked_list *what); void wield(void); char winat(int y, int x); -void writelog(int amount, int aflag, char monst); +void writelog(int amount, int aflag, unsigned char monst);