#define NOEXT
#include "netris.h"
+
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
#include <errno.h>
#include <setjmp.h>
+#include "util.h"
+
#define HEADER_SIZE sizeof(netint4[3])
static struct option options[] = {
{ "wait", 0, 0, 'w' },
{ "port", 1, 0, 'p' },
+ { "quadra", 1, 0, 'q' },
{ "min-players",1, 0, 'm' },
{ "max-players",1, 0, 'x' },
{ "continuous", 1, 0, 'c' },
};
static char minplayers = 2;
+static char maxplayers = 8;
static char playercount;
static char verbose = 0;
struct sockaddr_in addr;
-static char *gameNames[GT_len] = { "OnePlayer", "ClassicTwo" };
-
-ExtFunc MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event);
+MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event);
static EventGenRec netGen[MAX_SCREENS] = {
{ NULL, 0, FT_read, -1, NetGenFunc, EM_net, 0, "\0", 0, HEADER_SIZE } };
static sigjmp_buf close_env;
-ExtFunc volatile void die(char *msg)
-{
- perror(msg);
- exit(1);
-} //die
-
-ExtFunc int MyRead(int fd, void *data, int len)
-{
- int result, left;
-
- left = len;
- while (left > 0) {
- result = read(fd, data, left);
- if (result > 0) {
- data = ((char *)data) + result;
- left -= result;
- }
- else if (errno != EINTR)
- return result;
- }
- return len;
-} //MyRead
-
-ExtFunc int MyWrite(int fd, void *data, int len)
-{
- int result, left;
-
- left = len;
- while (left > 0) {
- result = write(fd, data, left);
- if (result > 0) {
- data = ((char *)data) + result;
- left -= result;
- }
- else if (errno != EINTR)
- return result;
- }
- return len;
-} //MyWrite
-
-ExtFunc void SendPacketTo(short playa, short uid, NetPacketType type, int size, void *data)
+void SendPacketTo(short playa, short uid, NetPacketType type, int size, void *data)
{ //send to someone
netint4 header[3];
if (netGen[playa].fd >= 0) {
+ if (verbose)
+ fprintf(stderr, ": send %d from %d to %d\n", type, uid, playa);
header[0] = hton4(uid);
header[1] = hton4(type);
header[2] = hton4(size + HEADER_SIZE);
return E_alarm;
} //AlarmGenFunc
-ExtFunc void AddEventGen(EventGenRec *gen)
-{
- assert(gen->next == NULL);
- assert(nextGen->next != (void*)0xffffffff);
- gen->next = nextGen->next;
- nextGen->next = gen;
-} //AddEventGen
-
-ExtFunc void RemoveEventGen(EventGenRec *gen)
-{
- // 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 void AtExit(void (*handler)(void))
-{ //setup something to do at exit (^C)
-#ifdef HAS_ON_EXIT
- on_exit((void *)handler, NULL);
-#else
- atexit(handler);
-#endif
-} //AtExit
-
-ExtFunc void SCloseNet(short playa)
+void SCloseNet(short playa)
{ //kick some connection's ass!
MyEvent event;
RemoveEventGen(&netGen[playa]);
} //SCloseNet
-ExtFunc void CloseNets(void)
+void CloseNets(void)
{ //nou oogjes dicht en snaveltjes toe
int i;
fprintf(stderr, "* All Done\n\n");
} //CloseNets
-ExtFunc 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;
-
- for (;;) {
- for (i = 0; i < FT_len; ++i)
- FD_ZERO(&fds[i]);
- anyReady = anySet = 0;
- gen = nextGen;
- do {
- if (gen->mask & mask) {
- if (gen->ready)
- anyReady = 1;
- if (gen->fd >= 0) {
- FD_SET(gen->fd, &fds[gen->fdType]);
- anySet = 1;
- }
- }
- gen = gen->next;
- } while (gen != nextGen);
- if (anySet) {
- tv.tv_sec = 0;
- tv.tv_usec = (retry && !anyReady) ? 500000 : 0;
- result = select(FD_SETSIZE, &fds[FT_read], &fds[FT_write],
- &fds[FT_except], anyReady ? &tv : NULL);
- }
- else {
- if (retry && !anyReady)
- sleep(1);
- result = 0;
- }
- gen = nextGen;
- do {
- if ((gen->mask & mask)
- && (gen->ready || (result > 0 && gen->fd >= 0
- && FD_ISSET(gen->fd, &fds[gen->fdType])))) {
- gen->ready = 0;
- event->type = gen->func(gen, event);
- if (event->type != E_none) {
- nextGen = gen->next;
- return event->type;
- }
- }
- gen = gen->next;
- } while (gen != nextGen);
- retry = 1;
- }
-} //WaitMyEvent
-
-ExtFunc MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
+MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
{ //receive
int result;
short uid, type, size;
addrLen = sizeof(addr);
for (new = 1; new <= MAX_SCREENS; new++)
if (netGen[new].fd < 0) break;
- if (new > Game.maxplayers) return;
+ if (new > maxplayers) return;
if ((netGen[new].fd =
accept(gen->fd, (struct sockaddr *)&addr, &addrLen)) < 0)
return E_connect;
} //ConnGenFunc
-ExtFunc void CountPlayers(void)
+void CountPlayers(void)
{ //count number of players/teams
int i, j;
playercount = 0;
} //player alive
} //CountPlayers
-ExtFunc int StartServer(void)
+int StartServer(void)
{
MyEvent event;
netint2 currentpiece[MAX_SCREENS];
netint4 versiondata[2];
char data[255];
int major;
+ int protocolVersion;
memcpy(versiondata, event.u.net.data,
sizeof(versiondata));
event.u.net.data, event.u.net.size);
if (Players[event.u.net.sender].team < 1
|| Players[event.u.net.sender].team > 7) {
- Players[event.u.net.sender].team =
- event.u.net.sender % 7 + 1;
- SendPacketTo(event.u.net.sender,
- event.u.net.sender, NP_team,
+ int team;
+
+ for (team = 1; team < 7; team++) {
+ for (i = 1; i < MAX_SCREENS; i++)
+ if ((Players[i].alive > 0) && (Players[i].team == team))
+ break; //team in use
+ if (i==MAX_SCREENS) break;
+ } //find unused team
+ Players[event.u.net.sender].team = team;
+ SendPacketTo(event.u.net.sender, event.u.net.sender, NP_team,
sizeof(Players[event.u.net.sender].team),
&Players[event.u.net.sender].team);
} //invalid team
{
static struct {
int playerflags;
- int maxplayers; //1
+ int gravity; //1
int started; //2
int continuous; //3
long seed; //4
memcpy(&data, &Players[event.u.net.sender].flags,
sizeof(data.playerflags));
- memcpy(&data.maxplayers, &Game,
+ memcpy(&data.gravity, &Game,
sizeof(data) - sizeof(data.playerflags));
SendPacketTo(event.u.net.sender, 0, NP_gamedata,
sizeof(data), &data);
for (i = 1; i < MAX_SCREENS; i++)
if (netGen[i].fd >= 0 && i != event.u.net.sender) {
SendPacketTo(event.u.net.sender, i,
- NP_newPlayer, sizeof(Player)
- - sizeof(Players[0].spy)
- - sizeof(Players[0].small),
- &Players[i]);
- SendPacketTo(event.u.net.sender, i,
- NP_newPiece, sizeof(currentpiece[i]),
- ¤tpiece[i]);
- SendPacketTo(i, event.u.net.sender,
- NP_newPlayer, sizeof(Player)
- - sizeof(Players[0].spy)
- - sizeof(Players[0].small),
- &Players[event.u.net.sender]);
+ NP_newPlayer, sizeof(_Player), &Players[i]);
+ SendPacketTo(event.u.net.sender, i, NP_newPiece,
+ sizeof(Players[i].curShape), &Players[i].curShape);
+ SendPacketTo(i, event.u.net.sender, NP_newPlayer,
+ sizeof(_Player), &Players[event.u.net.sender]);
} //send (to) players
fprintf(stderr, "> Joined player #%d: %s <%s> (%s)\n",
event.u.net.sender,
} //give go ahead
break; //NP_playerdata
case NP_newPiece:
- memcpy(¤tpiece[event.u.net.sender],
- event.u.net.data, sizeof(currentpiece[0]));
+ memcpy(&Players[event.u.net.sender].curShape,
+ event.u.net.data, sizeof(Players[0].curShape));
goto sendtoall;
case NP_argghhh:
Players[event.u.net.sender].alive = 0;
} //StartServer
-ExtFunc void Header(void)
+void SHeader(void)
{
fprintf(stderr,
"NETRIS Server %s\t(c) 2002 Shiar <shiar@shiar.org>\n\n",
version_string);
-} //Header
+}
-ExtFunc void Usage(void)
+void SUsage(void)
{
- Header();
+ SHeader();
fprintf(stderr,
"Usage: netris <options>\n"
"\n"
"\n", DEFAULT_PORT);
}
-ExtFunc void DistInfo(void)
+/*
+void DistInfo(void)
{
- Header();
+ SHeader();
fprintf(stderr,
"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"
"Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n"
"\n");
} //DistInfo
+*/
-ExtFunc void WriteConf(void)
+void WriteConf(void)
{
FILE *file_out;
fprintf(stderr, "Wrote new game configuration to %s\n", CONFIG_FILE);
} //WriteConf
-ExtFunc void HandleOption(char tag, char *value)
+void HandleOption(char tag, char *value)
{
switch (tag) {
case 'v': //verbose
minplayers = atoi(value);
break;
case 'x': //max-players
- Game.maxplayers = atoi(value);
- if (Game.maxplayers >= MAX_SCREENS)
- Game.maxplayers = MAX_SCREENS;
+ maxplayers = atoi(value);
+ if (maxplayers >= MAX_SCREENS)
+ maxplayers = MAX_SCREENS;
+ break;
+ case 'q': //quadra-style gravity
+ Game.gravity ^= 1;
break;
case 'i': //speed (of level 1)
Game.initspeed = atof(value) * 1e6;
case 'H': //info
DistInfo(); exit(0);
case 'h': //help
- Usage(); exit(0);
+ SUsage(); exit(0);
default:
break;
}
} //HandleParam
-ExtFunc void ReadConf(char *filename)
+void ReadConf(char *filename)
{
FILE *file_in;
char buf[513];
} //ReadConf
-ExtFunc void CatchInt(int sig)
+void CatchInt(int sig)
{
siglongjmp(close_env, 1);
}
-ExtFunc int main(int argc, char **argv)
+int main(int argc, char **argv)
{
char ch;
if (sigsetjmp(close_env, 1)) exit(0);
signal(SIGINT, CatchInt);
port = DEFAULT_PORT;
- Game.maxplayers = 8;
+ maxplayers = 8;
Game.initspeed = DEFAULT_INTERVAL;
Game.seed = time(0);
+ Game.gravity = 0;
{
int i;
// else
ReadConf(CONFIG_FILE);
while ((ch = getopt_long(argc, argv,
- "hHvp:i:s:c:m:x:", options, NULL)) != -1)
+ "hHvqp:i:s:c:m:x:", options, NULL)) != -1)
HandleOption(ch, optarg);
if (optind < argc) {
- Usage();
+ SUsage();
exit(1);
}
// WriteConf();
- Header();
+ SHeader();
{
int i;
git.shiar.nl / netris.git / blobdiff