git.shiar.nl
/
netris.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup overlay message centering
[netris.git]
/
inet.c
diff --git
a/inet.c
b/inet.c
index 6dcb0aac4a59030f5d64ff34ae9d1cffdcb577db..e6740443f3b64355270d054d488d508a7c52c773 100644
(file)
--- a/
inet.c
+++ b/
inet.c
@@
-15,8
+15,6
@@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id: inet.c,v 1.18 1996/02/09 08:22:13 mhw Exp $
*/
#include "netris.h"
*/
#include "netris.h"
@@
-36,15
+34,15
@@
#define HEADER_SIZE sizeof(netint2[2])
#define HEADER_SIZE3 sizeof(netint4[3])
#define HEADER_SIZE sizeof(netint2[2])
#define HEADER_SIZE3 sizeof(netint4[3])
-MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event);
-EventGenRec netGen = {
+
static
MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event);
+
static
EventGenRec netGen = {
NULL, 0, FT_read, -1, NetGenFunc, EM_net, 0, "\0", 0, HEADER_SIZE3
};
static sigjmp_buf close_env;
NULL, 0, FT_read, -1, NetGenFunc, EM_net, 0, "\0", 0, HEADER_SIZE3
};
static sigjmp_buf close_env;
-void CatchInt(int sig)
+
static
void CatchInt(int sig)
{
siglongjmp(close_env, 1);
}
{
siglongjmp(close_env, 1);
}
@@
-97,11
+95,11
@@
void HandShake(void)
case NP_hello:
{
me = event.u.net.uid;
case NP_hello:
{
me = event.u.net.uid;
- memcpy(&Players[me], &Players[0], sizeof(
_Player
));
+ memcpy(&Players[me], &Players[0], sizeof(
player_t
));
fprintf(stderr, "Accepted (%s) as #%d (%s)\n",
event.u.net.data, me, Players[me].name);
SendPacket(0, NP_newPlayer,
fprintf(stderr, "Accepted (%s) as #%d (%s)\n",
event.u.net.data, me, Players[me].name);
SendPacket(0, NP_newPlayer,
- sizeof(
_Player
) - sizeof(Players[me].host),
+ sizeof(
player_t
) - sizeof(Players[me].host),
&Players[me]);
break;
}
&Players[me]);
break;
}
@@
-115,7
+113,7
@@
void HandShake(void)
{
static struct {
int playerflags;
{
static struct {
int playerflags;
- int
maxplayers;
//1
+ int
gravity;
//1
int started; //2
int continuous; //3
long seed; //4
int started; //2
int continuous; //3
long seed; //4
@@
-125,7
+123,7
@@
void HandShake(void)
memcpy(&data, event.u.net.data, event.u.net.size);
memcpy(&Players[me].flags, &data, sizeof(data.playerflags));
memcpy(&Players[me].flags, &data, sizeof(data.playerflags));
memcpy(&data, event.u.net.data, event.u.net.size);
memcpy(&Players[me].flags, &data, sizeof(data.playerflags));
memcpy(&Players[me].flags, &data, sizeof(data.playerflags));
- memcpy(&Game
, &data.maxplayers
,
+ memcpy(&Game
.gravity, &data.gravity
,
sizeof(data) - sizeof(data.playerflags));
break;
} //NP_gamedata
sizeof(data) - sizeof(data.playerflags));
break;
} //NP_gamedata
@@
-139,12
+137,11
@@
void HandShake(void)
}
else
fatal("Hm, the party apparantly ended prematurely.");
}
else
fatal("Hm, the party apparantly ended prematurely.");
- }
- while (event.u.net.type != NP_gamedata);
+ } while (event.u.net.type != NP_gamedata);
}
}
-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;