* Merge unified-sdl to trunk
* Bump Q3_VERSION to 1.35
This commit is contained in:
parent
39abffeb3b
commit
672cfbf16f
188 changed files with 5071 additions and 41739 deletions
|
@ -1439,7 +1439,7 @@ int StringsMatch(bot_matchpiece_t *pieces, bot_match_t *match)
|
|||
//if the last piece was a variable string
|
||||
if (lastvariable >= 0)
|
||||
{
|
||||
assert( match->variables[lastvariable].offset >= 0 ); // bk001204
|
||||
assert( match->variables[lastvariable].offset >= 0 );
|
||||
match->variables[lastvariable].length =
|
||||
strlen(&match->string[ (int) match->variables[lastvariable].offset]);
|
||||
} //end if
|
||||
|
@ -1500,7 +1500,7 @@ void BotMatchVariable(bot_match_t *match, int variable, char *buf, int size)
|
|||
{
|
||||
if (match->variables[variable].length < size)
|
||||
size = match->variables[variable].length+1;
|
||||
assert( match->variables[variable].offset >= 0 ); // bk001204
|
||||
assert( match->variables[variable].offset >= 0 );
|
||||
strncpy(buf, &match->string[ (int) match->variables[variable].offset], size-1);
|
||||
buf[size-1] = '\0';
|
||||
} //end if
|
||||
|
@ -2316,7 +2316,7 @@ int BotExpandChatMessage(char *outmessage, char *message, unsigned long mcontext
|
|||
} //end if
|
||||
if (match->variables[num].offset >= 0)
|
||||
{
|
||||
assert( match->variables[num].offset >= 0 ); // bk001204
|
||||
assert( match->variables[num].offset >= 0 );
|
||||
ptr = &match->string[ (int) match->variables[num].offset];
|
||||
for (i = 0; i < match->variables[num].length; i++)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue