git.shiar.nl
/
netris.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reformat piece table code so shapes are better discernable
[netris.git]
/
server.c
diff --git
a/server.c
b/server.c
index 3eebe8ae9a54eaa06f83a6eb86f80ad46c6ac122..d33cf2444a8ad7181a900e978dc6f7aa98e1e13f 100644
(file)
--- a/
server.c
+++ b/
server.c
@@
-59,7
+59,7
@@
static char verbose = 0;
struct sockaddr_in addr;
struct sockaddr_in addr;
-MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event);
+
static
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 EventGenRec netGen[MAX_SCREENS] = {
{ NULL, 0, FT_read, -1, NetGenFunc, EM_net, 0, "\0", 0, HEADER_SIZE }
};
@@
-79,7
+79,7
@@
static EventGenRec *nextGen = &alarmGen;
static sigjmp_buf close_env;
static sigjmp_buf close_env;
-void SendPacketTo(short playa, short uid, NetPacketType type, int size, void *data)
+
static
void SendPacketTo(short playa, short uid, NetPacketType type, int size, void *data)
{ //send to someone
netint4 header[3];
{ //send to someone
netint4 header[3];
@@
-101,7
+101,7
@@
static MyEventType AlarmGenFunc(EventGenRec *gen, MyEvent *event)
return E_alarm;
}
return E_alarm;
}
-void SCloseNet(short playa)
+
static
void SCloseNet(short playa)
{ //kick some connection's ass!
MyEvent event;
{ //kick some connection's ass!
MyEvent event;
@@
-117,7
+117,7
@@
void SCloseNet(short playa)
RemoveEventGen(&netGen[playa]);
}
RemoveEventGen(&netGen[playa]);
}
-void CloseNets(void)
+
static
void CloseNets(void)
{ //nou oogjes dicht en snaveltjes toe
int i;
{ //nou oogjes dicht en snaveltjes toe
int i;
@@
-127,7
+127,7
@@
void CloseNets(void)
fprintf(stderr, MSG_SERVER_CLOSE_ALL_DONE "\n\n");
}
fprintf(stderr, MSG_SERVER_CLOSE_ALL_DONE "\n\n");
}
-MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
+
static
MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
{ //receive
int result;
short uid, type, size;
{ //receive
int result;
short uid, type, size;
@@
-204,7
+204,7
@@
static MyEventType ConnGenFunc(EventGenRec *gen, MyEvent *event)
return E_connect;
}
return E_connect;
}
-void CountPlayers(void)
+
static
void CountPlayers(void)
{ //count number of players/teams
int i, j;
playercount = 0;
{ //count number of players/teams
int i, j;
playercount = 0;
@@
-219,17
+219,13
@@
void CountPlayers(void)
} //player alive
}
} //player alive
}
-int StartServer(void)
+
static
int StartServer(void)
{
MyEvent event;
netint2 currentpiece[MAX_SCREENS];
int playersReady = 0;
bool paused = 1;
int i;
{
MyEvent event;
netint2 currentpiece[MAX_SCREENS];
int playersReady = 0;
bool paused = 1;
int i;
- char teams[10][7] = {
- "", "Green", "Cyan", "Blue", "Purple",
- "Red", "Grey", "White", "*Orange"
- };
do {
switch (WaitMyEvent(&event, EM_any)) {
do {
switch (WaitMyEvent(&event, EM_any)) {
@@
-333,7
+329,7
@@
int StartServer(void)
event.u.net.sender,
Players[event.u.net.sender].name,
Players[event.u.net.sender].host,
event.u.net.sender,
Players[event.u.net.sender].name,
Players[event.u.net.sender].host,
- team
s
[Players[event.u.net.sender].team]);
+ team
name
[Players[event.u.net.sender].team]);
if (++playersReady >= minplayers) {
if (Game.started > 1)
SendPacketTo(event.u.net.sender, 0,
if (++playersReady >= minplayers) {
if (Game.started > 1)
SendPacketTo(event.u.net.sender, 0,
@@
-428,12
+424,12
@@
int StartServer(void)
}
}
-void SHeader(void)
+
static
void SHeader(void)
{
fprintf(stderr, MSG_SERVER_TITLE "\n\n", version_string);
}
{
fprintf(stderr, MSG_SERVER_TITLE "\n\n", version_string);
}
-void SUsage(void)
+
static
void SUsage(void)
{
SHeader();
fprintf(stderr,
{
SHeader();
fprintf(stderr,
@@
-454,7
+450,7
@@
void SUsage(void)
);
}
);
}
-void HandleOption(char tag, char *value)
+
static
void HandleOption(char tag, char *value)
{
switch (tag) {
case 'v': //verbose
{
switch (tag) {
case 'v': //verbose
@@
-493,7
+489,7
@@
void HandleOption(char tag, char *value)
}
}
}
}
-void ReadConf(char *filename)
+
static
void ReadConf(char *filename)
{
FILE *file_in;
char buf[513];
{
FILE *file_in;
char buf[513];
@@
-528,7
+524,7
@@
void ReadConf(char *filename)
}
}
-void CatchInt(int sig)
+
static
void CatchInt(int sig)
{
siglongjmp(close_env, 1);
}
{
siglongjmp(close_env, 1);
}