r3092 - in trunk: data/qcsrc/server data/sound/player data/sound/player/voice misc
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Jan 3 07:54:27 EST 2008
Author: div0
Date: 2008-01-03 07:54:26 -0500 (Thu, 03 Jan 2008)
New Revision: 3092
Added:
trunk/data/sound/player/default.sounds
Removed:
trunk/data/sound/player/voice/default.voice
Modified:
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/cl_player.qc
trunk/data/qcsrc/server/miscfunctions.qc
trunk/misc/makebuild.sh
Log:
prepare some of the changes from player-voice to player-sounds. To be used for pain etc. sounds in the future.
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2008-01-03 08:20:40 UTC (rev 3091)
+++ trunk/data/qcsrc/server/cl_client.qc 2008-01-03 12:54:26 UTC (rev 3092)
@@ -246,7 +246,7 @@
return TRUE;
}
-void UpdateVoiceMessages();
+void UpdatePlayerSounds();
void setmodel_lod(entity e, string modelname)
{
#ifdef ALLOW_VARIABLE_LOD
@@ -287,7 +287,7 @@
setmodel(e, modelname); // players have high precision
#endif
player_setupanimsformodel();
- UpdateVoiceMessages();
+ UpdatePlayerSounds();
}
/*
Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc 2008-01-03 08:20:40 UTC (rev 3091)
+++ trunk/data/qcsrc/server/cl_player.qc 2008-01-03 12:54:26 UTC (rev 3092)
@@ -665,18 +665,18 @@
self.last_selected_player = self.selected_player;
}
-.string voice_attack;
-.string voice_attackinfive;
-.string voice_coverme;
-.string voice_defend;
-.string voice_freelance;
-.string voice_incoming;
-.string voice_meet;
-.string voice_needhelp;
-.string voice_seenflag;
-.string voice_taunt;
-.string voice_teamshoot;
-.float modelindex_for_voice;
+.string playersound_attack;
+.string playersound_attackinfive;
+.string playersound_coverme;
+.string playersound_defend;
+.string playersound_freelance;
+.string playersound_incoming;
+.string playersound_meet;
+.string playersound_needhelp;
+.string playersound_seenflag;
+.string playersound_taunt;
+.string playersound_teamshoot;
+.float modelindex_for_playersound;
float GetVoiceMessageTeamsayType(string type)
{
@@ -688,30 +688,40 @@
}
string allvoicesamples = "attack attackinfive coverme defend freelance incoming meet needhelp seenflag taunt teamshoot";
-float GetVoiceMessageSampleField_notFound;
+float GetPlayerSoundSampleField_notFound;
.string GetVoiceMessageSampleField(string type)
{
- GetVoiceMessageSampleField_notFound = 0;
+ GetPlayerSoundSampleField_notFound = 0;
switch(type)
{
- case "attack": return voice_attack;
- case "attackinfive": return voice_attackinfive;
- case "coverme": return voice_coverme;
- case "defend": return voice_defend;
- case "freelance": return voice_freelance;
- case "incoming": return voice_incoming;
- case "meet": return voice_meet;
- case "needhelp": return voice_needhelp;
- case "seenflag": return voice_seenflag;
- case "taunt": return voice_taunt;
- case "teamshoot": return voice_teamshoot;
+ case "attack": return playersound_attack;
+ case "attackinfive": return playersound_attackinfive;
+ case "coverme": return playersound_coverme;
+ case "defend": return playersound_defend;
+ case "freelance": return playersound_freelance;
+ case "incoming": return playersound_incoming;
+ case "meet": return playersound_meet;
+ case "needhelp": return playersound_needhelp;
+ case "seenflag": return playersound_seenflag;
+ case "taunt": return playersound_taunt;
+ case "teamshoot": return playersound_teamshoot;
}
- GetVoiceMessageSampleField_notFound = 1;
- return voice_taunt;
+ GetPlayerSoundSampleField_notFound = 1;
+ return playersound_taunt;
}
-void PrecacheVoiceMessages(string f)
+.string GetPlayerSoundSampleField(string type)
{
+ GetPlayerSoundSampleField_notFound = 0;
+ switch(type)
+ {
+ case "attack": return playersound_attack;
+ default: return GetVoiceMessageSampleField(type);
+ }
+}
+
+void PrecachePlayerSounds(string f)
+{
float fh;
float i, n;
string s;
@@ -732,7 +742,7 @@
fclose(fh);
}
-void LoadVoiceMessages(string f)
+void LoadPlayerSounds(string f)
{
float fh;
string s;
@@ -744,8 +754,8 @@
{
if(tokenize(s) != 3)
continue;
- field = GetVoiceMessageSampleField(argv(0));
- if(GetVoiceMessageSampleField_notFound)
+ field = GetPlayerSoundSampleField(argv(0));
+ if(GetPlayerSoundSampleField_notFound)
continue;
if(self.field)
strunzone(self.field);
@@ -754,13 +764,13 @@
fclose(fh);
}
-void UpdateVoiceMessages()
+void UpdatePlayerSounds()
{
- if(self.modelindex == self.modelindex_for_voice)
+ if(self.modelindex == self.modelindex_for_playersound)
return;
- self.modelindex_for_voice = self.modelindex;
- LoadVoiceMessages("sound/player/voice/default.voice");
- LoadVoiceMessages(strcat(self.model, ".voice"));
+ self.modelindex_for_playersound = self.modelindex;
+ LoadPlayerSounds("sound/player/default.sounds");
+ LoadPlayerSounds(strcat(self.model, ".sounds"));
}
float precache_sound_index (string s) = #19;
@@ -788,9 +798,9 @@
// TODO precache voice messages?
var string sample;
var float teamsay;
- sample = self.(GetVoiceMessageSampleField(type));
+ sample = self.(GetPlayerSoundSampleField(type));
- if(GetVoiceMessageSampleField_notFound)
+ if(GetPlayerSoundSampleField_notFound)
{
sprint(self, strcat("Invalid voice. Use one of: ", allvoicesamples, "\n"));
return;
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2008-01-03 08:20:40 UTC (rev 3091)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2008-01-03 12:54:26 UTC (rev 3092)
@@ -875,7 +875,7 @@
}
}
-void PrecacheVoiceMessages(string f);
+void PrecachePlayerSounds(string f);
void precache_all_models(string pattern)
{
float globhandle, i, n;
@@ -890,7 +890,7 @@
//print(search_getfilename(globhandle, i), "\n");
f = search_getfilename(globhandle, i);
precache_model(f);
- PrecacheVoiceMessages(strcat(f, ".voice"));
+ PrecachePlayerSounds(strcat(f, ".sounds"));
}
search_end(globhandle);
}
@@ -909,7 +909,7 @@
// Precache all player models if desired
if (cvar("sv_precacheplayermodels"))
{
- PrecacheVoiceMessages("sound/player/voice/default.voice");
+ PrecachePlayerSounds("sound/player/default.sounds");
precache_all_models("models/player/*.zym");
precache_all_models("models/player/*.dpm");
precache_all_models("models/player/*.md3");
Copied: trunk/data/sound/player/default.sounds (from rev 3091, trunk/data/sound/player/voice/default.voice)
===================================================================
--- trunk/data/sound/player/default.sounds (rev 0)
+++ trunk/data/sound/player/default.sounds 2008-01-03 12:54:26 UTC (rev 3092)
@@ -0,0 +1,11 @@
+attack sound/player/voice/attack 1
+attackinfive sound/player/voice/attackinfive 1
+coverme sound/player/voice/coverme 1
+defend sound/player/voice/defend 1
+freelance sound/player/voice/freelance 1
+incoming sound/player/voice/incoming 1
+meet sound/player/voice/meet 1
+needhelp sound/player/voice/needhelp 1
+seenflag sound/player/voice/seenflag 2
+taunt sound/player/voice/taunt 9
+teamshoot sound/player/voice/teamshoot 5
Deleted: trunk/data/sound/player/voice/default.voice
===================================================================
--- trunk/data/sound/player/voice/default.voice 2008-01-03 08:20:40 UTC (rev 3091)
+++ trunk/data/sound/player/voice/default.voice 2008-01-03 12:54:26 UTC (rev 3092)
@@ -1,11 +0,0 @@
-attack sound/player/voice/attack 1
-attackinfive sound/player/voice/attackinfive 1
-coverme sound/player/voice/coverme 1
-defend sound/player/voice/defend 1
-freelance sound/player/voice/freelance 1
-incoming sound/player/voice/incoming 1
-meet sound/player/voice/meet 1
-needhelp sound/player/voice/needhelp 1
-seenflag sound/player/voice/seenflag 2
-taunt sound/player/voice/taunt 9
-teamshoot sound/player/voice/teamshoot 5
Modified: trunk/misc/makebuild.sh
===================================================================
--- trunk/misc/makebuild.sh 2008-01-03 08:20:40 UTC (rev 3091)
+++ trunk/misc/makebuild.sh 2008-01-03 12:54:26 UTC (rev 3092)
@@ -49,6 +49,7 @@
mingw=/home/polzer/mingw32
menuqc=menu
newest=NEWEST
+tag=
if [ -n "$EXPERIMENTAL" ]; then
basepk3=$base/data20071231.pk3 # newer build to make smaller patches
@@ -57,6 +58,7 @@
ext="${ext}_svntrunk"
menuqc="menu-div0test"
newest=NEWEST-svntrunk
+ tag=trunk
fi
# TODO normalize the builds
@@ -202,9 +204,7 @@
cd "$tmpdir/data/qcsrc/server"
"$fteqccdir/fteqcc.bin" $fteqccflags
-if [ -z "$EXPERIMENTAL" ]; then
- rm -rf "$tmpdir/data/qcsrc"
-fi
+rm -rf "$tmpdir/data/qcsrc"
cd "$tmpdir/Docs"
perl -pi -e '/^#---SET nexversion=([0-9.]*)$/ and $_ = "#---SET nexversion='$version'\n"' FAQ.aft
@@ -237,11 +237,11 @@
cd "$tmpdir"
rm -rf data
mkdir data
-mv data.pk3 data/data$date.pk3
+mv data.pk3 data/data$tag$date.pk3
mv common-spog.pk3 data/
rm -rf pro
mkdir pro
-mv pro.pk3 pro/data${date}pro.pk3
+mv pro.pk3 pro/data$tag${date}pro.pk3
cp -r "$mingwdlls"/* .
# fix up permissions
@@ -253,7 +253,7 @@
find . -name .svn -exec rm -rf {} \; -prune
rm -f "$zipdir/nexuiz$date$ext.zip"
-zip $zipflags -9yr "$zipdir/nexuiz$date$ext.zip" Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/data/data$date.pk3 Nexuiz/data/common-spog.pk3 Nexuiz/pro/*
+zip $zipflags -9yr "$zipdir/nexuiz$date$ext.zip" Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/data/data$tag$date.pk3 Nexuiz/data/common-spog.pk3 Nexuiz/pro/*
ln -snf nexuiz$date$ext.zip "$zipdir/nexuiz-$newest.zip"
rm -f "$zipdir/nexuizengineonly$date$ext.zip"
@@ -264,15 +264,15 @@
zip $zipflags -9yr "$zipdir/nexuizsource$date$ext.zip" Nexuiz/gpl.txt Nexuiz/sources
ln -snf nexuizsource$date$ext.zip "$zipdir/nexuizsource-$newest.zip"
-$zipdiff -o "Nexuiz/data/datapatch$date.pk3" -f "$basepk3" -t Nexuiz/data/data$date.pk3 -x 'sound/cdtracks/track*.ogg'
+$zipdiff -o "Nexuiz/data/datapatch$tag$date.pk3" -f "$basepk3" -t Nexuiz/data/data$tag$date.pk3 -x 'sound/cdtracks/track*.ogg'
mkdir -p gfx
-if unzip "Nexuiz/data/data$date.pk3" gfx/brand.tga; then
- zip $zipflags -9r "Nexuiz/data/datapatch$date.pk3" gfx/brand.tga
+if unzip "Nexuiz/data/data$tag$date.pk3" gfx/brand.tga; then
+ zip $zipflags -9r "Nexuiz/data/datapatch$tag$date.pk3" gfx/brand.tga
rm -rf gfx
fi
rm -f "$zipdir/nexuizpatch$date$ext.zip"
-zip $zipflags -9yr "$zipdir/nexuizpatch$date$ext.zip" Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/data/datapatch$date.pk3 Nexuiz/pro/*
+zip $zipflags -9yr "$zipdir/nexuizpatch$date$ext.zip" Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/data/datapatch$tag$date.pk3 Nexuiz/pro/*
ln -snf nexuizpatch$date$ext.zip "$zipdir/nexuizpatch-$newest.zip"
rm -f "$zipdir/nexuizdocs$date$ext.zip"
More information about the nexuiz-commits
mailing list