git.shiar.nl
/
netris.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
code cosmetics
[netris.git]
/
server.c
diff --git
a/server.c
b/server.c
index 11c42e31a2e733d1c8e890934db1b83625bcf62e..4c6582b4bdb47766e130e415b5706a9e9c3e0e31 100644
(file)
--- a/
server.c
+++ b/
server.c
@@
-61,15
+61,18
@@
struct sockaddr_in addr;
MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event);
static EventGenRec netGen[MAX_SCREENS] = {
MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event);
static EventGenRec netGen[MAX_SCREENS] = {
- { NULL, 0, FT_read, -1, NetGenFunc, EM_net, 0, "\0", 0, HEADER_SIZE } };
+ { NULL, 0, FT_read, -1, NetGenFunc, EM_net, 0, "\0", 0, HEADER_SIZE }
+};
static MyEventType AlarmGenFunc(EventGenRec *gen, MyEvent *event);
static MyEventType AlarmGenFunc(EventGenRec *gen, MyEvent *event);
-static EventGenRec alarmGen =
- { &alarmGen, 0, FT_read, -1, AlarmGenFunc, EM_alarm };
+static EventGenRec alarmGen = {
+ &alarmGen, 0, FT_read, -1, AlarmGenFunc, EM_alarm
+};
static MyEventType ConnGenFunc(EventGenRec *gen, MyEvent *event);
static MyEventType ConnGenFunc(EventGenRec *gen, MyEvent *event);
-static EventGenRec connGen =
- { NULL, 0, FT_read, -1, ConnGenFunc, EM_connect };
+static EventGenRec connGen = {
+ NULL, 0, FT_read, -1, ConnGenFunc, EM_connect
+};
static EventGenRec *nextGen = &alarmGen;
static EventGenRec *nextGen = &alarmGen;
@@
-91,12
+94,12
@@
void SendPacketTo(short playa, short uid, NetPacketType type, int size, void *da
if (size > 0 && data && MyWrite(netGen[playa].fd, data, size) != size)
die("write");
}
if (size > 0 && data && MyWrite(netGen[playa].fd, data, size) != size)
die("write");
}
-}
//SendPacketTo
+}
static MyEventType AlarmGenFunc(EventGenRec *gen, MyEvent *event)
{
return E_alarm;
static MyEventType AlarmGenFunc(EventGenRec *gen, MyEvent *event)
{
return E_alarm;
-}
//AlarmGenFunc
+}
void SCloseNet(short playa)
{ //kick some connection's ass!
void SCloseNet(short playa)
{ //kick some connection's ass!
@@
-112,7
+115,7
@@
void SCloseNet(short playa)
}
if (netGen[playa].next)
RemoveEventGen(&netGen[playa]);
}
if (netGen[playa].next)
RemoveEventGen(&netGen[playa]);
-}
//SCloseNet
+}
void CloseNets(void)
{ //nou oogjes dicht en snaveltjes toe
void CloseNets(void)
{ //nou oogjes dicht en snaveltjes toe
@@
-122,7
+125,7
@@
void CloseNets(void)
for (i = 1; i < MAX_SCREENS; i++)
SCloseNet(i); //bye everybuddy
fprintf(stderr, "* All Done\n\n");
for (i = 1; i < MAX_SCREENS; i++)
SCloseNet(i); //bye everybuddy
fprintf(stderr, "* All Done\n\n");
-}
//CloseNets
+}
MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
{ //receive
MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
{ //receive
@@
-158,7
+161,7
@@
MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
return E_lostConn;
} //client sent quit signal
return E_net;
return E_lostConn;
} //client sent quit signal
return E_net;
-}
//NetGenFunc
+}
static MyEventType ConnGenFunc(EventGenRec *gen, MyEvent *event)
static MyEventType ConnGenFunc(EventGenRec *gen, MyEvent *event)
@@
-197,7
+200,7
@@
static MyEventType ConnGenFunc(EventGenRec *gen, MyEvent *event)
}
} //E_connect
return E_connect;
}
} //E_connect
return E_connect;
-}
//ConnGenFunc
+}
void CountPlayers(void)
{ //count number of players/teams
void CountPlayers(void)
{ //count number of players/teams
@@
-211,7
+214,7
@@
void CountPlayers(void)
} //player of same team counted before
playercount++;
} //player alive
} //player of same team counted before
playercount++;
} //player alive
-}
//CountPlayers
+}
int StartServer(void)
{
int StartServer(void)
{
@@
-220,8
+223,10
@@
int StartServer(void)
int playersReady = 0;
int paused = 1;
int i;
int playersReady = 0;
int paused = 1;
int i;
- char teams[10][7] = { "", "Green", "Cyan", "Blue", "Purple",
- "Red", "Grey", "White", "*Orange" };
+ char teams[10][7] = {
+ "", "Green", "Cyan", "Blue", "Purple",
+ "Red", "Grey", "White", "*Orange"
+ };
do {
switch (WaitMyEvent(&event, EM_any)) {
do {
switch (WaitMyEvent(&event, EM_any)) {
@@
-418,7
+423,7
@@
int StartServer(void)
} //game (ready to) start(ed)
} while (1);
fprintf(stderr, "* Exiting server\n");
} //game (ready to) start(ed)
} while (1);
fprintf(stderr, "* Exiting server\n");
-}
//StartServer
+}
void SHeader(void)
void SHeader(void)
@@
-461,7
+466,7
@@
void WriteConf(void)
fclose(file_out);
fprintf(stderr, "Wrote new game configuration to %s\n", CONFIG_FILE);
fclose(file_out);
fprintf(stderr, "Wrote new game configuration to %s\n", CONFIG_FILE);
-}
//WriteConf
+}
void HandleOption(char tag, char *value)
{
void HandleOption(char tag, char *value)
{
@@
-500,7
+505,7
@@
void HandleOption(char tag, char *value)
default:
break;
}
default:
break;
}
-}
//HandleParam
+}
void ReadConf(char *filename)
{
void ReadConf(char *filename)
{
@@
-535,7
+540,7
@@
void ReadConf(char *filename)
fprintf(stderr, "Unable to open config file %s.\n", filename);
} //defaults
fprintf(stderr, "Unable to open config file %s.\n", filename);
} //defaults
-}
//ReadConf
+}
void CatchInt(int sig)
{
void CatchInt(int sig)
{
@@
-610,7
+615,3
@@
int main(int argc, char **argv)
return 0;
}
return 0;
}
-/*
- * vi: ts=4 ai
- * vim: noai si
- */