git.shiar.nl
/
netris.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mark generated files
[netris.git]
/
util.c
diff --git
a/util.c
b/util.c
index 98248ed64e3ab11d625e6fa514325e2ae9c63146..cb7f4211dc1d2cd966da27f97ebfaca5e3e6422b 100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-16,7
+16,7
@@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: util.c,v 1.2
7 1996/02/09 08:22:2
3 mhw Exp $
+ * $Id: util.c,v 1.2
9 1999/05/16 06:56:3
3 mhw Exp $
*/
#include "netris.h"
*/
#include "netris.h"
@@
-66,7
+66,7
@@
ExtFunc void AtExit(void (*handler)(void))
ExtFunc void Usage(void)
{
fprintf(stderr,
ExtFunc void Usage(void)
{
fprintf(stderr,
- "Netris version %s (C) 1994
,1995,1996
Mark H. Weaver <mhw@netris.org>\n"
+ "Netris version %s (C) 1994
-1996,1999
Mark H. Weaver <mhw@netris.org>\n"
"Usage: netris <options>\n"
" -h Print usage information\n"
" -w Wait for connection\n"
"Usage: netris <options>\n"
" -h Print usage information\n"
" -w Wait for connection\n"
@@
-84,7
+84,8
@@
ExtFunc void Usage(void)
" -D Drops go into drop mode\n"
" This means that sliding off a cliff after a drop causes\n"
" another drop automatically\n"
" -D Drops go into drop mode\n"
" This means that sliding off a cliff after a drop causes\n"
" another drop automatically\n"
- " -S Disable standout mode (inverse/bold) for slow terminals\n"
+ " -S Disable inverse/bold/color for slow terminals\n"
+ " -C Disable color\n"
" -H Show distribution and warranty information\n"
" -R Show rules\n",
version_string, DEFAULT_PORT, DEFAULT_KEYS);
" -H Show distribution and warranty information\n"
" -R Show rules\n",
version_string, DEFAULT_PORT, DEFAULT_KEYS);
@@
-93,7
+94,7
@@
ExtFunc void Usage(void)
ExtFunc void DistInfo(void)
{
fprintf(stderr,
ExtFunc void DistInfo(void)
{
fprintf(stderr,
- "Netris version %s (C) 1994
,1995,1996
Mark H. Weaver <mhw@netris.org>\n"
+ "Netris version %s (C) 1994
-1996,1999
Mark H. Weaver <mhw@netris.org>\n"
"\n"
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"\n"
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
@@
-318,11
+319,13
@@
ExtFunc void AddEventGen(EventGenRec *gen)
ExtFunc void RemoveEventGen(EventGenRec *gen)
{
ExtFunc void RemoveEventGen(EventGenRec *gen)
{
- assert(gen->next != NULL);
- while (nextGen->next != gen)
- nextGen = nextGen->next;
- nextGen->next = gen->next;
- gen->next = NULL;
+ /* assert(gen->next != NULL); /* Be more forgiving, for SIGINTs */
+ if (gen->next) {
+ while (nextGen->next != gen)
+ nextGen = nextGen->next;
+ nextGen->next = gen->next;
+ gen->next = NULL;
+ }
}
ExtFunc MyEventType WaitMyEvent(MyEvent *event, int mask)
}
ExtFunc MyEventType WaitMyEvent(MyEvent *event, int mask)