kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

setskin bug fix (it seems the skin system is unnecessarily complicated and may need to be reworked anyway)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7523 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lucas GAUTHERON
2013-08-02 12:13:39 +00:00
parent b998a44151
commit f8e42cfff9
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/menus_multiplayer.cfg
+1 -1
View File
@@ -38,7 +38,7 @@ menuinitselection 13
const __ingamemenu_showmodel [
if (&& (< (player1 team) 4) $arg2) [
chmenumdl $arg1 (concatword "playermodels/" (at [CLA RVSF CLA RVSF] (player1 team)) "/0" (+ 1 (skin))) idle 15 3
chmenumdl $arg1 (concatword "playermodels/" (at [CLA RVSF CLA RVSF] (player1 team)) "/0" (+ 1 (player1 skin))) idle 15 3
] [
chmenumdl $arg1
]
config/menus_settings.cfg
+2 -2
View File
@@ -75,7 +75,7 @@ loop gwm (listlen $DEFAULT_PRIMARIES) [
newmenu CLA
menuinit [ menuselection CLA (skin_cla) ]
menuinit [ menuselection CLA (player1 skin_cla) ]
menumdl playermodels/CLA/01 all 50 4
menuitem [Comandante] [ skin_cla 0 ] [ chmenumdl CLA playermodels/CLA/01 all 50 4 ]
menuitem [Psycho] [ skin_cla 1 ] [ chmenumdl CLA playermodels/CLA/02 all 50 4 ]
@@ -84,7 +84,7 @@ menuitem [Ripper] [ skin_cla 3 ] [ chmenumdl CLA playermodels/CLA/04 all 50
newmenu RVSF
menuinit [menuselection RVSF (skin_rvsf)]
menuinit [menuselection RVSF (player1 skin_rvsf)]
menumdl playermodels/RVSF/01 all 50 4
menuitem [Alpha] [ skin_rvsf 0 ] [ chmenumdl RVSF playermodels/RVSF/01 all 50 4 ]
menuitem [Tango] [ skin_rvsf 1 ] [ chmenumdl RVSF playermodels/RVSF/02 all 50 4 ]
source/src/clientgame.cpp
+3
View File
@@ -302,6 +302,9 @@ void playerinfo(int *cn, const char *attr)
ATTR_INT(alive, p->state == CS_ALIVE ? 1 : 0);
ATTR_INT(spect, p->team == TEAM_SPECT || p->spectatemode == SM_FLY ? 1 : 0);
ATTR_INT(cn, p->clientnum); // only useful to get player1's client number.
ATTR_INT(skin_cla, p->skin(TEAM_CLA));
ATTR_INT(skin_rvsf, p->skin(TEAM_RVSF));
ATTR_INT(skin, p->skin(player1->team));
string addrstr = "";
uint2ip(p->address, addr);