*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@791 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2007-01-10 02:05:00 +00:00
parent 5772574321
commit 41bd6bb5db
4 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -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)
{
+2 -1
View File
@@ -430,4 +430,5 @@ void flaginbase(int flag, int action, playerent *actor)
f.flag->spawned = true;
f.ack = true;
flagmsg(flag, action);
};
};
+1 -1
View File
@@ -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<maxclients && !(reason = refuseconnect(c.clientnum))) send_welcome(c.clientnum);
+1 -1
View File
@@ -346,7 +346,7 @@ void moveprojectiles(float time)
};
};
void throw_nade(playerent *d, vec &vel, bounceent *p)
void throw_nade(playerent *d, const vec &vel, bounceent *p)
{
if(!p || !d) return;
playsound(S_GRENADETHROW);