diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 3d6c2c62..e08301a5 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -43,7 +43,7 @@ void setskin(playerent *pl, uint skin) pl->skin = skin % (maxskin[team_int(pl->team)]+1); }; -extern void throw_nade(playerent *d, vec &vel, bounceent *p); +extern void throw_nade(playerent *d, const vec &vel, bounceent *p); void deathstate(playerent *pl) { diff --git a/source/src/entities.cpp b/source/src/entities.cpp index 59950202..b09db45f 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -430,4 +430,5 @@ void flaginbase(int flag, int action, playerent *actor) f.flag->spawned = true; f.ack = true; flagmsg(flag, action); -}; \ No newline at end of file +}; + diff --git a/source/src/server.cpp b/source/src/server.cpp index 1d3e98a8..cc542fa9 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -1023,7 +1023,7 @@ void serverslice(int seconds, unsigned int timeout) // main server update, cal c.peer = event.peer; c.peer->data = (void *)(size_t)c.clientnum; char hn[1024]; - s_strcpy(c.hostname, (enet_address_get_host(&c.peer->address, hn, sizeof(hn))==0) ? hn : "unknown"); + s_strcpy(c.hostname, (enet_address_get_host_ip(&c.peer->address, hn, sizeof(hn))==0) ? hn : "unknown"); printf("client connected (%s)\n", c.hostname); int reason = DISC_MAXCLIENTS; if(nonlocalclients