diff --git a/xtrn/sdk/xsdk.c b/xtrn/sdk/xsdk.c index d1f768a3611af0dbe974ce943afa3f3dd261db17..c6463ed187c0a58e04ed0e737543e17b232f822f 100644 --- a/xtrn/sdk/xsdk.c +++ b/xtrn/sdk/xsdk.c @@ -408,7 +408,7 @@ void outchar(char ch) if(lncntr>1) { lncntr=0; CRLF; - pause(); + bpause(); } lncntr=0; lbuflen=0; @@ -426,14 +426,14 @@ void outchar(char ch) } if(lncntr==user_rows-1) { lncntr=0; - pause(); + bpause(); } } /****************************************************************************/ /* Prints PAUSE message and waits for a key stoke */ /****************************************************************************/ -int pause(void) +void bpause(void) { char ch; uchar tempattrs=curatr,*msg="\1_\1r\1h[Hit a key] "; @@ -448,8 +448,6 @@ int pause(void) attr(tempattrs); if(ch=='N' || ch=='Q') aborted=1; - - return(0); } /****************************************************************************/ @@ -1416,9 +1414,9 @@ void cls(void) if(lncntr>1 && !tos) { lncntr=0; CRLF; - pause(); + bpause(); while(lncntr && !aborted) - pause(); } + bpause(); } if(user_misc&ANSI) bprintf("\x1b[2J"); @@ -1463,7 +1461,7 @@ void ctrl_a(char x) mswait(2000); break; case 'P': /* Pause */ - pause(); + bpause(); break; case 'Q': /* Pause reset */ lncntr=0; @@ -2318,7 +2316,7 @@ void printnodedat(int number, node_t node) bputs("performing sysop activities"); break; default: - bputs(itoa(node.action,tmp,10)); + bputs(ultoa(node.action,tmp,10)); break; } if(!node.connection) bputs(" locally"); diff --git a/xtrn/sdk/xsdk.h b/xtrn/sdk/xsdk.h index 4562abef82ceb6019e7c302c6fc553455384a15d..eafd4bca6e4230c80c88de2ca472fa574c3d5315 100644 --- a/xtrn/sdk/xsdk.h +++ b/xtrn/sdk/xsdk.h @@ -119,7 +119,7 @@ void mnemonics(char *str); /* Pause prompt - Displays [Hit a key] and waits for the user to hit a key */ -int pause(void); +void bpause(void); /* Yes/no Question - Displays a string with (Y/n) ? appended and waits for the user to hit @@ -257,11 +257,6 @@ void ungetkey(char ch); /* Check to see if the user has hung-up */ void checkline(void); -#ifndef _WIN32 -/* Wait a specific number of milliseconds */ -void mswait(int ms); -#endif - /* Display a line (with ctrl-A codes) centered on the screen */ void center(char *str); diff --git a/xtrn/sdk/xsdkdefs.h b/xtrn/sdk/xsdkdefs.h index 188e76fc0227c8b8298cb4337a3360ba003e3a0b..04cd62b6f8ac52296b459874a8e318918ae3f5ae 100644 --- a/xtrn/sdk/xsdkdefs.h +++ b/xtrn/sdk/xsdkdefs.h @@ -42,9 +42,6 @@ /* Macros */ /**********/ -#ifdef _WIN32 -#define mswait Sleep /* Win32 equivalent */ -#endif /* Control characters */ #define STX 0x02 /* Start of text ^B */ #define ETX 0x03 /* End of text ^C */ @@ -301,6 +298,8 @@ enum { /* Node Action */ #define RESTORELINE { lbuflen=0; attr(slatr[--slcnt]); \ bputs(slbuf[slcnt]); } +#define pause bpause /* backwards compatibility with pre-3.1 XSDK */ + /************/ /* Typedefs */ /************/