X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=pr_cmds.c;h=72c72335478ffacd3748fa44e2dca6da265b345c;hp=1eeefc2dc80b8e88f7858df7dc5181c0ea0fc224;hb=ef35a088cb3ab1900acdbd5285465cd845368e79;hpb=01e2d86178b9523fa75e106f2c844c8e45e300bf

diff --git a/pr_cmds.c b/pr_cmds.c
index 1eeefc2d..72c72335 100644
--- a/pr_cmds.c
+++ b/pr_cmds.c
@@ -2931,7 +2931,7 @@ void PF_tokenize (void)
 	tokens = Z_Malloc(strlen(str) * sizeof(char *));
 	max_tokens = strlen(str);
 
-	for (p = str;COM_ParseToken(&p) && num_tokens < max_tokens;num_tokens++)
+	for (p = str;COM_ParseToken(&p, false) && num_tokens < max_tokens;num_tokens++)
 	{
 		tokens[num_tokens] = Z_Malloc(strlen(com_token) + 1);
 		strcpy(tokens[num_tokens], com_token);
@@ -2977,7 +2977,11 @@ void PF_setattachment (void)
 		if (modelindex >= 0 && modelindex < MAX_MODELS)
 		{
 			model = sv.models[modelindex];
-			if (model->alias.aliasnum_tags)
+			if (model->data_overridetagnamesforskin && (unsigned int)tagentity->v->skin < model->numskins && model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames)
+				for (i = 0;i < model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames;i++)
+					if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].data_overridetagnames[i].name))
+						v->_float = i + 1;
+			if (v->_float == 0 && model->alias.aliasnum_tags)
 				for (i = 0;i < model->alias.aliasnum_tags;i++)
 					if (!strcmp(tagname, model->alias.aliasdata_tags[i].name))
 						v->_float = i + 1;