From 222db40606f1e55a3f44709470ea5cc8b45b9c2b Mon Sep 17 00:00:00 2001 From: driAn Date: Sun, 7 Jan 2007 16:03:23 +0000 Subject: [PATCH] no message git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@788 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 13 +++++-------- source/src/protos.h | 2 +- source/vcpp/cube.suo | Bin 174592 -> 174592 bytes 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index a550b6c3..f710977d 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -35,11 +35,12 @@ char *getclientmap() { return clientmap; }; extern bool c2sinit; extern int dblend; -void setskin(playerent *pl, int skin) +void setskin(playerent *pl, uint skin) { if(!pl) return; - int maxskin = team_int(pl->team) == TEAM_CLA ? 3 : 5; - pl->skin = max(0, skin % (maxskin+1)); + if(pl == player1) c2sinit=false; + const int maxskin[2] = { 3, 5 }; + pl->skin = skin % (maxskin[team_int(pl->team)]+1); }; void playerdeath(playerent *pl) @@ -60,11 +61,7 @@ void spawnstate(playerent *d) // reset player state not persistent if(d==player1) { gun_changed = true; - if(player1->skin!=player1->nextskin) - { - c2sinit=false; - setskin(player1, player1->nextskin); - } + if(player1->skin!=player1->nextskin) setskin(player1, player1->nextskin); setscope(false); }; equip(d); diff --git a/source/src/protos.h b/source/src/protos.h index 3ac9244b..ec17abb6 100644 --- a/source/src/protos.h +++ b/source/src/protos.h @@ -112,7 +112,7 @@ extern playerent *newclient(int cn); extern void timeupdate(int timeremain); extern void fixcamerarange(physent *cam = camera1); extern void respawnself(); -extern void setskin(playerent *pl, int skin); +extern void setskin(playerent *pl, uint skin); //game mode extras extern void flagpickup(); extern void tryflagdrop(); diff --git a/source/vcpp/cube.suo b/source/vcpp/cube.suo index 09df49392540f786e6768da5255e4b34a9317cd4..17b2a8f496bdd542d555f839c15c55c65b92bcf5 100644 GIT binary patch delta 7860 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 delta 9626 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