X-Git-Url: http://git.shiar.nl/netris.git/blobdiff_plain/776faa936ea4b3f5ccaacda0f05a2ed1e945d304..b5a9cdfd671a10cd5b5e9f1f53105e9993414247:/util.c diff --git a/util.c b/util.c index 3bbd704..791a007 100644 --- a/util.c +++ b/util.c @@ -28,33 +28,21 @@ #include #include #include +#include -static MyEventType AlarmGenFunc(EventGenRec *gen, MyEvent *event); +#include "util.h" +static MyEventType AlarmGenFunc(EventGenRec *gen, MyEvent *event); static EventGenRec alarmGen = { &alarmGen, 0, FT_read, -1, AlarmGenFunc, EM_alarm }; static EventGenRec *nextGen = &alarmGen; -static myRandSeed = 1; +static int myRandSeed = 1; -static struct timeval baseTimeval; +static long baseTimeval; -ExtFunc void InitUtil(void) -{ - if (initSeed) - SRandom(initSeed); - else - SRandom(time(0)); - signal(SIGINT, CatchInt); - ResetBaseTime(); -} -ExtFunc void ResetBaseTime(void) -{ - gettimeofday(&baseTimeval, NULL); -} - -ExtFunc void AtExit(void (*handler)(void)) +void AtExit(void (*handler)(void)) { #ifdef HAS_ON_EXIT on_exit((void *)handler, NULL); @@ -63,40 +51,47 @@ ExtFunc void AtExit(void (*handler)(void)) #endif } -ExtFunc void Usage(void) +///////////// HELP MESSAGES ///////////// + +void Header(void) { fprintf(stderr, - "Netris version %s (C) 1994-1996,1999 Mark H. Weaver \n" + "NETRIS %s\t(c) 1994-1996,1999 Mark H. Weaver \n" + " \t(c) 2002 Shiar \n\n", + version_string); +} //Header + +void Usage(void) +{ + Header(); + fprintf(stderr, "Usage: netris \n" - " -h Print usage information\n" - " -w Wait for connection\n" - " -c Initiate connection\n" - " -p Set port number (default is %d)\n" - " -k Remap keys. The argument is a prefix of the string\n" - " containing the keys in order: left, rotate, right, drop,\n" - " down-faster, toggle-spying, pause, faster, redraw.\n" - " \"^\" prefixes controls. (default is \"%s\")\n" - " -i Set the step-down interval, in seconds\n" - " -r Execute (a command) as a robot controlling\n" - " the game instead of the keyboard\n" - " -F Use fair robot interface\n" - " -s Start with given random seed\n" - " -d Drops go into drop mode\n" - " This means that sliding off a cliff after a drop causes\n" - " another drop automatically\n" - " -D Instant drop\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); + "\n" + " -h, --help\t\tPrint this usage information\n" + " -H, --info\t\tShow distribution and warranty information\n" + " -R, --rules\t\tShow game rules\n" + "\n" + " -S, --slowterm\tDisable inverse/bold/color for slow terminals\n" + " -a, --ascii\t\tUse ascii characters\n" + " -C, --color=0\t\tDisable color\n" + "\n" + " -c, --connect \tInitiate connection\n" + " -p, --port \tSet port number (default is %d)\n" + "\n" + " -t, --team \tJoin a team (don't receive lines from your teammates)\n" + " -l, --level \tBegin at a higher level (can be used as handicap)\n" + " -k, --keys \tRemap keys (default is \"%s\" for cursors)\n" + " -d, --dropmode\tDrops go into drop mode\n" + " -D, --instadrop\tInstant drop\n" + "\n" + " -r, --robot \tExecute program to control the game instead of keyboard\n" + " -F, --fair-robot\tUse fair robot interface\n" + "\n", DEFAULT_PORT, DEFAULT_KEYS); } -ExtFunc void DistInfo(void) +void DistInfo(void) { fprintf(stderr, - "Netris version %s (C) 1994-1996,1999 Mark H. Weaver \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" "the Free Software Foundation; either version 2 of the License, or\n" @@ -109,55 +104,55 @@ ExtFunc void DistInfo(void) "\n" "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" - "Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n", - version_string); -} + "Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n" + "\n"); +} //DistInfo -ExtFunc void Rules(void) +void Rules(void) { + Header(); fprintf(stderr, - "Netris version %s rules\n" + "One player mode\n" + "---------------\n" + "Good old Tetris. Scoring is like on the GameBoy version (so try to\n" + "remove as many lines at once as you can). After removing ten lines\n" + "you go to the next level, which will be faster thus making the game\n" + "harder to play.\n" "\n" "Two player mode\n" "---------------\n" "It's just like normal T*tris except that when you clear more than\n" - "one row with a single piece, the other player's board is moved up\n" - "and junk rows are added to the bottom. If you clear 2, 3 or 4\n" - "rows, 1, 2 or 4 junk rows are added to your opponent's board,\n" - "respectively. The junk rows have exactly one empty column.\n" - "For each group of junk rows given, the empty columns will line\n" - "up. This is intentional.\n" + "one row with a single piece, the other player receives penalty lines\n" + "For clearing 2, 3 or 4 rows, respectively 1, 2 or 4 junk rows will\n" + "be added to the bottom of your opponent's board respectively.\n" + "The junk rows have exactly one empty column, which will line up for\n" + "multiple rows.\n" "\n" "The longest surviving player wins the game.\n" - "\n" - "One player mode\n" - "---------------\n" - "This mode is currently very boring, because there's no scoring\n" - "and it never gets any faster. This will be rectified at some point.\n" - "I'm not very motivated to do it right now because I'm sick of one\n" - "player T*tris. For now, use the \"f\" key (by default) to make the\n" - "game go faster. Speedups cannot be reversed for the remainder of\n" - "the game.\n", - version_string); -} + "\n"); +} //Rules + +///////////// RANDOM ///////////// /* * My really crappy random number generator follows * Should be more than sufficient for our purposes though */ -ExtFunc void SRandom(int seed) +void SRandom(int seed) { - initSeed = seed; + Game.seed = seed; myRandSeed = seed % 31751 + 1; -} +} //SRandom -ExtFunc int Random(int min, int max1) -{ +int Random(int min, int max1) +{ //return a random value myRandSeed = (myRandSeed * 31751 + 15437) % 32767; return myRandSeed % (max1 - min) + min; -} +} //Random -ExtFunc int MyRead(int fd, void *data, int len) +///////////// I/O ///////////// + +int MyRead(int fd, void *data, int len) { int result, left; @@ -172,9 +167,9 @@ ExtFunc int MyRead(int fd, void *data, int len) return result; } return len; -} +} //MyRead -ExtFunc int MyWrite(int fd, void *data, int len) +int MyWrite(int fd, void *data, int len) { int result, left; @@ -189,9 +184,11 @@ ExtFunc int MyWrite(int fd, void *data, int len) return result; } return len; -} +} //MyWrite + +///////////// TIME ///////////// -ExtFunc void NormalizeTime(struct timeval *tv) +void NormalizeTime(struct timeval *tv) { tv->tv_sec += tv->tv_usec / 1000000; tv->tv_usec %= 1000000; @@ -201,12 +198,7 @@ ExtFunc void NormalizeTime(struct timeval *tv) } } -ExtFunc void CatchInt(int sig) -{ - exit(0); -} - -ExtFunc void CatchAlarm(int sig) +void CatchAlarm(int sig) { alarmGen.ready = 1; signal(SIGALRM, CatchAlarm); @@ -217,26 +209,47 @@ static MyEventType AlarmGenFunc(EventGenRec *gen, MyEvent *event) return E_alarm; } -ExtFunc long CurTimeval(void) +void SetTimeval(struct timeval *tv, long usec) +{ + tv->tv_sec = usec / 1000000; + tv->tv_usec = usec % 1000000; +} //SetTimeval + +long GetTimeval(struct timeval *tv) +{ + return tv->tv_sec * 1000000 + tv->tv_usec; +} //GetTimeval + +long AbsTimeval(void) { struct timeval tv; gettimeofday(&tv, NULL); - tv.tv_sec -= baseTimeval.tv_sec; - tv.tv_usec -= baseTimeval.tv_usec; return GetTimeval(&tv); -} +} //CurTimeval -ExtFunc void SetTimeval(struct timeval *tv, long usec) -{ - tv->tv_sec = usec / 1000000; - tv->tv_usec = usec % 1000000; -} +void ResetBaseTime(void) +{ //Reset the timer + baseTimeval = AbsTimeval(); +} //ResetBaseTime -ExtFunc long GetTimeval(struct timeval *tv) +void PauseTime(void) +{ //Pause the timer + baseTimeval -= AbsTimeval(); +} //PauseTime + +void ResumeTime(void) +{ //Unpause timer + baseTimeval += AbsTimeval(); +} //ResumeTime + +long CurTimeval(void) { - return tv->tv_sec * 1000000 + tv->tv_usec; -} + struct timeval tv; + + gettimeofday(&tv, NULL); + return GetTimeval(&tv) - baseTimeval; +} //CurTimeval static long SetITimer1(long interval, long value) { @@ -250,7 +263,7 @@ static long SetITimer1(long interval, long value) return GetTimeval(&old.it_value); } -ExtFunc long SetITimer(long interval, long value) +long SetITimer(long interval, long value) { long old; @@ -260,19 +273,21 @@ ExtFunc long SetITimer(long interval, long value) return old; } -ExtFunc volatile void die(char *msg) +///////////// ... ///////////// + +volatile void die(char *msg) { perror(msg); exit(1); } -ExtFunc volatile void fatal(char *msg) +volatile void fatal(char *msg) { fprintf(stderr, "%s\n", msg); exit(1); -} +} //fatal -ExtFunc void BlockSignals(MySigSet *saved, ...) +void BlockSignals(MySigSet *saved, ...) { MySigSet set; va_list args; @@ -297,9 +312,9 @@ ExtFunc void BlockSignals(MySigSet *saved, ...) *saved = sigblock(set); #endif va_end(args); -} +} //BlockSignals -ExtFunc void RestoreSignals(MySigSet *saved, MySigSet *set) +void RestoreSignals(MySigSet *saved, MySigSet *set) { #ifdef HAS_SIGPROCMASK sigprocmask(SIG_SETMASK, set, saved); @@ -309,35 +324,36 @@ ExtFunc void RestoreSignals(MySigSet *saved, MySigSet *set) else sigsetmask(*set); #endif -} +} //RestoreSignals + +///////////// EVENTS ///////////// -ExtFunc void AddEventGen(EventGenRec *gen) +void AddEventGen(EventGenRec *gen) { assert(gen->next == NULL); gen->next = nextGen->next; nextGen->next = gen; -} +} //AddEventGen -ExtFunc void RemoveEventGen(EventGenRec *gen) +void RemoveEventGen(EventGenRec *gen) { - /* assert(gen->next != NULL); /* Be more forgiving, for SIGINTs */ + // 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; } -} +} //RemoveEventGen -ExtFunc MyEventType WaitMyEvent(MyEvent *event, int mask) -{ +MyEventType WaitMyEvent(MyEvent *event, int mask) +{ //poll int i, retry = 0; fd_set fds[FT_len]; EventGenRec *gen; int result, anyReady, anySet; struct timeval tv; - /* XXX In certain circumstances, this routine does polling */ for (;;) { for (i = 0; i < FT_len; ++i) FD_ZERO(&fds[i]); @@ -381,7 +397,7 @@ ExtFunc MyEventType WaitMyEvent(MyEvent *event, int mask) } while (gen != nextGen); retry = 1; } -} +} //WaitMyEvent /* * vi: ts=4 ai