characture -> character
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2882 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
0aa29e47e7
commit
83d23423ab
9 changed files with 15 additions and 15 deletions
|
@ -1006,7 +1006,7 @@ char *Key_KeynumToString (int keynum)
|
||||||
return kn->name;
|
return kn->name;
|
||||||
|
|
||||||
{
|
{
|
||||||
if (keynum < 10) //don't let it be a single characture
|
if (keynum < 10) //don't let it be a single character
|
||||||
return va("0%i", keynum);
|
return va("0%i", keynum);
|
||||||
return va("%i", keynum);
|
return va("%i", keynum);
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,7 +42,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
//mt_childwindow -
|
//mt_childwindow -
|
||||||
//mt_button - Executes a console command or callback on enter. Uses conchars.
|
//mt_button - Executes a console command or callback on enter. Uses conchars.
|
||||||
//mt_buttonbigfont - Used by hexen2's menus. Uses gfx/menu/bigfont.lmp as it's charactures.
|
//mt_buttonbigfont - Used by hexen2's menus. Uses gfx/menu/bigfont.lmp as it's characters.
|
||||||
//mt_box - A 2d box. The same one as the quit dialog from q1, but resized.
|
//mt_box - A 2d box. The same one as the quit dialog from q1, but resized.
|
||||||
//mt_colouredbox - Not used.
|
//mt_colouredbox - Not used.
|
||||||
//mt_line - Not used.
|
//mt_line - Not used.
|
||||||
|
|
|
@ -101,7 +101,7 @@ typedef struct console_s
|
||||||
qboolean unseentext;
|
qboolean unseentext;
|
||||||
int commandcompletion; //allows tab completion of quake console commands
|
int commandcompletion; //allows tab completion of quake console commands
|
||||||
void (*linebuffered) (struct console_s *con, char *line); //if present, called on enter, causes the standard console input to appear.
|
void (*linebuffered) (struct console_s *con, char *line); //if present, called on enter, causes the standard console input to appear.
|
||||||
void (*redirect) (struct console_s *con, int key); //if present, called every characture.
|
void (*redirect) (struct console_s *con, int key); //if present, called every character.
|
||||||
void *userdata;
|
void *userdata;
|
||||||
struct console_s *next;
|
struct console_s *next;
|
||||||
} console_t;
|
} console_t;
|
||||||
|
|
|
@ -1851,13 +1851,13 @@ qboolean Sys_PathProtection(char *pattern)
|
||||||
if (strchr(pattern, '\\'))
|
if (strchr(pattern, '\\'))
|
||||||
{
|
{
|
||||||
char *s;
|
char *s;
|
||||||
Con_Printf("Warning: \\ charactures in filename %s\n", pattern);
|
Con_Printf("Warning: \\ characters in filename %s\n", pattern);
|
||||||
while((s = strchr(pattern, '\\')))
|
while((s = strchr(pattern, '\\')))
|
||||||
*s = '/';
|
*s = '/';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strstr(pattern, ".."))
|
if (strstr(pattern, ".."))
|
||||||
Con_Printf("Error: '..' charactures in filename %s\n", pattern);
|
Con_Printf("Error: '..' characters in filename %s\n", pattern);
|
||||||
else if (pattern[0] == '/')
|
else if (pattern[0] == '/')
|
||||||
Con_Printf("Error: absolute path in filename %s\n", pattern);
|
Con_Printf("Error: absolute path in filename %s\n", pattern);
|
||||||
else if (strstr(pattern, ":")) //win32 drive seperator (or mac path seperator, but / works there and they're used to it)
|
else if (strstr(pattern, ":")) //win32 drive seperator (or mac path seperator, but / works there and they're used to it)
|
||||||
|
|
|
@ -532,7 +532,7 @@ iwboolean FTP_ServerThinkForConnection(FTPclient_t *cl)
|
||||||
else
|
else
|
||||||
strcpy(buffer, cl->path);
|
strcpy(buffer, cl->path);
|
||||||
|
|
||||||
if (*buffer) //last characture should be a /
|
if (*buffer) //last character should be a /
|
||||||
if (buffer[strlen(buffer)-1] != '/')
|
if (buffer[strlen(buffer)-1] != '/')
|
||||||
strcat(buffer, "/");
|
strcat(buffer, "/");
|
||||||
|
|
||||||
|
|
|
@ -1358,7 +1358,7 @@ void QCC_PR_LexVector (void)
|
||||||
pr_file_p++;
|
pr_file_p++;
|
||||||
|
|
||||||
if (*pr_file_p == '\\')
|
if (*pr_file_p == '\\')
|
||||||
{//extended characture constant
|
{//extended character constant
|
||||||
pr_token_type = tt_immediate;
|
pr_token_type = tt_immediate;
|
||||||
pr_immediate_type = type_float;
|
pr_immediate_type = type_float;
|
||||||
pr_file_p++;
|
pr_file_p++;
|
||||||
|
@ -1383,10 +1383,10 @@ void QCC_PR_LexVector (void)
|
||||||
pr_immediate._float = '\\';
|
pr_immediate._float = '\\';
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
QCC_PR_ParseError (ERR_INVALIDVECTORIMMEDIATE, "Bad characture constant");
|
QCC_PR_ParseError (ERR_INVALIDVECTORIMMEDIATE, "Bad character constant");
|
||||||
}
|
}
|
||||||
if (*pr_file_p != '\'')
|
if (*pr_file_p != '\'')
|
||||||
QCC_PR_ParseError (ERR_INVALIDVECTORIMMEDIATE, "Bad characture constant");
|
QCC_PR_ParseError (ERR_INVALIDVECTORIMMEDIATE, "Bad character constant");
|
||||||
pr_file_p++;
|
pr_file_p++;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5641,7 +5641,7 @@ void PF_strstrofs (progfuncs_t *prinst, struct globalvars_s *pr_globals)
|
||||||
}
|
}
|
||||||
|
|
||||||
//FTE_STRINGS
|
//FTE_STRINGS
|
||||||
//returns characture at position X
|
//returns character at position X
|
||||||
void PF_str2chr (progfuncs_t *prinst, struct globalvars_s *pr_globals)
|
void PF_str2chr (progfuncs_t *prinst, struct globalvars_s *pr_globals)
|
||||||
{
|
{
|
||||||
char *instr = PR_GetStringOfs(prinst, OFS_PARM0);
|
char *instr = PR_GetStringOfs(prinst, OFS_PARM0);
|
||||||
|
@ -5657,7 +5657,7 @@ void PF_str2chr (progfuncs_t *prinst, struct globalvars_s *pr_globals)
|
||||||
}
|
}
|
||||||
|
|
||||||
//FTE_STRINGS
|
//FTE_STRINGS
|
||||||
//returns a string containing one characture per parameter (up to the qc max params of 8).
|
//returns a string containing one character per parameter (up to the qc max params of 8).
|
||||||
void PF_chr2str (progfuncs_t *prinst, struct globalvars_s *pr_globals)
|
void PF_chr2str (progfuncs_t *prinst, struct globalvars_s *pr_globals)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
@ -5797,7 +5797,7 @@ void PF_strconv (progfuncs_t *prinst, struct globalvars_s *pr_globals)
|
||||||
}
|
}
|
||||||
|
|
||||||
//FTE_STRINGS
|
//FTE_STRINGS
|
||||||
//C style strncmp (compare first n charactures - case sensative. Note that there is no strcmp provided)
|
//C style strncmp (compare first n characters - case sensative. Note that there is no strcmp provided)
|
||||||
void PF_strncmp (progfuncs_t *prinst, struct globalvars_s *pr_globals)
|
void PF_strncmp (progfuncs_t *prinst, struct globalvars_s *pr_globals)
|
||||||
{
|
{
|
||||||
char *a = PR_GetStringOfs(prinst, OFS_PARM0);
|
char *a = PR_GetStringOfs(prinst, OFS_PARM0);
|
||||||
|
@ -5818,7 +5818,7 @@ void PF_strcasecmp (progfuncs_t *prinst, struct globalvars_s *pr_globals)
|
||||||
}
|
}
|
||||||
|
|
||||||
//FTE_STRINGS
|
//FTE_STRINGS
|
||||||
//C style strncasecmp (compare first n charactures - case insensative)
|
//C style strncasecmp (compare first n characters - case insensative)
|
||||||
void PF_strncasecmp (progfuncs_t *prinst, struct globalvars_s *pr_globals)
|
void PF_strncasecmp (progfuncs_t *prinst, struct globalvars_s *pr_globals)
|
||||||
{
|
{
|
||||||
char *a = PR_GetStringOfs(prinst, OFS_PARM0);
|
char *a = PR_GetStringOfs(prinst, OFS_PARM0);
|
||||||
|
|
|
@ -25,7 +25,7 @@ dialog/barry.dlg:
|
||||||
|
|
||||||
#tag/number, condition (float(entity ent) cond;), text, options.
|
#tag/number, condition (float(entity ent) cond;), text, options.
|
||||||
#if options has a function, that is called. Multiple options/funcs can be done with commas. No options will terminate. If a reply has multiple options, a random (non function) is picked.
|
#if options has a function, that is called. Multiple options/funcs can be done with commas. No options will terminate. If a reply has multiple options, a random (non function) is picked.
|
||||||
#no distinction between characture speech and player options.
|
#no distinction between character speech and player options.
|
||||||
#char statements ignore condition.
|
#char statements ignore condition.
|
||||||
|
|
||||||
#the first entry point
|
#the first entry point
|
||||||
|
|
|
@ -461,7 +461,7 @@ void SWDraw_Init (void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!draw_chars)
|
if (!draw_chars)
|
||||||
Sys_Error("Failed to find suitable console charactures\n");
|
Sys_Error("Failed to find suitable console characters\n");
|
||||||
|
|
||||||
// add ocrana leds
|
// add ocrana leds
|
||||||
if (con_ocranaleds.value)
|
if (con_ocranaleds.value)
|
||||||
|
|
Loading…
Reference in a new issue