From 0b24ff0ea9f7c707367f115838f5c6e77332289d Mon Sep 17 00:00:00 2001 From: driAn Date: Fri, 28 Apr 2006 12:45:24 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@289 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/client.cpp | 6 ++++-- source/src/clients2c.cpp | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/source/src/client.cpp b/source/src/client.cpp index 90f625b7..e5011809 100644 --- a/source/src/client.cpp +++ b/source/src/client.cpp @@ -53,7 +53,7 @@ void ctf_team(char *name) }; void newname(char *name) { c2sinit = false; strn0cpy(player1->name, name, 16); }; -void newskin(int skin) { player1->nextskin = max(0, min(skin, (rb_team_int(player1->team)==TEAM_CLA ? 3 : 5))); c2sinit=false; }; +void newskin(int skin) { c2sinit=false; player1->nextskin = max(0, min(skin, (rb_team_int(player1->team)==TEAM_CLA ? 3 : 5))); }; void newteam(char *name) { if(m_teammode) ctf_team(name); @@ -332,6 +332,8 @@ void lsinfo() printf("lifesequences:\nyou\t%i\n", player1->lifesequence); loopv(players) { - printf("%s\t%i\n", players[i]->name, players[i]->lifesequence); + dynent *d = players[i]; + if(!d) continue; + printf("%s\t%i\n", d->name, d->lifesequence); } }; COMMAND(lsinfo, ARG_NONE); diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp index 06b8e8e8..225311b8 100644 --- a/source/src/clients2c.cpp +++ b/source/src/clients2c.cpp @@ -166,7 +166,8 @@ void localservertoclient(uchar *buf, int len) // processes any updates from th sgetstr(); strcpy_s(d->team, text); d->skin = getint(p); - d->lifesequence = getint(p); + d->lifesequence = getint(p); + printf("SV_INIT2C\tskin:%i\tlifes:%i\n", d->skin, d->lifesequence); break; }; @@ -242,7 +243,7 @@ void localservertoclient(uchar *buf, int len) // processes any updates from th }; }; playsound(S_DIE1+rnd(2), &d->o); - d->lifesequence++; + d->lifesequence++; printf("SV_DIED\n"); break; };