From: blub Date: Sat, 26 Dec 2009 13:45:04 +0000 (+0000) Subject: these checks are now superfluous, u8_fromchar doesn't return values <0 anymore X-Git-Tag: xonotic-v0.1.0preview~949 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9aacd2b766f5b20c65a6eb9d395d041af147be54;p=xonotic%2Fdarkplaces.git these checks are now superfluous, u8_fromchar doesn't return values <0 anymore git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9699 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/prvm_cmds.c b/prvm_cmds.c index 5ed34b79..323cbb96 100644 --- a/prvm_cmds.c +++ b/prvm_cmds.c @@ -3151,8 +3151,6 @@ void VM_chr(void) VM_SAFEPARMCOUNT(1, VM_chr); len = u8_fromchar((Uchar)PRVM_G_FLOAT(OFS_PARM0), tmp, sizeof(tmp)); - if (len < 0) - len = 0; tmp[len] = 0; PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(tmp); } @@ -5086,11 +5084,7 @@ void VM_chr2str (void) size_t len = 0; VM_SAFEPARMCOUNTRANGE(0, 8, VM_chr2str); for(i = 0; i < prog->argc && len < sizeof(t)-1; ++i) - { - int add = u8_fromchar((Uchar)PRVM_G_FLOAT(OFS_PARM0+i*3), t + len, sizeof(t)-1); - if(add > 0) - len += add; - } + len += u8_fromchar((Uchar)PRVM_G_FLOAT(OFS_PARM0+i*3), t + len, sizeof(t)-1); t[len] = 0; PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(t); }