code cosmetics (mostly var/function renaming)

[netris.git] / server.c

diff --git a/server.c b/server.c
index d33cf2444a8ad7181a900e978dc6f7aa98e1e13f..ff09dc43f9895969d72822e12e0087abd6c6f5ca 100644 (file)
--- a/server.c
+++ b/server.c
@@ -79,19 +79,19 @@ static EventGenRec *nextGen = &alarmGen;
 static sigjmp_buf close_env;
 
 
-static void SendPacketTo(short playa, short uid, NetPacketType type, int size, void *data)
+static void SendPacketTo(short player, short uid, NetPacketType type, int size, void *data)
 { //send to someone
        netint4 header[3];
 
-       if (netGen[playa].fd >= 0) {
+       if (netGen[player].fd >= 0) {
                if (verbose)
-                       fprintf(stderr, MSG_SERVER_DBG_SEND "\n", type, uid, playa);
+                       fprintf(stderr, MSG_SERVER_DBG_SEND "\n", type, uid, player);
                header[0] = hton4(uid);
                header[1] = hton4(type);
                header[2] = hton4(size + HEADER_SIZE);
-               if (MyWrite(netGen[playa].fd, header, HEADER_SIZE) != HEADER_SIZE)
+               if (MyWrite(netGen[player].fd, header, HEADER_SIZE) != HEADER_SIZE)
                        die("write (header)");
-               if (size > 0 && data && MyWrite(netGen[playa].fd, data, size) != size)
+               if (size > 0 && data && MyWrite(netGen[player].fd, data, size) != size)
                        die("write");
        }
 }
@@ -101,20 +101,20 @@ static MyEventType AlarmGenFunc(EventGenRec *gen, MyEvent *event)
        return E_alarm;
 }
 
-static void SCloseNet(short playa)
+static void SCloseNet(short player)
 { //kick some connection's ass!
        MyEvent event;
 
-       if (netGen[playa].fd >= 0) {
-               if (Players[playa].alive >= 0) {
-                       SendPacketTo(playa, 0, NP_endConn, 0, NULL);
+       if (netGen[player].fd >= 0) {
+               if (Players[player].alive >= 0) {
+                       SendPacketTo(player, 0, NP_endConn, 0, NULL);
                        do {} while (WaitMyEvent(&event, EM_net) != E_lostConn);
                } //say bye to player
-               close(netGen[playa].fd);
-               netGen[playa].fd = -1;
+               close(netGen[player].fd);
+               netGen[player].fd = -1;
        }
-       if (netGen[playa].next)
-               RemoveEventGen(&netGen[playa]);
+       if (netGen[player].next)
+               RemoveEventGen(&netGen[player]);
 }
 
 static void CloseNets(void)
@@ -319,11 +319,11 @@ static int StartServer(void)
                                        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), &Players[i]);
+                                                               sizeof(player_t), &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]);
+                                                               sizeof(player_t), &Players[event.u.net.sender]);
                                                } //send (to) players
                                        fprintf(stderr, MSG_SERVER_PLAYER_JOIN "\n",
                                                event.u.net.sender,