From 63b7296630944e8e3e3d3dbc2d0c1278991c0656 Mon Sep 17 00:00:00 2001 From: Spoike Date: Wed, 4 May 2005 19:49:48 +0000 Subject: [PATCH] Small bug fix. Strict parsers were complaining... gcc4. :/ git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@984 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/qclib/execloop.h | 12 ++++++------ engine/qclib/execloop16d.h | 12 ++++++------ engine/qclib/execloop32.h | 12 ++++++------ engine/qclib/execloop32d.h | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/engine/qclib/execloop.h b/engine/qclib/execloop.h index 3e8cc2402..16f600650 100644 --- a/engine/qclib/execloop.h +++ b/engine/qclib/execloop.h @@ -651,7 +651,7 @@ reeval: //array/structure reading/riting. case OP_GLOBALADDRESS: - OPC->_int = (int)(&((int)(OPA->_int)) + OPB->_int); + OPC->_int = (int)(&OPA->_int) + OPB->_int); break; case OP_POINTER_ADD: //pointer to 32 bit (remember to *3 for vectors) OPC->_int = OPA->_int + OPB->_int*4; @@ -663,12 +663,12 @@ reeval: case OP_LOADA_ENT: case OP_LOADA_S: case OP_LOADA_FNC: - ptr = (eval_t *)(&((int)(OPA->_int)) + OPB->_int); + ptr = (eval_t *)(&OPA->_int + OPB->_int); OPC->_int = ptr->_int; break; case OP_LOADA_V: - ptr = (eval_t *)(&((int)(OPA->_int)) + OPB->_int); + ptr = (eval_t *)(&OPA->_int + OPB->_int); OPC->vector[0] = ptr->vector[0]; OPC->vector[1] = ptr->vector[1]; OPC->vector[2] = ptr->vector[2]; @@ -683,7 +683,7 @@ reeval: OPC->_int = OPA->_int - OPB->_int; break; case OP_LOADP_C: //load character from a string - ptr = (eval_t *)(((int)(OPA->_int)) + (int)OPB->_float); + ptr = (eval_t *)(OPA->_int + (int)OPB->_float); OPC->_float = *(unsigned char *)ptr; break; case OP_LOADP_I: @@ -692,12 +692,12 @@ reeval: case OP_LOADP_ENT: case OP_LOADP_S: case OP_LOADP_FNC: - ptr = (eval_t *)(((int)(OPA->_int)) + OPB->_int); + ptr = (eval_t *)(OPA->_int + OPB->_int); OPC->_int = ptr->_int; break; case OP_LOADP_V: - ptr = (eval_t *)(((int)(OPA->_int)) + OPB->_int); + ptr = (eval_t *)(OPA->_int + OPB->_int); OPC->vector[0] = ptr->vector[0]; OPC->vector[1] = ptr->vector[1]; OPC->vector[2] = ptr->vector[2]; diff --git a/engine/qclib/execloop16d.h b/engine/qclib/execloop16d.h index 3e8cc2402..16f600650 100644 --- a/engine/qclib/execloop16d.h +++ b/engine/qclib/execloop16d.h @@ -651,7 +651,7 @@ reeval: //array/structure reading/riting. case OP_GLOBALADDRESS: - OPC->_int = (int)(&((int)(OPA->_int)) + OPB->_int); + OPC->_int = (int)(&OPA->_int) + OPB->_int); break; case OP_POINTER_ADD: //pointer to 32 bit (remember to *3 for vectors) OPC->_int = OPA->_int + OPB->_int*4; @@ -663,12 +663,12 @@ reeval: case OP_LOADA_ENT: case OP_LOADA_S: case OP_LOADA_FNC: - ptr = (eval_t *)(&((int)(OPA->_int)) + OPB->_int); + ptr = (eval_t *)(&OPA->_int + OPB->_int); OPC->_int = ptr->_int; break; case OP_LOADA_V: - ptr = (eval_t *)(&((int)(OPA->_int)) + OPB->_int); + ptr = (eval_t *)(&OPA->_int + OPB->_int); OPC->vector[0] = ptr->vector[0]; OPC->vector[1] = ptr->vector[1]; OPC->vector[2] = ptr->vector[2]; @@ -683,7 +683,7 @@ reeval: OPC->_int = OPA->_int - OPB->_int; break; case OP_LOADP_C: //load character from a string - ptr = (eval_t *)(((int)(OPA->_int)) + (int)OPB->_float); + ptr = (eval_t *)(OPA->_int + (int)OPB->_float); OPC->_float = *(unsigned char *)ptr; break; case OP_LOADP_I: @@ -692,12 +692,12 @@ reeval: case OP_LOADP_ENT: case OP_LOADP_S: case OP_LOADP_FNC: - ptr = (eval_t *)(((int)(OPA->_int)) + OPB->_int); + ptr = (eval_t *)(OPA->_int + OPB->_int); OPC->_int = ptr->_int; break; case OP_LOADP_V: - ptr = (eval_t *)(((int)(OPA->_int)) + OPB->_int); + ptr = (eval_t *)(OPA->_int + OPB->_int); OPC->vector[0] = ptr->vector[0]; OPC->vector[1] = ptr->vector[1]; OPC->vector[2] = ptr->vector[2]; diff --git a/engine/qclib/execloop32.h b/engine/qclib/execloop32.h index 3e8cc2402..16f600650 100644 --- a/engine/qclib/execloop32.h +++ b/engine/qclib/execloop32.h @@ -651,7 +651,7 @@ reeval: //array/structure reading/riting. case OP_GLOBALADDRESS: - OPC->_int = (int)(&((int)(OPA->_int)) + OPB->_int); + OPC->_int = (int)(&OPA->_int) + OPB->_int); break; case OP_POINTER_ADD: //pointer to 32 bit (remember to *3 for vectors) OPC->_int = OPA->_int + OPB->_int*4; @@ -663,12 +663,12 @@ reeval: case OP_LOADA_ENT: case OP_LOADA_S: case OP_LOADA_FNC: - ptr = (eval_t *)(&((int)(OPA->_int)) + OPB->_int); + ptr = (eval_t *)(&OPA->_int + OPB->_int); OPC->_int = ptr->_int; break; case OP_LOADA_V: - ptr = (eval_t *)(&((int)(OPA->_int)) + OPB->_int); + ptr = (eval_t *)(&OPA->_int + OPB->_int); OPC->vector[0] = ptr->vector[0]; OPC->vector[1] = ptr->vector[1]; OPC->vector[2] = ptr->vector[2]; @@ -683,7 +683,7 @@ reeval: OPC->_int = OPA->_int - OPB->_int; break; case OP_LOADP_C: //load character from a string - ptr = (eval_t *)(((int)(OPA->_int)) + (int)OPB->_float); + ptr = (eval_t *)(OPA->_int + (int)OPB->_float); OPC->_float = *(unsigned char *)ptr; break; case OP_LOADP_I: @@ -692,12 +692,12 @@ reeval: case OP_LOADP_ENT: case OP_LOADP_S: case OP_LOADP_FNC: - ptr = (eval_t *)(((int)(OPA->_int)) + OPB->_int); + ptr = (eval_t *)(OPA->_int + OPB->_int); OPC->_int = ptr->_int; break; case OP_LOADP_V: - ptr = (eval_t *)(((int)(OPA->_int)) + OPB->_int); + ptr = (eval_t *)(OPA->_int + OPB->_int); OPC->vector[0] = ptr->vector[0]; OPC->vector[1] = ptr->vector[1]; OPC->vector[2] = ptr->vector[2]; diff --git a/engine/qclib/execloop32d.h b/engine/qclib/execloop32d.h index 3e8cc2402..16f600650 100644 --- a/engine/qclib/execloop32d.h +++ b/engine/qclib/execloop32d.h @@ -651,7 +651,7 @@ reeval: //array/structure reading/riting. case OP_GLOBALADDRESS: - OPC->_int = (int)(&((int)(OPA->_int)) + OPB->_int); + OPC->_int = (int)(&OPA->_int) + OPB->_int); break; case OP_POINTER_ADD: //pointer to 32 bit (remember to *3 for vectors) OPC->_int = OPA->_int + OPB->_int*4; @@ -663,12 +663,12 @@ reeval: case OP_LOADA_ENT: case OP_LOADA_S: case OP_LOADA_FNC: - ptr = (eval_t *)(&((int)(OPA->_int)) + OPB->_int); + ptr = (eval_t *)(&OPA->_int + OPB->_int); OPC->_int = ptr->_int; break; case OP_LOADA_V: - ptr = (eval_t *)(&((int)(OPA->_int)) + OPB->_int); + ptr = (eval_t *)(&OPA->_int + OPB->_int); OPC->vector[0] = ptr->vector[0]; OPC->vector[1] = ptr->vector[1]; OPC->vector[2] = ptr->vector[2]; @@ -683,7 +683,7 @@ reeval: OPC->_int = OPA->_int - OPB->_int; break; case OP_LOADP_C: //load character from a string - ptr = (eval_t *)(((int)(OPA->_int)) + (int)OPB->_float); + ptr = (eval_t *)(OPA->_int + (int)OPB->_float); OPC->_float = *(unsigned char *)ptr; break; case OP_LOADP_I: @@ -692,12 +692,12 @@ reeval: case OP_LOADP_ENT: case OP_LOADP_S: case OP_LOADP_FNC: - ptr = (eval_t *)(((int)(OPA->_int)) + OPB->_int); + ptr = (eval_t *)(OPA->_int + OPB->_int); OPC->_int = ptr->_int; break; case OP_LOADP_V: - ptr = (eval_t *)(((int)(OPA->_int)) + OPB->_int); + ptr = (eval_t *)(OPA->_int + OPB->_int); OPC->vector[0] = ptr->vector[0]; OPC->vector[1] = ptr->vector[1]; OPC->vector[2] = ptr->vector[2];