git.shiar.nl
/
netris.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add bug report from alternate branch
[netris.git]
/
inet.c
diff --git
a/inet.c
b/inet.c
index 8da9956b16917e3f236a9409432c8df139553e32..236a73edb627479cfca606d5d7800608639d9eeb 100644
(file)
--- a/
inet.c
+++ b/
inet.c
@@
-46,7
+46,7
@@
static sigjmp_buf close_env;
void CatchInt(int sig)
{
siglongjmp(close_env, 1);
void CatchInt(int sig)
{
siglongjmp(close_env, 1);
-}
//CatchInt
+}
int InitiateConnection(char *hostStr, short port)
{ //connect to host
int InitiateConnection(char *hostStr, short port)
{ //connect to host
@@
-77,7
+77,7
@@
int InitiateConnection(char *hostStr, short port)
}
AddEventGen(&netGen);
return 0;
}
AddEventGen(&netGen);
return 0;
-}
//InitiateConnection
+}
void HandShake(void)
{ //talk to your host
void HandShake(void)
{ //talk to your host
@@
-114,11
+114,11
@@
void HandShake(void)
{
static struct {
int playerflags;
{
static struct {
int playerflags;
- int maxplayers; //1
- int started; //2
- int continuous; //3
- long seed;
//4
- int initspeed; //5
+ int maxplayers;
//1
+ int started;
//2
+ int continuous;
//3
+ long seed; //4
+ int initspeed;
//5
} data;
memcpy(&data, event.u.net.data, event.u.net.size);
} data;
memcpy(&data, event.u.net.data, event.u.net.size);
@@
-140,7
+140,7
@@
void HandShake(void)
fatal("Hm, the party apparantly ended prematurely.");
}
while (event.u.net.type != NP_gamedata);
fatal("Hm, the party apparantly ended prematurely.");
}
while (event.u.net.type != NP_gamedata);
-}
//HandShake
+}
MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
@@
-175,7
+175,7
@@
MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
event->u.net.data = gen->buf + HEADER_SIZE3;
if (type == NP_endConn) return E_lostConn;
return E_net;
event->u.net.data = gen->buf + HEADER_SIZE3;
if (type == NP_endConn) return E_lostConn;
return E_net;
-}
//NetGenFunc
+}
void SendPacket(short uid, NetPacketType type, int size, void *data)
{ //send shit to server
void SendPacket(short uid, NetPacketType type, int size, void *data)
{ //send shit to server
@@
-188,7
+188,7
@@
void SendPacket(short uid, NetPacketType type, int size, void *data)
die("write (header)");
if (size > 0 && data && MyWrite(netGen.fd, data, size) != size)
die("write");
die("write (header)");
if (size > 0 && data && MyWrite(netGen.fd, data, size) != size)
die("write");
-}
//SendPacket
+}
void CloseNet(void)
{ //kick some connection's ass!
void CloseNet(void)
{ //kick some connection's ass!
@@
-201,7
+201,7
@@
void CloseNet(void)
}
if (netGen.next)
RemoveEventGen(&netGen);
}
if (netGen.next)
RemoveEventGen(&netGen);
-}
//CloseNet
+}
/*
* vi: ts=4 ai
/*
* vi: ts=4 ai