qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-13 00:24:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handle quest format brushes.

Browse source 
Bah, I forgot I needed to fix the vertex count parsing when I did the
script lexing change.
This commit is contained in:
Bill Currie 2012-09-12 08:24:17 +09:00
parent ea541b325d
commit db25d5597d
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/Forge/Bundles/MapEdit/SetBrush.m
View file

@ -643,11 +643,19 @@ ParseVerts (script_t *script, int *n_verts)
{ {
vec3_t *verts; vec3_t *verts;
int i; int i;
const char *token;
if (strcmp (Script_Token (script), ":")) token = Script_Token (script);
if (token[0] != ':')
Sys_Error ("parsing map file"); Sys_Error ("parsing map file");
// It's normally ":count", but somebody might have done ": count"
if (!token[1]) {
Script_GetToken (script, false); Script_GetToken (script, false);
*n_verts = atoi (Script_Token (script)); token = Script_Token (script);
} else {
token++;
}
*n_verts = atoi (token);
verts = malloc (sizeof (vec3_t) * *n_verts); verts = malloc (sizeof (vec3_t) * *n_verts);
for (i = 0; i < *n_verts; i++) { for (i = 0; i < *n_verts; i++) {

12
tools/qfbsp/source/map.c
View file

@ -207,11 +207,19 @@ ParseVerts (int *n_verts)
{ {
vec3_t *verts; vec3_t *verts;
int i; int i;
const char *token;
if (map_script->token->str[0] != ':') token = Script_Token (map_script);
if (token[0] != ':')
map_error ("parsing brush"); map_error ("parsing brush");
// It's normally ":count", but somebody might have done ": count"
if (!token[1]) {
Script_GetToken (map_script, false); Script_GetToken (map_script, false);
*n_verts = atoi (map_script->token->str); token = Script_Token (map_script);
} else {
token++;
}
*n_verts = atoi (token);
verts = malloc (sizeof (vec3_t) * *n_verts); verts = malloc (sizeof (vec3_t) * *n_verts);
for (i = 0; i < *n_verts; i++) { for (i = 0; i < *n_verts; i++) {