mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-06-01 17:12:15 +00:00
fix some issues when using --advanced with v6only
This commit is contained in:
parent
d1e2b6b7d2
commit
01b71c40d2
2 changed files with 11 additions and 7 deletions
|
@ -185,7 +185,7 @@ WriteData (int crc)
|
||||||
for (def = pr.scope->head; def; def = def->def_next) {
|
for (def = pr.scope->head; def; def = def->def_next) {
|
||||||
if (def->local || !def->name)
|
if (def->local || !def->name)
|
||||||
continue;
|
continue;
|
||||||
if (options.traditional && *def->name == '.'
|
if (options.code.progsversion == PROG_ID_VERSION && *def->name == '.'
|
||||||
&& strcmp (def->name, ".imm") != 0
|
&& strcmp (def->name, ".imm") != 0
|
||||||
&& strcmp (def->name, ".debug_file") != 0)
|
&& strcmp (def->name, ".debug_file") != 0)
|
||||||
continue;
|
continue;
|
||||||
|
@ -425,7 +425,7 @@ finish_compilation (void)
|
||||||
if (errors)
|
if (errors)
|
||||||
return !errors;
|
return !errors;
|
||||||
|
|
||||||
if (!options.traditional) {
|
if (options.code.progsversion != PROG_ID_VERSION) {
|
||||||
e.type = ex_integer;
|
e.type = ex_integer;
|
||||||
e.e.integer_val = type_size (&type_param);
|
e.e.integer_val = type_size (&type_param);
|
||||||
ReuseConstant (&e, get_def (&type_integer, ".param_size", pr.scope,
|
ReuseConstant (&e, get_def (&type_integer, ".param_size", pr.scope,
|
||||||
|
|
|
@ -670,12 +670,16 @@ init_types (void)
|
||||||
if (options.traditional)
|
if (options.traditional)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
strct = type_zero.s.strct;
|
if (options.code.progsversion != PROG_ID_VERSION) {
|
||||||
new_struct_field (strct, &type_vector, "vector_val", vis_public);
|
strct = type_zero.s.strct;
|
||||||
new_struct_field (strct, &type_quaternion, "quaternion_val", vis_public);
|
new_struct_field (strct, &type_vector, "vector_val", vis_public);
|
||||||
|
new_struct_field (strct, &type_quaternion, "quaternion_val",
|
||||||
|
vis_public);
|
||||||
|
|
||||||
strct = type_param.s.strct;
|
strct = type_param.s.strct;
|
||||||
new_struct_field (strct, &type_quaternion, "quaternion_val", vis_public);
|
new_struct_field (strct, &type_quaternion, "quaternion_val",
|
||||||
|
vis_public);
|
||||||
|
}
|
||||||
|
|
||||||
strct = quaternion_struct = get_struct (0, 1);
|
strct = quaternion_struct = get_struct (0, 1);
|
||||||
init_struct (strct, new_type (), str_struct, 0);
|
init_struct (strct, new_type (), str_struct, 0);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue