Use model+skin instead, for faster performance

diff --git a/models/player/carni.sounds b/models/player/carni.sounds
deleted file mode 100644 (file)
index 2ff25cb..0000000
--- a/models/player/carni.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: carni-lycan\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/carni-lycan/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/carni-lycan/coms/attackinfive 0\r
-coverme sound/player/carni-lycan/coms/coverme 0\r
-defend sound/player/carni-lycan/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/carni-lycan/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-incoming sound/player/carni-lycan/coms/incoming 0\r
-meet sound/player/carni-lycan/coms/meet 0\r
-needhelp sound/player/carni-lycan/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/carni-lycan/coms/seenflag 0\r
-taunt sound/player/carni-lycan/coms/taunt 3\r
-teamshoot sound/player/carni-lycan/coms/teamshoot 3\r
-death sound/player/carni-lycan/player/death 3\r
-drown sound/player/carni-lycan/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/carni-lycan/player/falling 0\r
-gasp sound/player/carni-lycan/player/gasp 0\r
-jump sound/player/carni-lycan/player/jump 0\r
-pain25 sound/player/carni-lycan/player/pain25 0\r
-pain50 sound/player/carni-lycan/player/pain50 0\r
-pain75 sound/player/carni-lycan/player/pain75 0\r
-pain100 sound/player/carni-lycan/player/pain100 0\r

diff --git a/models/player/carniarmor.sounds b/models/player/carniarmor.sounds
deleted file mode 100644 (file)
index 2ff25cb..0000000
--- a/models/player/carniarmor.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: carni-lycan\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/carni-lycan/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/carni-lycan/coms/attackinfive 0\r
-coverme sound/player/carni-lycan/coms/coverme 0\r
-defend sound/player/carni-lycan/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/carni-lycan/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-incoming sound/player/carni-lycan/coms/incoming 0\r
-meet sound/player/carni-lycan/coms/meet 0\r
-needhelp sound/player/carni-lycan/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/carni-lycan/coms/seenflag 0\r
-taunt sound/player/carni-lycan/coms/taunt 3\r
-teamshoot sound/player/carni-lycan/coms/teamshoot 3\r
-death sound/player/carni-lycan/player/death 3\r
-drown sound/player/carni-lycan/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/carni-lycan/player/falling 0\r
-gasp sound/player/carni-lycan/player/gasp 0\r
-jump sound/player/carni-lycan/player/jump 0\r
-pain25 sound/player/carni-lycan/player/pain25 0\r
-pain50 sound/player/carni-lycan/player/pain50 0\r
-pain75 sound/player/carni-lycan/player/pain75 0\r
-pain100 sound/player/carni-lycan/player/pain100 0\r

diff --git a/models/player/fricka.sounds b/models/player/fricka.sounds
deleted file mode 100644 (file)
index 278a3a0..0000000
--- a/models/player/fricka.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: fricka\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/fricka/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/fricka/coms/attackinfive 0\r
-//coverme sound/player/fricka/coms/coverme 0\r
-defend sound/player/fricka/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/fricka/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-incoming sound/player/fricka/coms/incoming 0\r
-meet sound/player/fricka/coms/waypoint 0\r
-//needhelp sound/player/fricka/coms/needhelp 0\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/fricka/coms/flagseen 0\r
-taunt sound/player/fricka/coms/taunt 4\r
-teamshoot sound/player/fricka/coms/teamshoot 3\r
-death sound/player/fricka/player/death 3\r
-drown sound/player/fricka/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/fricka/player/falling 0\r
-gasp sound/player/fricka/player/gasp 0\r
-jump sound/player/fricka/player/jump 0\r
-pain25 sound/player/fricka/player/pain25 0\r
-pain50 sound/player/fricka/player/pain50 0\r
-pain75 sound/player/fricka/player/pain75 0\r
-pain100 sound/player/fricka/player/pain100 0\r

diff --git a/models/player/grunt.sounds b/models/player/grunt.sounds
deleted file mode 100644 (file)
index 2ff25cb..0000000
--- a/models/player/grunt.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: carni-lycan\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/carni-lycan/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/carni-lycan/coms/attackinfive 0\r
-coverme sound/player/carni-lycan/coms/coverme 0\r
-defend sound/player/carni-lycan/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/carni-lycan/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-incoming sound/player/carni-lycan/coms/incoming 0\r
-meet sound/player/carni-lycan/coms/meet 0\r
-needhelp sound/player/carni-lycan/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/carni-lycan/coms/seenflag 0\r
-taunt sound/player/carni-lycan/coms/taunt 3\r
-teamshoot sound/player/carni-lycan/coms/teamshoot 3\r
-death sound/player/carni-lycan/player/death 3\r
-drown sound/player/carni-lycan/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/carni-lycan/player/falling 0\r
-gasp sound/player/carni-lycan/player/gasp 0\r
-jump sound/player/carni-lycan/player/jump 0\r
-pain25 sound/player/carni-lycan/player/pain25 0\r
-pain50 sound/player/carni-lycan/player/pain50 0\r
-pain75 sound/player/carni-lycan/player/pain75 0\r
-pain100 sound/player/carni-lycan/player/pain100 0\r

diff --git a/models/player/headhunter.sounds b/models/player/headhunter.sounds
deleted file mode 100644 (file)
index 2ff25cb..0000000
--- a/models/player/headhunter.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: carni-lycan\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/carni-lycan/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/carni-lycan/coms/attackinfive 0\r
-coverme sound/player/carni-lycan/coms/coverme 0\r
-defend sound/player/carni-lycan/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/carni-lycan/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-incoming sound/player/carni-lycan/coms/incoming 0\r
-meet sound/player/carni-lycan/coms/meet 0\r
-needhelp sound/player/carni-lycan/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/carni-lycan/coms/seenflag 0\r
-taunt sound/player/carni-lycan/coms/taunt 3\r
-teamshoot sound/player/carni-lycan/coms/teamshoot 3\r
-death sound/player/carni-lycan/player/death 3\r
-drown sound/player/carni-lycan/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/carni-lycan/player/falling 0\r
-gasp sound/player/carni-lycan/player/gasp 0\r
-jump sound/player/carni-lycan/player/jump 0\r
-pain25 sound/player/carni-lycan/player/pain25 0\r
-pain50 sound/player/carni-lycan/player/pain50 0\r
-pain75 sound/player/carni-lycan/player/pain75 0\r
-pain100 sound/player/carni-lycan/player/pain100 0\r

diff --git a/models/player/heroine.sounds b/models/player/heroine.sounds
deleted file mode 100644 (file)
index d313aa5..0000000
--- a/models/player/heroine.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: pyria-skadi\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/pyria-skadi/coms/attack 2\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/pyria-skadi/coms/attackinfive 0\r
-//coverme sound/player/pyria-skadi/coms/coverme 0\r
-//defend sound/player/pyria-skadi/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/pyria-skadi/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-//incoming sound/player/pyria-skadi/coms/incoming 0\r
-meet sound/player/pyria-skadi/coms/meet 0\r
-needhelp sound/player/pyria-skadi/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/pyria-skadi/coms/seenflag 0\r
-taunt sound/player/pyria-skadi/coms/taunt 5\r
-teamshoot sound/player/pyria-skadi/coms/teamshoot 4\r
-death sound/player/pyria-skadi/player/death 3\r
-drown sound/player/pyria-skadi/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/pyria-skadi/player/falling 0\r
-gasp sound/player/pyria-skadi/player/gasp 0\r
-jump sound/player/pyria-skadi/player/jump 0\r
-pain25 sound/player/pyria-skadi/player/pain25 0\r
-pain50 sound/player/pyria-skadi/player/pain50 0\r
-pain75 sound/player/pyria-skadi/player/pain75 0\r
-pain100 sound/player/pyria-skadi/player/pain100 0\r

diff --git a/models/player/insurrectionist.sounds b/models/player/insurrectionist.sounds
deleted file mode 100644 (file)
index 3b58cf1..0000000
--- a/models/player/insurrectionist.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: insurrectionist\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/insurrectionist/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/insurrectionist/coms/attackinfive 0\r
-coverme sound/player/insurrectionist/coms/coverme 0\r
-defend sound/player/insurrectionist/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/insurrectionist/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-incoming sound/player/insurrectionist/coms/incoming 0\r
-meet sound/player/insurrectionist/coms/meet 0\r
-needhelp sound/player/insurrectionist/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/insurrectionist/coms/seenflag 0\r
-taunt sound/player/insurrectionist/coms/taunt 4\r
-teamshoot sound/player/insurrectionist/coms/teamshoot 3\r
-death sound/player/insurrectionist/player/death 3\r
-drown sound/player/insurrectionist/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/insurrectionist/player/falling 0\r
-gasp sound/player/insurrectionist/player/gasp 0\r
-jump sound/player/insurrectionist/player/jump 0\r
-pain25 sound/player/insurrectionist/player/pain25 0\r
-pain50 sound/player/insurrectionist/player/pain50 0\r
-pain75 sound/player/insurrectionist/player/pain75 0\r
-pain100 sound/player/insurrectionist/player/pain100 0\r

diff --git a/models/player/lurk.sounds b/models/player/lurk.sounds
deleted file mode 100644 (file)
index 8346c17..0000000
--- a/models/player/lurk.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: reptilian\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/reptilian/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/reptilian/coms/attackinfive 0\r
-coverme sound/player/reptilian/coms/coverme 0\r
-defend sound/player/reptilian/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/reptilian/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-incoming sound/player/reptilian/coms/incoming 0\r
-meet sound/player/reptilian/coms/meet 0\r
-needhelp sound/player/reptilian/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/reptilian/coms/seenflag 0\r
-taunt sound/player/reptilian/coms/taunt 3\r
-teamshoot sound/player/reptilian/coms/teamshoot 3\r
-death sound/player/reptilian/player/death 3\r
-drown sound/player/reptilian/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/reptilian/player/falling 0\r
-gasp sound/player/reptilian/player/gasp 0\r
-jump sound/player/reptilian/player/jump 0\r
-pain25 sound/player/reptilian/player/pain25 0\r
-pain50 sound/player/reptilian/player/pain50 0\r
-pain75 sound/player/reptilian/player/pain75 0\r
-pain100 sound/player/reptilian/player/pain100 0\r

diff --git a/models/player/lycanthrope.sounds b/models/player/lycanthrope.sounds
deleted file mode 100644 (file)
index 2ff25cb..0000000
--- a/models/player/lycanthrope.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: carni-lycan\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/carni-lycan/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/carni-lycan/coms/attackinfive 0\r
-coverme sound/player/carni-lycan/coms/coverme 0\r
-defend sound/player/carni-lycan/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/carni-lycan/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-incoming sound/player/carni-lycan/coms/incoming 0\r
-meet sound/player/carni-lycan/coms/meet 0\r
-needhelp sound/player/carni-lycan/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/carni-lycan/coms/seenflag 0\r
-taunt sound/player/carni-lycan/coms/taunt 3\r
-teamshoot sound/player/carni-lycan/coms/teamshoot 3\r
-death sound/player/carni-lycan/player/death 3\r
-drown sound/player/carni-lycan/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/carni-lycan/player/falling 0\r
-gasp sound/player/carni-lycan/player/gasp 0\r
-jump sound/player/carni-lycan/player/jump 0\r
-pain25 sound/player/carni-lycan/player/pain25 0\r
-pain50 sound/player/carni-lycan/player/pain50 0\r
-pain75 sound/player/carni-lycan/player/pain75 0\r
-pain100 sound/player/carni-lycan/player/pain100 0\r

diff --git a/models/player/marine.sounds b/models/player/marine.sounds
deleted file mode 100644 (file)
index 323b13c..0000000
--- a/models/player/marine.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: marine\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/marine/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/marine/coms/attackinfive 0\r
-coverme sound/player/marine/coms/coverme 0\r
-defend sound/player/marine/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/marine/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-incoming sound/player/marine/coms/incoming 0\r
-meet sound/player/marine/coms/meet 0\r
-needhelp sound/player/marine/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/marine/coms/seenflag 0\r
-taunt sound/player/marine/coms/taunt 3\r
-teamshoot sound/player/marine/coms/teamshoot 4\r
-death sound/player/marine/player/death 3\r
-drown sound/player/marine/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/marine/player/fall 1\r
-gasp sound/player/marine/player/gasp 0\r
-jump sound/player/marine/player/jump 0\r
-pain25 sound/player/marine/player/pain25 0\r
-pain50 sound/player/marine/player/pain50 0\r
-pain75 sound/player/marine/player/pain75 0\r
-pain100 sound/player/marine/player/pain100 0\r

diff --git a/models/player/mulder.sounds b/models/player/mulder.sounds
deleted file mode 100644 (file)
index 51608c5..0000000
--- a/models/player/mulder.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: soldier\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/soldier/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/soldier/coms/attackinfive 0\r
-coverme sound/player/soldier/coms/coverme 0\r
-defend sound/player/soldier/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/soldier/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-//incoming sound/player/soldier/coms/incoming 0\r
-meet sound/player/soldier/coms/meet 0\r
-needhelp sound/player/soldier/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/soldier/coms/seenflag 0\r
-taunt sound/player/soldier/coms/taunt 3\r
-teamshoot sound/player/soldier/coms/teamshoot 3\r
-death sound/player/soldier/player/death 3\r
-drown sound/player/soldier/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/soldier/player/falling 0\r
-gasp sound/player/soldier/player/gasp 0\r
-jump sound/player/soldier/player/jump 0\r
-pain25 sound/player/soldier/player/pain25 0\r
-pain50 sound/player/soldier/player/pain50 0\r
-pain75 sound/player/soldier/player/pain75 0\r
-pain100 sound/player/soldier/player/pain100 0\r

diff --git a/models/player/nexus.sounds b/models/player/nexus.sounds
deleted file mode 100644 (file)
index 51608c5..0000000
--- a/models/player/nexus.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: soldier\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/soldier/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/soldier/coms/attackinfive 0\r
-coverme sound/player/soldier/coms/coverme 0\r
-defend sound/player/soldier/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/soldier/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-//incoming sound/player/soldier/coms/incoming 0\r
-meet sound/player/soldier/coms/meet 0\r
-needhelp sound/player/soldier/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/soldier/coms/seenflag 0\r
-taunt sound/player/soldier/coms/taunt 3\r
-teamshoot sound/player/soldier/coms/teamshoot 3\r
-death sound/player/soldier/player/death 3\r
-drown sound/player/soldier/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/soldier/player/falling 0\r
-gasp sound/player/soldier/player/gasp 0\r
-jump sound/player/soldier/player/jump 0\r
-pain25 sound/player/soldier/player/pain25 0\r
-pain50 sound/player/soldier/player/pain50 0\r
-pain75 sound/player/soldier/player/pain75 0\r
-pain100 sound/player/soldier/player/pain100 0\r

diff --git a/models/player/pyria.sounds b/models/player/pyria.sounds
deleted file mode 100644 (file)
index d313aa5..0000000
--- a/models/player/pyria.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: pyria-skadi\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/pyria-skadi/coms/attack 2\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/pyria-skadi/coms/attackinfive 0\r
-//coverme sound/player/pyria-skadi/coms/coverme 0\r
-//defend sound/player/pyria-skadi/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/pyria-skadi/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-//incoming sound/player/pyria-skadi/coms/incoming 0\r
-meet sound/player/pyria-skadi/coms/meet 0\r
-needhelp sound/player/pyria-skadi/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/pyria-skadi/coms/seenflag 0\r
-taunt sound/player/pyria-skadi/coms/taunt 5\r
-teamshoot sound/player/pyria-skadi/coms/teamshoot 4\r
-death sound/player/pyria-skadi/player/death 3\r
-drown sound/player/pyria-skadi/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/pyria-skadi/player/falling 0\r
-gasp sound/player/pyria-skadi/player/gasp 0\r
-jump sound/player/pyria-skadi/player/jump 0\r
-pain25 sound/player/pyria-skadi/player/pain25 0\r
-pain50 sound/player/pyria-skadi/player/pain50 0\r
-pain75 sound/player/pyria-skadi/player/pain75 0\r
-pain100 sound/player/pyria-skadi/player/pain100 0\r

diff --git a/models/player/quark.sounds b/models/player/quark.sounds
deleted file mode 100644 (file)
index 51608c5..0000000
--- a/models/player/quark.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: soldier\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/soldier/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/soldier/coms/attackinfive 0\r
-coverme sound/player/soldier/coms/coverme 0\r
-defend sound/player/soldier/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/soldier/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-//incoming sound/player/soldier/coms/incoming 0\r
-meet sound/player/soldier/coms/meet 0\r
-needhelp sound/player/soldier/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/soldier/coms/seenflag 0\r
-taunt sound/player/soldier/coms/taunt 3\r
-teamshoot sound/player/soldier/coms/teamshoot 3\r
-death sound/player/soldier/player/death 3\r
-drown sound/player/soldier/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/soldier/player/falling 0\r
-gasp sound/player/soldier/player/gasp 0\r
-jump sound/player/soldier/player/jump 0\r
-pain25 sound/player/soldier/player/pain25 0\r
-pain50 sound/player/soldier/player/pain50 0\r
-pain75 sound/player/soldier/player/pain75 0\r
-pain100 sound/player/soldier/player/pain100 0\r

diff --git a/models/player/reptile.sounds b/models/player/reptile.sounds
deleted file mode 100644 (file)
index 8346c17..0000000
--- a/models/player/reptile.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: reptilian\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/reptilian/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/reptilian/coms/attackinfive 0\r
-coverme sound/player/reptilian/coms/coverme 0\r
-defend sound/player/reptilian/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/reptilian/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-incoming sound/player/reptilian/coms/incoming 0\r
-meet sound/player/reptilian/coms/meet 0\r
-needhelp sound/player/reptilian/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/reptilian/coms/seenflag 0\r
-taunt sound/player/reptilian/coms/taunt 3\r
-teamshoot sound/player/reptilian/coms/teamshoot 3\r
-death sound/player/reptilian/player/death 3\r
-drown sound/player/reptilian/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/reptilian/player/falling 0\r
-gasp sound/player/reptilian/player/gasp 0\r
-jump sound/player/reptilian/player/jump 0\r
-pain25 sound/player/reptilian/player/pain25 0\r
-pain50 sound/player/reptilian/player/pain50 0\r
-pain75 sound/player/reptilian/player/pain75 0\r
-pain100 sound/player/reptilian/player/pain100 0\r

diff --git a/models/player/shock.sounds b/models/player/shock.sounds
deleted file mode 100644 (file)
index 323b13c..0000000
--- a/models/player/shock.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: marine\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/marine/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/marine/coms/attackinfive 0\r
-coverme sound/player/marine/coms/coverme 0\r
-defend sound/player/marine/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/marine/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-incoming sound/player/marine/coms/incoming 0\r
-meet sound/player/marine/coms/meet 0\r
-needhelp sound/player/marine/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/marine/coms/seenflag 0\r
-taunt sound/player/marine/coms/taunt 3\r
-teamshoot sound/player/marine/coms/teamshoot 4\r
-death sound/player/marine/player/death 3\r
-drown sound/player/marine/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/marine/player/fall 1\r
-gasp sound/player/marine/player/gasp 0\r
-jump sound/player/marine/player/jump 0\r
-pain25 sound/player/marine/player/pain25 0\r
-pain50 sound/player/marine/player/pain50 0\r
-pain75 sound/player/marine/player/pain75 0\r
-pain100 sound/player/marine/player/pain100 0\r

diff --git a/models/player/skadi.sounds b/models/player/skadi.sounds
deleted file mode 100644 (file)
index d313aa5..0000000
--- a/models/player/skadi.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: pyria-skadi\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/pyria-skadi/coms/attack 2\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/pyria-skadi/coms/attackinfive 0\r
-//coverme sound/player/pyria-skadi/coms/coverme 0\r
-//defend sound/player/pyria-skadi/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/pyria-skadi/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-//incoming sound/player/pyria-skadi/coms/incoming 0\r
-meet sound/player/pyria-skadi/coms/meet 0\r
-needhelp sound/player/pyria-skadi/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/pyria-skadi/coms/seenflag 0\r
-taunt sound/player/pyria-skadi/coms/taunt 5\r
-teamshoot sound/player/pyria-skadi/coms/teamshoot 4\r
-death sound/player/pyria-skadi/player/death 3\r
-drown sound/player/pyria-skadi/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/pyria-skadi/player/falling 0\r
-gasp sound/player/pyria-skadi/player/gasp 0\r
-jump sound/player/pyria-skadi/player/jump 0\r
-pain25 sound/player/pyria-skadi/player/pain25 0\r
-pain50 sound/player/pyria-skadi/player/pain50 0\r
-pain75 sound/player/pyria-skadi/player/pain75 0\r
-pain100 sound/player/pyria-skadi/player/pain100 0\r

diff --git a/models/player/specop.sounds b/models/player/specop.sounds
deleted file mode 100644 (file)
index cdd8542..0000000
--- a/models/player/specop.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: specop\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/specop/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/specop/coms/attackinfive 0\r
-coverme sound/player/specop/coms/coverme 0\r
-defend sound/player/specop/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/specop/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-incoming sound/player/specop/coms/incoming 0\r
-meet sound/player/specop/coms/meet 0\r
-needhelp sound/player/specop/coms/needhelp 1\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/specop/coms/seenflag 0\r
-taunt sound/player/specop/coms/taunt 4\r
-teamshoot sound/player/specop/coms/teamshoot 4\r
-death sound/player/specop/player/death 3\r
-drown sound/player/specop/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/specop/player/falling 0\r
-gasp sound/player/specop/player/gasp 0\r
-jump sound/player/specop/player/jump 0\r
-pain25 sound/player/specop/player/pain25 0\r
-pain50 sound/player/specop/player/pain50 0\r
-pain75 sound/player/specop/player/pain75 0\r
-pain100 sound/player/specop/player/pain100 0\r

diff --git a/models/player/xolar.sounds b/models/player/xolar.sounds
deleted file mode 100644 (file)
index 51608c5..0000000
--- a/models/player/xolar.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: soldier\r
-//affirmative sound/player/carni-lycan/player/affirmative 0\r
-attack sound/player/soldier/coms/attack 0\r
-//attacking sound/player/carni-lycan/player/attacking 0\r
-attackinfive sound/player/soldier/coms/attackinfive 0\r
-coverme sound/player/soldier/coms/coverme 0\r
-defend sound/player/soldier/coms/defend 0\r
-//defending sound/player/carni-lycan/player/defending 0\r
-//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
-freelance sound/player/soldier/coms/freelance 2\r
-//getflag sound/player/carni-lycan/player/getflag 0\r
-//incoming sound/player/soldier/coms/incoming 0\r
-meet sound/player/soldier/coms/meet 0\r
-needhelp sound/player/soldier/coms/needhelp 2\r
-//negative sound/player/carni-lycan/player/negative 0\r
-//onmyway sound/player/carni-lycan/player/onmyway 0\r
-//roaming sound/player/carni-lycan/player/roaming 0\r
-//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
-seenflag sound/player/soldier/coms/seenflag 0\r
-taunt sound/player/soldier/coms/taunt 3\r
-teamshoot sound/player/soldier/coms/teamshoot 3\r
-death sound/player/soldier/player/death 3\r
-drown sound/player/soldier/player/drown 0\r
-//fall sound/player/carni-lycan/player/fall 0\r
-falling sound/player/soldier/player/falling 0\r
-gasp sound/player/soldier/player/gasp 0\r
-jump sound/player/soldier/player/jump 0\r
-pain25 sound/player/soldier/player/pain25 0\r
-pain50 sound/player/soldier/player/pain50 0\r
-pain75 sound/player/soldier/player/pain75 0\r
-pain100 sound/player/soldier/player/pain100 0\r

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index c5d85b793bf86606333242c17265922df91a0626..72c3a67b78f5ea07f2d0f68092cf150ba76cc265 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -167,7 +167,7 @@ float player_getspecies()
 {
        local float glob, i, j, fh, len, s, sk;
        local string fn, l;
-       local float tokens;
+       local float tokens, snd;
 
        s = -1;
 
@@ -184,11 +184,14 @@ float player_getspecies()
                                continue;
                        fgets(fh); fgets(fh);
                        sk = stof(fgets(fh));
+
+                       snd = tokenizebyseparator(self.model, "."); // don't use the .zym at the end
+                       UpdatePlayerSounds(strcat(argv(0), ftos(sk)));
+
                        if(sk == (j ? 0 : self.skinindex)) // 2nd pass skips the skin test
                        if(fgets(fh) == self.model)
                        {
                                tokens = tokenizebyseparator(fn, ".");
-                               UpdatePlayerSounds(argv(0));
 
                                l = fgets(fh);
                                len = tokenize_console(l);