Merge branch 'master' into release_v1.3

This commit is contained in:
drian
2021-03-06 15:25:14 +01:00
2 changed files with 3 additions and 1 deletions
+2 -1
View File
@@ -341,7 +341,8 @@ void addmsg(int type, const char *fmt, ...)
}
case 's':
{
sendstring(va_arg(args, const char*), p);
const char *t = va_arg(args, const char *);
sendstring(t, p);
nums++;
break;
}
+1
View File
@@ -230,6 +230,7 @@ void parsepositions(ucharbuf &p)
}
}
break;
int lastspawn = 0;
void onCallVote(int type, int vcn, char *text, char *a)