Fix X11 compilation
This commit is contained in:
+1
-1
@@ -1961,7 +1961,7 @@ boolean complain;
|
|||||||
wp = &window_list[newwin];
|
wp = &window_list[newwin];
|
||||||
X11_start_menu(newwin);
|
X11_start_menu(newwin);
|
||||||
|
|
||||||
any = zeroany;
|
any = cg.zeroany;
|
||||||
while (dlb_fgets(line, LLEN, fp)) {
|
while (dlb_fgets(line, LLEN, fp)) {
|
||||||
X11_add_menu(newwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
|
X11_add_menu(newwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
|
||||||
line, MENU_UNSELECTED);
|
line, MENU_UNSELECTED);
|
||||||
|
|||||||
+2
-2
@@ -1074,11 +1074,11 @@ long new_value;
|
|||||||
}
|
}
|
||||||
Strcat(buf, mname);
|
Strcat(buf, mname);
|
||||||
} else
|
} else
|
||||||
Strcat(buf, rank_of(u.ulevel, pl_character[0], flags.female));
|
Strcat(buf, rank_of(u.ulevel, g.pl_character[0], flags.female));
|
||||||
|
|
||||||
} else if (attr_rec == &shown_stats[F_DLEVEL]) {
|
} else if (attr_rec == &shown_stats[F_DLEVEL]) {
|
||||||
if (!describe_level(buf)) {
|
if (!describe_level(buf)) {
|
||||||
Strcpy(buf, dungeons[u.uz.dnum].dname);
|
Strcpy(buf, g.dungeons[u.uz.dnum].dname);
|
||||||
Sprintf(eos(buf), ", level %d", depth(&u.uz));
|
Sprintf(eos(buf), ", level %d", depth(&u.uz));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
+2
-2
@@ -314,7 +314,7 @@ struct xwindow *wp;
|
|||||||
XtParseTranslationTable(text_translations));
|
XtParseTranslationTable(text_translations));
|
||||||
num_args++;
|
num_args++;
|
||||||
|
|
||||||
wp->w = XtCreateManagedWidget(killer.name[0] && WIN_MAP == WIN_ERR
|
wp->w = XtCreateManagedWidget(g.killer.name[0] && WIN_MAP == WIN_ERR
|
||||||
? "tombstone"
|
? "tombstone"
|
||||||
: "text_text", /* name */
|
: "text_text", /* name */
|
||||||
asciiTextWidgetClass,
|
asciiTextWidgetClass,
|
||||||
@@ -496,7 +496,7 @@ calculate_rip_text(int how, time_t when)
|
|||||||
Sprintf(rip_line[NAME_LINE], "%s", g.plname);
|
Sprintf(rip_line[NAME_LINE], "%s", g.plname);
|
||||||
|
|
||||||
/* Put $ on stone */
|
/* Put $ on stone */
|
||||||
Sprintf(rip_line[GOLD_LINE], "%ld Au", done_money);
|
Sprintf(rip_line[GOLD_LINE], "%ld Au", g.done_money);
|
||||||
/* Put together death description */
|
/* Put together death description */
|
||||||
formatkiller(buf, sizeof buf, how, FALSE);
|
formatkiller(buf, sizeof buf, how, FALSE);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user