Attempt to fix world breakage for the NOSHARED=yes case. delay_output()
is in both hack and libncurses, and the elf static linker can't handle the duplication. This is probably the correct fix for hack (it makes it clear that the ospeed stuff can go away), but its effect on hack has not been tested, and the linker bug remains open.
This commit is contained in:
parent
ad2d88c906
commit
2db1fa9cd9
@ -94,7 +94,7 @@ static char let;
|
||||
return;
|
||||
}
|
||||
if(prevx >= 0 && cansee(prevx,prevy)) {
|
||||
delay_output();
|
||||
delay_output(50);
|
||||
prl(prevx, prevy); /* in case there was a monster */
|
||||
at(prevx, prevy, levl[prevx][prevy].scrsym);
|
||||
}
|
||||
@ -136,7 +136,7 @@ register xx,yy;
|
||||
}
|
||||
/* normal call */
|
||||
if(cansee(x,y)) {
|
||||
if(cnt) delay_output();
|
||||
if(cnt) delay_output(50);
|
||||
at(x,y,let);
|
||||
tc[cnt].x = x;
|
||||
tc[cnt].y = y;
|
||||
|
@ -232,6 +232,7 @@ static short tmspc10[] = { /* from termcap */
|
||||
0, 2000, 1333, 909, 743, 666, 500, 333, 166, 83, 55, 41, 20, 10, 5, 3, 2, 1
|
||||
};
|
||||
|
||||
#if 0
|
||||
delay_output() {
|
||||
/* delay 50 ms - could also use a 'nap'-system call */
|
||||
/* BUG: if the padding character is visible, as it is on the 5620
|
||||
@ -246,7 +247,6 @@ delay_output() {
|
||||
(void) fflush(stdout);
|
||||
usleep(50*1000);
|
||||
}
|
||||
#if 0
|
||||
else if(ospeed > 0 || ospeed < SIZE(tmspc10)) if(CM) {
|
||||
/* delay by sending cm(here) an appropriate number of times */
|
||||
register int cmlen = strlen(tgoto(CM, curx-1, cury-1));
|
||||
@ -257,8 +257,8 @@ delay_output() {
|
||||
i -= cmlen*tmspc10[ospeed];
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#endif /* 0 */
|
||||
|
||||
cl_eos() /* free after Robert Viduya */
|
||||
{ /* must only be called with curx = 1 */
|
||||
|
Loading…
Reference in New Issue
Block a user