xonotic-data.pk3dir:terencehill/sv_defaultcharacter_fix: a S merge request: Access sv_defaultplayer* cvars appending the untranslated team color str...
git-manager created issue #1934 (closed) on 2014-03-18T10:54:56Z:
Access sv_defaultplayer* cvars appending the untranslated team color string to them
Repository: xonotic/xonotic-data.pk3dir.git Commit: 25c4cfd8 Branch: terencehill/sv_defaultcharacter_fix
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '25c4cfd8e4817387ce29f55bdd8fc390977950bc'..'origin/terencehill/sv_defaultcharacter_fix'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --edit --log --no-ff 'origin/terencehill/sv_defaultcharacter_fix'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'terencehill/sv_defaultcharacter_fix'
Diffstat:
qcsrc/server/cl_client.qc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Revision log:
commit 25c4cfd8e4817387ce29f55bdd8fc390977950bc
Author: terencehill
Commit: terencehill
Access sv_defaultplayer* cvars appending the untranslated team color string to them
User agreed to the license.
Diff:
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 691c493..6ed39e6 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -283,7 +283,7 @@ void FixPlayermodel()
if(teamplay)
{
string s;
- s = Team_ColorName_Lower(self.team);
+ s = Static_Team_ColorName_Lower(self.team);
if(s != "neutral")
{
defaultmodel = cvar_string(strcat("sv_defaultplayermodel_", s));