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

Fix field immediates.

Browse source 
Field immediates need to be treated the same way as pointer immediates when
merging values.
This commit is contained in:
Bill Currie 2011-03-21 18:10:58 +09:00
parent 46093c0937
commit 1219df0872
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/qfcc/source/immediate.c
View file

@ -99,7 +99,7 @@ imm_get_hash (void *_imm, void *_tab)
} else if (tab == &entity_imm_defs) {
return imm->i.integer_val;
} else if (tab == &field_imm_defs) {
return imm->i.integer_val;
return Hash_Buffer (&imm->i.pointer, sizeof (&imm->i.pointer));
} else if (tab == &func_imm_defs) {
return imm->i.integer_val;
} else if (tab == &pointer_imm_defs) {
@ -132,7 +132,8 @@ imm_compare (void *_imm1, void *_imm2, void *_tab)
} else if (tab == &entity_imm_defs) {
return imm1->i.entity_val == imm2->i.entity_val;
} else if (tab == &field_imm_defs) {
return imm1->i.field_val == imm2->i.field_val;
return !memcmp (&imm1->i.pointer, &imm2->i.pointer,
sizeof (imm1->i.pointer));
} else if (tab == &func_imm_defs) {
return imm1->i.func_val == imm2->i.func_val;
} else if (tab == &pointer_imm_defs) {