From db01650daceddcb1ceed7ea76428177844453658 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 31 Mar 2022 00:07:20 +0900 Subject: [PATCH] Update vec3_t/vec4f_t hacks to work with clang Still work with gcc, of course, and I still need to fix them properly, but now they're actually slightly easier to find as they all have vec_t and FIXME on the same line. --- libs/client/cl_chase.c | 16 +++++------ libs/client/cl_entities.c | 2 +- libs/client/cl_particles.c | 10 +++++-- libs/client/cl_temp_entities.c | 34 +++++++++++------------ libs/client/cl_view.c | 7 ++--- libs/client/cl_world.c | 2 +- libs/video/renderer/gl/gl_mod_sprite.c | 8 +++--- libs/video/renderer/gl/gl_rmain.c | 6 ++-- libs/video/renderer/gl/gl_rsurf.c | 2 +- libs/video/renderer/glsl/glsl_alias.c | 2 +- libs/video/renderer/glsl/glsl_bsp.c | 6 ++-- libs/video/renderer/glsl/glsl_iqm.c | 2 +- libs/video/renderer/glsl/glsl_particles.c | 4 +-- libs/video/renderer/glsl/glsl_sprite.c | 2 +- libs/video/renderer/r_main.c | 8 +++--- libs/video/renderer/r_screen.c | 2 +- libs/video/renderer/sw/d_edge.c | 4 +-- libs/video/renderer/vulkan/vulkan_bsp.c | 2 +- nq/source/cl_parse.c | 2 +- nq/source/cl_screen.c | 3 +- nq/source/host.c | 2 +- nq/source/sv_main.c | 2 +- qtv/source/client.c | 2 +- qtv/source/sv_parse.c | 4 +-- qw/source/cl_cam.c | 8 +++--- qw/source/cl_demo.c | 4 +-- qw/source/cl_entparse.c | 2 +- qw/source/cl_main.c | 2 +- qw/source/cl_parse.c | 2 +- qw/source/cl_screen.c | 3 +- qw/source/sv_ents.c | 2 +- qw/source/sv_init.c | 5 ++-- 32 files changed, 82 insertions(+), 80 deletions(-) diff --git a/libs/client/cl_chase.c b/libs/client/cl_chase.c index 62e0d471f..483e1605f 100644 --- a/libs/client/cl_chase.c +++ b/libs/client/cl_chase.c @@ -79,7 +79,7 @@ TraceLine (chasestate_t *cs, vec4f_t start, vec4f_t end) memset (&trace, 0, sizeof (trace)); trace.fraction = 1; - MOD_TraceLine (cs->worldmodel->brush.hulls, 0, &start[0], &end[0], &trace); + MOD_TraceLine (cs->worldmodel->brush.hulls, 0, (vec_t*)&start, (vec_t*)&end, &trace);//FIXME return (vec4f_t) {trace.endpos[0], trace.endpos[1], trace.endpos[2], 1}; } @@ -113,7 +113,7 @@ static void set_camera (chasestate_t *cs, viewstate_t *vs) { vec4f_t rotation; - AngleQuat (cs->camera_angles, &rotation[0]);//FIXME + AngleQuat (cs->camera_angles, (vec_t*)&rotation);//FIXME Transform_SetWorldRotation (vs->camera_transform, rotation); Transform_SetWorldPosition (vs->camera_transform, cs->camera_origin); } @@ -149,7 +149,7 @@ cam_controls (chasestate_t *cs, viewstate_t *vs) // mouse and joystick controllers add to movement VectorSet (0, vs->player_angles[1] - cs->camera_angles[1], 0, dir); - AngleVectors (&dir[0], &forward[0], &right[0], &up[0]); //FIXME + AngleVectors ((vec_t*)&dir, (vec_t*)&forward, (vec_t*)&right, (vec_t*)&up); //FIXME forward *= IN_UpdateAxis (&in_cam_forward) * m_forward->value; right *= IN_UpdateAxis (&in_cam_side) * m_side->value; dir = forward + right; @@ -157,7 +157,7 @@ cam_controls (chasestate_t *cs, viewstate_t *vs) move[SIDE] -= dir[1]; VectorSet (0, cs->camera_angles[1], 0, dir); - AngleVectors (&dir[0], &forward[0], &right[0], &up[0]); //FIXME + AngleVectors ((vec_t*)&dir, (vec_t*)&forward, (vec_t*)&right, (vec_t*)&up); //FIXME dir = forward * move[FORWARD] + right * move[SIDE]; @@ -185,8 +185,8 @@ chase_mode_1 (chasestate_t *cs) // regular camera, faces same direction as player viewstate_t *vs = cs->viewstate; vec4f_t forward = {}, up = {}, right = {}, stop = {}; - //FIXME - AngleVectors (vs->player_angles, &forward[0], &right[0], &up[0]); + + AngleVectors (vs->player_angles, (vec_t*)&forward, (vec_t*)&right, (vec_t*)&up);//FIXME VectorCopy (vs->player_angles, cs->camera_angles); // calc exact destination @@ -218,7 +218,7 @@ chase_mode_2 (chasestate_t *cs) // move camera, it's not enough to just change the angles because // the angles are automatically changed to look toward the player - AngleVectors (cs->camera_angles, &forward[0], &right[0], &up[0]); + AngleVectors (cs->camera_angles, (vec_t*)&forward, (vec_t*)&right, (vec_t*)&up);//FIXME cs->camera_origin = cs->player_origin - chase_back->value * forward; cs->player_origin = vs->player_origin; @@ -266,7 +266,7 @@ chase_mode_3 (chasestate_t *cs) // the angles are automatically changed to look toward the player cs->player_origin = vs->player_origin; - AngleVectors (cs->camera_angles, &forward[0], &right[0], &up[0]); + AngleVectors (cs->camera_angles, (vec_t*)&forward, (vec_t*)&right, (vec_t*)&up);//FIXME cs->camera_origin = cs->player_origin - chase_back->value * forward; limit_distance (cs); check_for_walls (cs, forward); diff --git a/libs/client/cl_entities.c b/libs/client/cl_entities.c index d4cac0dfa..01ffd7d6b 100644 --- a/libs/client/cl_entities.c +++ b/libs/client/cl_entities.c @@ -370,7 +370,7 @@ CL_TransformEntity (entity_t *ent, float scale, const vec3_t angles, // to everything else? ang[PITCH] = -ang[PITCH]; } - AngleQuat (ang, &rotation[0]);//FIXME + AngleQuat (ang, (vec_t*)&rotation);//FIXME } Transform_SetLocalTransform (ent->transform, scalevec, rotation, position); } diff --git a/libs/client/cl_particles.c b/libs/client/cl_particles.c index 7ff731315..618067612 100644 --- a/libs/client/cl_particles.c +++ b/libs/client/cl_particles.c @@ -249,15 +249,19 @@ CL_LoadPointFile (const model_t *model) vec4f_t zero = {}; for (;;) { char buf[64]; - vec4f_t org = { 0, 0, 0, 1 }; + union { + vec4f_t org; + vec3_t org3; + } o = { .org = { 0, 0, 0, 1 }}; Qgets (f, buf, sizeof (buf)); - int r = sscanf (buf, "%f %f %f\n", &org[0], &org[1], &org[2]); + int r = sscanf (buf, "%f %f %f\n", + &o.org3[0], &o.org3[1], &o.org3[2]); if (r != 3) break; c++; - if (!particle_new (pt_static, part_tex_dot, org, 1.5, zero, + if (!particle_new (pt_static, part_tex_dot, o.org, 1.5, zero, 99999, (-c) & 15, 1.0, 0.0)) { Sys_MaskPrintf (SYS_dev, "Not enough free particles\n"); break; diff --git a/libs/client/cl_temp_entities.c b/libs/client/cl_temp_entities.c index 3b932d3ca..269a1c9ed 100644 --- a/libs/client/cl_temp_entities.c +++ b/libs/client/cl_temp_entities.c @@ -285,8 +285,8 @@ CL_ParseBeam (qmsg_t *net_message, model_t *m, double time, TEntContext_t *ctx) ent = MSG_ReadShort (net_message); - MSG_ReadCoordV (net_message, &start[0]);//FIXME - MSG_ReadCoordV (net_message, &end[0]);//FIXME + MSG_ReadCoordV (net_message, (vec_t*)&start);//FIXME + MSG_ReadCoordV (net_message, (vec_t*)&end);//FIXME start[3] = end[3] = 1;//FIXME to = 0; @@ -340,11 +340,11 @@ parse_tent (qmsg_t *net_message, double time, TEntContext_t *ctx, break; case TE_Blood: count = MSG_ReadByte (net_message) * 20; - MSG_ReadCoordV (net_message, &position[0]); + MSG_ReadCoordV (net_message, (vec_t*)&position);//FIXME clp_funcs->BloodPuffEffect (position, count); break; case TE_Explosion: - MSG_ReadCoordV (net_message, &position[0]); + MSG_ReadCoordV (net_message, (vec_t*)&position);//FIXME // particles clp_funcs->ParticleExplosion (position); @@ -380,7 +380,7 @@ parse_tent (qmsg_t *net_message, double time, TEntContext_t *ctx, (vec4f_t) {VectorExpand (position), 1}); break; case TE_Explosion2: - MSG_ReadCoordV (net_message, &position[0]); + MSG_ReadCoordV (net_message, (vec_t*)&position);//FIXME colorStart = MSG_ReadByte (net_message); colorLength = MSG_ReadByte (net_message); S_StartSound (-1, 0, cl_sfx_r_exp3, position, 1, 1); @@ -398,7 +398,7 @@ parse_tent (qmsg_t *net_message, double time, TEntContext_t *ctx, dl->color[3] = 0.7; break; case TE_Explosion3: - MSG_ReadCoordV (net_message, &position[0]); + MSG_ReadCoordV (net_message, (vec_t*)&position);//FIXME MSG_ReadCoordV (net_message, color); // OUCH! color[3] = 0.7; clp_funcs->ParticleExplosion (position); @@ -413,21 +413,21 @@ parse_tent (qmsg_t *net_message, double time, TEntContext_t *ctx, } break; case TE_Gunshot1: - MSG_ReadCoordV (net_message, &position[0]); + MSG_ReadCoordV (net_message, (vec_t*)&position);//FIXME clp_funcs->GunshotEffect (position, 20); break; case TE_Gunshot2: count = MSG_ReadByte (net_message) * 20; - MSG_ReadCoordV (net_message, &position[0]); + MSG_ReadCoordV (net_message, (vec_t*)&position);//FIXME clp_funcs->GunshotEffect (position, count); break; case TE_KnightSpike: - MSG_ReadCoordV (net_message, &position[0]); + MSG_ReadCoordV (net_message, (vec_t*)&position);//FIXME clp_funcs->KnightSpikeEffect (position); S_StartSound (-1, 0, cl_sfx_knighthit, position, 1, 1); break; case TE_LavaSplash: - MSG_ReadCoordV (net_message, &position[0]); + MSG_ReadCoordV (net_message, (vec_t*)&position);//FIXME clp_funcs->LavaSplash (position); break; case TE_Lightning1: @@ -444,7 +444,7 @@ parse_tent (qmsg_t *net_message, double time, TEntContext_t *ctx, CL_ParseBeam (net_message, Mod_ForName (name, true), time, ctx); break; case TE_LightningBlood: - MSG_ReadCoordV (net_message, &position[0]); + MSG_ReadCoordV (net_message, (vec_t*)&position);//FIXME // light dl = R_AllocDlight (0); @@ -459,7 +459,7 @@ parse_tent (qmsg_t *net_message, double time, TEntContext_t *ctx, clp_funcs->LightningBloodEffect (position); break; case TE_Spike: - MSG_ReadCoordV (net_message, &position[0]); + MSG_ReadCoordV (net_message, (vec_t*)&position);//FIXME clp_funcs->SpikeEffect (position); { int i; @@ -475,7 +475,7 @@ parse_tent (qmsg_t *net_message, double time, TEntContext_t *ctx, } break; case TE_SuperSpike: - MSG_ReadCoordV (net_message, &position[0]); + MSG_ReadCoordV (net_message, (vec_t*)&position);//FIXME clp_funcs->SuperSpikeEffect (position); { int i; @@ -491,17 +491,17 @@ parse_tent (qmsg_t *net_message, double time, TEntContext_t *ctx, } break; case TE_TarExplosion: - MSG_ReadCoordV (net_message, &position[0]); + MSG_ReadCoordV (net_message, (vec_t*)&position);//FIXME clp_funcs->BlobExplosion (position); S_StartSound (-1, 0, cl_sfx_r_exp3, position, 1, 1); break; case TE_Teleport: - MSG_ReadCoordV (net_message, &position[0]); + MSG_ReadCoordV (net_message, (vec_t*)&position);//FIXME clp_funcs->TeleportSplash (position); break; case TE_WizSpike: - MSG_ReadCoordV (net_message, &position[0]); + MSG_ReadCoordV (net_message, (vec_t*)&position);//FIXME clp_funcs->WizSpikeEffect (position); S_StartSound (-1, 0, cl_sfx_wizhit, position, 1, 1); break; @@ -655,7 +655,7 @@ CL_ParseParticleEffect (qmsg_t *net_message) int i, count, color; vec4f_t org = {0, 0, 0, 1}, dir = {}; - MSG_ReadCoordV (net_message, &org[0]); + MSG_ReadCoordV (net_message, (vec_t*)&org);//FIXME for (i = 0; i < 3; i++) dir[i] = ((signed char) MSG_ReadByte (net_message)) * (15.0 / 16.0); count = MSG_ReadByte (net_message); diff --git a/libs/client/cl_view.c b/libs/client/cl_view.c index a4120eeab..fa693107b 100644 --- a/libs/client/cl_view.c +++ b/libs/client/cl_view.c @@ -563,7 +563,7 @@ V_CalcViewRoll (viewstate_t *vs) } vec4f_t rot; - AngleQuat (ang, &rot[0]);//FIXME + AngleQuat (ang, (vec_t*)&rot);//FIXME vec4f_t rotation = Transform_GetWorldRotation (vs->camera_transform); Transform_SetWorldRotation (vs->camera_transform, qmulf (rotation, rot)); } @@ -608,7 +608,6 @@ V_CalcRefdef (viewstate_t *vs) bob = V_CalcBob (vs); // refresh position - origin = origin; origin[2] += vs->height + bob; // never let it sit exactly on a node line, because a water plane can @@ -617,14 +616,14 @@ V_CalcRefdef (viewstate_t *vs) origin += (vec4f_t) { 1.0/16, 1.0/16, 1.0/16, 0}; vec4f_t rotation; - AngleQuat (vs->player_angles, &rotation[0]);//FIXME + AngleQuat (vs->player_angles, (vec_t*)&rotation);//FIXME Transform_SetWorldRotation (vs->camera_transform, rotation); V_CalcViewRoll (vs); V_AddIdle (vs); // offsets //FIXME semi-duplicates AngleQuat (also, vec3_t vs vec4f_t) - AngleVectors (viewangles, &forward[0], &right[0], &up[0]); + AngleVectors (viewangles, (vec_t*)&forward, (vec_t*)&right, (vec_t*)&up);//FIXME // don't allow cheats in multiplayer // FIXME check for dead diff --git a/libs/client/cl_world.c b/libs/client/cl_world.c index 8a45e44d1..436013f79 100644 --- a/libs/client/cl_world.c +++ b/libs/client/cl_world.c @@ -87,7 +87,7 @@ CL_ParseBaseline (qmsg_t *msg, entity_state_t *baseline, int version) baseline->colormap = MSG_ReadByte (msg); baseline->skinnum = MSG_ReadByte (msg); - MSG_ReadCoordAngleV (msg, &baseline->origin[0], baseline->angles); + MSG_ReadCoordAngleV (msg, (vec_t*)&baseline->origin, baseline->angles);//FIXME baseline->origin[3] = 1;//FIXME if (bits & B_ALPHA) diff --git a/libs/video/renderer/gl/gl_mod_sprite.c b/libs/video/renderer/gl/gl_mod_sprite.c index 36b5ba633..226a4443b 100644 --- a/libs/video/renderer/gl/gl_mod_sprite.c +++ b/libs/video/renderer/gl/gl_mod_sprite.c @@ -90,20 +90,20 @@ R_DrawSpriteModel_f (entity_t *e) point = origin + frame->down * up + frame->left * right; qfglTexCoord2f (0, 1); - qfglVertex3fv (&point[0]); + qfglVertex3fv ((vec_t*)&point);//FIXME point = origin + frame->up * up + frame->left * right; qfglTexCoord2f (0, 0); - qfglVertex3fv (&point[0]); + qfglVertex3fv ((vec_t*)&point);//FIXME point = origin + frame->up * up + frame->right * right; qfglTexCoord2f (1, 0); - qfglVertex3fv (&point[0]); + qfglVertex3fv ((vec_t*)&point);//FIXME point = origin + frame->down * up + frame->right * right; qfglTexCoord2f (1, 1); - qfglVertex3fv (&point[0]); + qfglVertex3fv ((vec_t*)&point);//FIXME qfglEnd (); diff --git a/libs/video/renderer/gl/gl_rmain.c b/libs/video/renderer/gl/gl_rmain.c index 19da42cbe..a3b19615b 100644 --- a/libs/video/renderer/gl/gl_rmain.c +++ b/libs/video/renderer/gl/gl_rmain.c @@ -92,7 +92,7 @@ gl_R_RotateForEntity (entity_t *e) { mat4f_t mat; Transform_GetWorldMatrix (e->transform, mat); - qfglMultMatrixf (&mat[0][0]); + qfglMultMatrixf ((vec_t*)&mat[0]);//FIXME } void @@ -233,7 +233,7 @@ static void R_SetupGL (void) { qfglMatrixMode (GL_PROJECTION); - qfglLoadMatrixf (&gl_ctx->projection[0][0]); + qfglLoadMatrixf ((vec_t*)&gl_ctx->projection[0]);//FIXME qfglFrontFace (GL_CW); @@ -248,7 +248,7 @@ R_SetupGL (void) }; mat4f_t view; mmulf (view, z_up, r_refdef.camera_inverse); - qfglLoadMatrixf (&view[0][0]); + qfglLoadMatrixf ((vec_t*)&view[0]);//FIXME qfglGetFloatv (GL_MODELVIEW_MATRIX, gl_r_world_matrix); diff --git a/libs/video/renderer/gl/gl_rsurf.c b/libs/video/renderer/gl/gl_rsurf.c index 75e42ff5a..bb3f4a958 100644 --- a/libs/video/renderer/gl/gl_rsurf.c +++ b/libs/video/renderer/gl/gl_rsurf.c @@ -544,7 +544,7 @@ gl_R_DrawBrushModel (entity_t *e) if (e->scale != 1.0) radius *= e->scale; #endif - if (R_CullSphere (r_refdef.frustum, &worldMatrix[3][0], radius)) {//FIXME + if (R_CullSphere (r_refdef.frustum, (vec_t*)&worldMatrix[3], radius)) {//FIXME return; } } else { diff --git a/libs/video/renderer/glsl/glsl_alias.c b/libs/video/renderer/glsl/glsl_alias.c index 7d94f6029..3ecf33bc6 100644 --- a/libs/video/renderer/glsl/glsl_alias.c +++ b/libs/video/renderer/glsl/glsl_alias.c @@ -299,7 +299,7 @@ glsl_R_DrawAlias (entity_t *ent) qfeglUniform3fv (quake_mdl.lightvec.location, 1, lightvec); qfeglUniform2fv (quake_mdl.skin_size.location, 1, skin_size); qfeglUniformMatrix4fv (quake_mdl.mvp_matrix.location, 1, false, - &mvp_mat[0][0]); + (vec_t*)&mvp_mat[0]);//FIXME qfeglUniformMatrix3fv (quake_mdl.norm_matrix.location, 1, false, norm_mat); #ifndef TETRAHEDRON diff --git a/libs/video/renderer/glsl/glsl_bsp.c b/libs/video/renderer/glsl/glsl_bsp.c index 66658c8e6..7ae7dec1e 100644 --- a/libs/video/renderer/glsl/glsl_bsp.c +++ b/libs/video/renderer/glsl/glsl_bsp.c @@ -677,7 +677,7 @@ R_DrawBrushModel (entity_t *e) if (mat[0][0] != 1 || mat[1][1] != 1 || mat[2][2] != 1) { rotated = true; radius = model->radius; - if (R_CullSphere (r_refdef.frustum, &mat[3][0], radius)) { // FIXME + if (R_CullSphere (r_refdef.frustum, (vec_t*)&mat[3], radius)) { // FIXME return; } } else { @@ -854,10 +854,10 @@ draw_elechain (elechain_t *ec, int matloc, int vertloc, int tlstloc, } } if (ec->transform) { - Mat4Mult (&bsp_vp[0][0], ec->transform, mat);//FIXME + Mat4Mult ((vec_t*)&bsp_vp[0], ec->transform, mat);//FIXME qfeglUniformMatrix4fv (matloc, 1, false, mat); } else { - qfeglUniformMatrix4fv (matloc, 1, false, &bsp_vp[0][0]); + qfeglUniformMatrix4fv (matloc, 1, false, (vec_t*)&bsp_vp[0]);//FIXME } for (el = ec->elements; el; el = el->next) { if (!el->list->size) diff --git a/libs/video/renderer/glsl/glsl_iqm.c b/libs/video/renderer/glsl/glsl_iqm.c index 056ac85fb..21f44243b 100644 --- a/libs/video/renderer/glsl/glsl_iqm.c +++ b/libs/video/renderer/glsl/glsl_iqm.c @@ -253,7 +253,7 @@ glsl_R_DrawIQM (entity_t *ent) qfeglBindBuffer (GL_ELEMENT_ARRAY_BUFFER, glsl->element_array); qfeglUniformMatrix4fv (iqm_shader.mvp_matrix.location, 1, false, - &mvp_mat[0][0]); + (vec_t*)&mvp_mat[0]);//FIXME qfeglUniformMatrix3fv (iqm_shader.norm_matrix.location, 1, false, norm_mat); qfeglUniformMatrix4fv (iqm_shader.bonemats.location, iqm->num_joints, diff --git a/libs/video/renderer/glsl/glsl_particles.c b/libs/video/renderer/glsl/glsl_particles.c index 89645e72c..a4caefa6f 100644 --- a/libs/video/renderer/glsl/glsl_particles.c +++ b/libs/video/renderer/glsl/glsl_particles.c @@ -247,7 +247,7 @@ draw_qf_particles (psystem_t *psystem) qfeglUniform4fv (quake_part.fog.location, 1, fog); qfeglUniformMatrix4fv (quake_part.mvp_matrix.location, 1, false, - &vp_mat[0][0]); + (vec_t*)&vp_mat[0]);//FIXME qfeglUniform1i (quake_part.texture.location, 0); qfeglActiveTexture (GL_TEXTURE0 + 0); @@ -366,7 +366,7 @@ draw_id_particles (psystem_t *psystem) qfeglEnableVertexAttribArray (quake_point.color.location); qfeglUniformMatrix4fv (quake_point.mvp_matrix.location, 1, false, - &vp_mat[0][0]); + (vec_t*)&vp_mat[0]);//FIXME Fog_GetColor (fog); fog[3] = Fog_GetDensity () / 64.0; diff --git a/libs/video/renderer/glsl/glsl_sprite.c b/libs/video/renderer/glsl/glsl_sprite.c index 913217cfe..baac6108e 100644 --- a/libs/video/renderer/glsl/glsl_sprite.c +++ b/libs/video/renderer/glsl/glsl_sprite.c @@ -289,7 +289,7 @@ glsl_R_SpriteBegin (void) qfeglBindTexture (GL_TEXTURE_2D, glsl_palette); mmulf (mat, glsl_projection, glsl_view); - qfeglUniformMatrix4fv (quake_sprite.matrix.location, 1, false, &mat[0][0]); + qfeglUniformMatrix4fv (quake_sprite.matrix.location, 1, false, (vec_t*)&mat[0]);//FIXME } void diff --git a/libs/video/renderer/r_main.c b/libs/video/renderer/r_main.c index a32826dff..d29bcd1a4 100644 --- a/libs/video/renderer/r_main.c +++ b/libs/video/renderer/r_main.c @@ -100,13 +100,13 @@ R_SetFrustum (plane_t *frustum, const refframe_t *frame, fov_y = 90 - fov_y / 2; // rotate FWD right by FOV_X/2 degrees - RotatePointAroundVector (frustum[0].normal, &up[0], &fwd[0], -fov_x); + RotatePointAroundVector (frustum[0].normal, (vec_t*)&up, (vec_t*)&fwd, -fov_x);//FIXME // rotate FWD left by FOV_X/2 degrees - RotatePointAroundVector (frustum[1].normal, &up[0], &fwd[0], fov_x); + RotatePointAroundVector (frustum[1].normal, (vec_t*)&up, (vec_t*)&fwd, fov_x);//FIXME // rotate FWD up by FOV_Y/2 degrees - RotatePointAroundVector (frustum[2].normal, &right[0], &fwd[0], fov_y); + RotatePointAroundVector (frustum[2].normal, (vec_t*)&right, (vec_t*)&fwd, fov_y);//FIXME // rotate FWD down by FOV_Y/2 degrees - RotatePointAroundVector (frustum[3].normal, &right[0], &fwd[0], -fov_y); + RotatePointAroundVector (frustum[3].normal, (vec_t*)&right, (vec_t*)&fwd, -fov_y);//FIXME vec4f_t origin = frame->position; for (i = 0; i < 4; i++) { diff --git a/libs/video/renderer/r_screen.c b/libs/video/renderer/r_screen.c index cd8ff5102..2ebc122be 100644 --- a/libs/video/renderer/r_screen.c +++ b/libs/video/renderer/r_screen.c @@ -271,7 +271,7 @@ SCR_UpdateScreen (transform_t *camera, double realtime, SCR_Func *scr_funcs) refdef->viewleaf = 0; if (refdef->worldmodel) { vec4f_t position = refdef->frame.position; - refdef->viewleaf = Mod_PointInLeaf (&position[0], refdef->worldmodel); + refdef->viewleaf = Mod_PointInLeaf ((vec_t*)&position, refdef->worldmodel);//FIXME r_dowarpold = r_dowarp; if (r_waterwarp->int_val) { r_dowarp = refdef->viewleaf->contents <= CONTENTS_WATER; diff --git a/libs/video/renderer/sw/d_edge.c b/libs/video/renderer/sw/d_edge.c index 60590c4d3..a1fd07616 100644 --- a/libs/video/renderer/sw/d_edge.c +++ b/libs/video/renderer/sw/d_edge.c @@ -210,7 +210,7 @@ D_DrawSurfaces (void) transform = s->entity->transform; local_modelorg = r_refdef.frame.position - Transform_GetWorldPosition (transform); - TransformVector (&local_modelorg[0], transformed_modelorg); + TransformVector ((vec_t*)&local_modelorg, transformed_modelorg);//FIXME R_RotateBmodel (transform); // FIXME: don't mess with the // frustum, make entity passed in @@ -241,7 +241,7 @@ D_DrawSurfaces (void) transform_t *transform = s->entity->transform; local_modelorg = r_refdef.frame.position - Transform_GetWorldPosition (transform); - TransformVector (&local_modelorg[0], transformed_modelorg); + TransformVector ((vec_t*)&local_modelorg, transformed_modelorg);//FIXME R_RotateBmodel (transform); // FIXME: don't mess with the // frustum, make entity passed in diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c index 53c4d65a3..80da6abaa 100644 --- a/libs/video/renderer/vulkan/vulkan_bsp.c +++ b/libs/video/renderer/vulkan/vulkan_bsp.c @@ -604,7 +604,7 @@ R_DrawBrushModel (entity_t *e, vulkan_ctx_t *ctx) if (mat[0][0] != 1 || mat[1][1] != 1 || mat[2][2] != 1) { rotated = true; radius = model->radius; - if (R_CullSphere (r_refdef.frustum, &mat[3][0], radius)) { //FIXME + if (R_CullSphere (r_refdef.frustum, (vec_t*)&mat[3], radius)) { //FIXME return; } } else { diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c index 475ede102..2bf14fe2c 100644 --- a/nq/source/cl_parse.c +++ b/nq/source/cl_parse.c @@ -572,7 +572,7 @@ CL_ParseClientdata (void) else cl.frameVelocity[0][i] = 0; } - AngleQuat (punchangle, &cl.viewstate.punchangle[0]);//FIXME + AngleQuat (punchangle, (vec_t*)&cl.viewstate.punchangle);//FIXME //FIXME //if (!VectorCompare (v_punchangles[0], cl.punchangle[0])) { diff --git a/nq/source/cl_screen.c b/nq/source/cl_screen.c index 70333bc4d..3fd0a3bf5 100644 --- a/nq/source/cl_screen.c +++ b/nq/source/cl_screen.c @@ -82,8 +82,7 @@ SCR_CShift (void) if (cls.state == ca_active && cl_world.worldmodel) { vec4f_t origin; origin = Transform_GetWorldPosition (cl.viewstate.camera_transform); - //FIXME - leaf = Mod_PointInLeaf (&origin[0], cl_world.worldmodel); + leaf = Mod_PointInLeaf ((vec_t*)&origin, cl_world.worldmodel);//FIXME contents = leaf->contents; } V_SetContentsColor (&cl.viewstate, contents); diff --git a/nq/source/host.c b/nq/source/host.c index 5ec8ee16e..16b029e13 100644 --- a/nq/source/host.c +++ b/nq/source/host.c @@ -613,7 +613,7 @@ Host_ClientFrame (void) vec4f_t origin; origin = Transform_GetWorldPosition (cl.viewstate.camera_transform); - l = Mod_PointInLeaf (&origin[0], cl_world.worldmodel);//FIXME + l = Mod_PointInLeaf ((vec_t*)&origin, cl_world.worldmodel);//FIXME if (l) asl = l->ambient_sound_level; S_Update (cl.viewstate.camera_transform, asl); diff --git a/nq/source/sv_main.c b/nq/source/sv_main.c index d1d795de8..21a18fbfc 100644 --- a/nq/source/sv_main.c +++ b/nq/source/sv_main.c @@ -1037,7 +1037,7 @@ SV_CreateBaseline (void) MSG_WriteByte (&sv.signon, baseline->colormap); MSG_WriteByte (&sv.signon, baseline->skinnum); - MSG_WriteCoordAngleV (&sv.signon, &baseline->origin[0],//FIXME + MSG_WriteCoordAngleV (&sv.signon, (vec_t*)&baseline->origin,//FIXME baseline->angles); if (bits & B_ALPHA) diff --git a/qtv/source/client.c b/qtv/source/client.c index 5feee07d7..9113d2b7d 100644 --- a/qtv/source/client.c +++ b/qtv/source/client.c @@ -683,7 +683,7 @@ write_player (int num, plent_state_t *pl, server_t *sv, sizebuf_t *msg) MSG_WriteByte (msg, num); MSG_WriteShort (msg, pflags); - MSG_WriteCoordV (msg, &pl->es.origin[0]);//FIXME + MSG_WriteCoordV (msg, (vec_t*)&pl->es.origin);//FIXME pl->es.origin[3] = 1; MSG_WriteByte (msg, pl->es.frame); diff --git a/qtv/source/sv_parse.c b/qtv/source/sv_parse.c index ba31950dc..db4a8c3e7 100644 --- a/qtv/source/sv_parse.c +++ b/qtv/source/sv_parse.c @@ -615,7 +615,7 @@ parse_player_delta (qmsg_t *msg, plent_state_t *from, plent_state_t *to) int flags; flags = to->es.flags = MSG_ReadShort (msg); - MSG_ReadCoordV (msg, &to->es.origin[0]); + MSG_ReadCoordV (msg, (vec_t*)&to->es.origin);//FIXME to->es.frame = (to->es.frame & 0xff00) | MSG_ReadByte (msg); if (flags & PF_MSEC) to->msec = MSG_ReadByte (msg); @@ -852,7 +852,7 @@ parse_baseline (qmsg_t *msg, entity_state_t *ent) ent->frame = MSG_ReadByte (msg); ent->colormap = MSG_ReadByte (msg); ent->skinnum = MSG_ReadByte (msg); - MSG_ReadCoordAngleV (msg, &ent->origin[0], ent->angles); //FIXME + MSG_ReadCoordAngleV (msg, (vec_t*)&ent->origin, ent->angles); //FIXME ent->origin[3] = 1; ent->colormod = 255; ent->alpha = 255; diff --git a/qw/source/cl_cam.c b/qw/source/cl_cam.c index d5d75ce22..e41e76a5f 100644 --- a/qw/source/cl_cam.c +++ b/qw/source/cl_cam.c @@ -191,7 +191,7 @@ Cam_Lock (int playernum) } static trace_t -Cam_DoTrace (vec3_t vec1, vec3_t vec2) +Cam_DoTrace (vec4f_t vec1, vec3_t vec2)//FIXME vec2 type { #if 0 memset (&pmove, 0, sizeof (pmove)); @@ -220,7 +220,7 @@ Cam_TryFlyby (player_state_t * self, player_state_t * player, vec3_t vec, VectorMultAdd (player->pls.es.origin, 800, vec, v); // v is endpos // fake a player move - trace = Cam_DoTrace (&player->pls.es.origin[0], v);//FIXME + trace = Cam_DoTrace (player->pls.es.origin, v); if ( /* trace.inopen || */ trace.inwater) return 9999; VectorCopy (trace.endpos, vec); @@ -229,7 +229,7 @@ Cam_TryFlyby (player_state_t * self, player_state_t * player, vec3_t vec, if (len < 32 || len > 800) return 9999; if (checkvis) { - trace = Cam_DoTrace (&self->pls.es.origin[0], vec);//FIXME + trace = Cam_DoTrace (self->pls.es.origin, vec); if (trace.fraction != 1 || trace.inwater) return 9999; @@ -247,7 +247,7 @@ Cam_IsVisible (player_state_t *player, vec3_t vec) trace_t trace; vec3_t v; - trace = Cam_DoTrace (&player->pls.es.origin[0], vec);//FIXME + trace = Cam_DoTrace (player->pls.es.origin, vec); if (trace.fraction != 1 || /* trace.inopen || */ trace.inwater) return false; // check distance, don't let the player get too far away or too close diff --git a/qw/source/cl_demo.c b/qw/source/cl_demo.c index 2a5069db4..91fd7ced3 100644 --- a/qw/source/cl_demo.c +++ b/qw/source/cl_demo.c @@ -767,7 +767,7 @@ demo_start_recording (int track) MSG_WriteByte (&buf, es->frame); MSG_WriteByte (&buf, 0); MSG_WriteByte (&buf, es->skinnum); - MSG_WriteCoordAngleV (&buf, &es->origin[0], &es->angles[0]); + MSG_WriteCoordAngleV (&buf, (vec_t*)&es->origin, es->angles);//FIXME if (buf.cursize > MAX_MSGLEN / 2) { CL_WriteRecordDemoMessage (&buf, seq++); @@ -791,7 +791,7 @@ demo_start_recording (int track) MSG_WriteByte (&buf, es->frame); MSG_WriteByte (&buf, es->colormap); MSG_WriteByte (&buf, es->skinnum); - MSG_WriteCoordAngleV (&buf, &es->origin[0], es->angles);//FIXME + MSG_WriteCoordAngleV (&buf, (vec_t*)&es->origin, es->angles);//FIXME if (buf.cursize > MAX_MSGLEN / 2) { CL_WriteRecordDemoMessage (&buf, seq++); diff --git a/qw/source/cl_entparse.c b/qw/source/cl_entparse.c index 550a8b308..80ec0112e 100644 --- a/qw/source/cl_entparse.c +++ b/qw/source/cl_entparse.c @@ -430,7 +430,7 @@ CL_ParsePlayerinfo (void) flags = state->pls.es.flags = MSG_ReadShort (net_message); state->messagenum = cl.parsecount; - MSG_ReadCoordV (net_message, &state->pls.es.origin[0]);//FIXME + MSG_ReadCoordV (net_message, (vec_t*)&state->pls.es.origin);//FIXME state->pls.es.origin[3] = 1; state->pls.es.frame = MSG_ReadByte (net_message); diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c index 6777a822f..bdc7a3996 100644 --- a/qw/source/cl_main.c +++ b/qw/source/cl_main.c @@ -1731,7 +1731,7 @@ Host_Frame (float time) vec4f_t origin; origin = Transform_GetWorldPosition (cl.viewstate.camera_transform); - l = Mod_PointInLeaf (&origin[0], cl_world.worldmodel);//FIXME + l = Mod_PointInLeaf ((vec_t*)&origin, cl_world.worldmodel);//FIXME if (l) asl = l->ambient_sound_level; S_Update (cl.viewstate.camera_transform, asl); diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c index 0d3cac20b..c7478445d 100644 --- a/qw/source/cl_parse.c +++ b/qw/source/cl_parse.c @@ -1457,7 +1457,7 @@ CL_ParseServerMessage (void) SCR_SetFullscreen (1); cl.completed_time = realtime; Sys_MaskPrintf (SYS_dev, "intermission simorg: "); - MSG_ReadCoordV (net_message, &cl.viewstate.player_origin[0]);//FIXME + MSG_ReadCoordV (net_message, (vec_t*)&cl.viewstate.player_origin);//FIXME cl.viewstate.player_origin[3] = 1; Sys_MaskPrintf (SYS_dev, VEC4F_FMT, VEC4_EXP (cl.viewstate.player_origin)); diff --git a/qw/source/cl_screen.c b/qw/source/cl_screen.c index 3242a7ebe..de8d13cf0 100644 --- a/qw/source/cl_screen.c +++ b/qw/source/cl_screen.c @@ -81,8 +81,7 @@ SCR_CShift (void) if (cls.state == ca_active && cl_world.worldmodel) { vec4f_t origin; origin = Transform_GetWorldPosition (cl.viewstate.camera_transform); - //FIXME - leaf = Mod_PointInLeaf (&origin[0], cl_world.worldmodel); + leaf = Mod_PointInLeaf ((vec_t*)&origin, cl_world.worldmodel);//FIXME contents = leaf->contents; } V_SetContentsColor (&cl.viewstate, contents); diff --git a/qw/source/sv_ents.c b/qw/source/sv_ents.c index e38c2ca67..b5c7df94c 100644 --- a/qw/source/sv_ents.c +++ b/qw/source/sv_ents.c @@ -509,7 +509,7 @@ write_player (delta_t *delta, plent_state_t *from, plent_state_t *to, MSG_WriteByte (msg, to->es.number); MSG_WriteShort (msg, flags); - MSG_WriteCoordV (msg, &to->es.origin[0]);//FIXME + MSG_WriteCoordV (msg, (vec_t*)&to->es.origin);//FIXME MSG_WriteByte (msg, to->es.frame); diff --git a/qw/source/sv_init.c b/qw/source/sv_init.c index 929cd4853..6f0d9753f 100644 --- a/qw/source/sv_init.c +++ b/qw/source/sv_init.c @@ -165,8 +165,9 @@ SV_CreateBaseline (void) MSG_WriteByte (&sv.signon, SVdata (svent)->state.colormap); MSG_WriteByte (&sv.signon, SVdata (svent)->state.skinnum); - MSG_WriteCoordAngleV (&sv.signon, &SVdata (svent)->state.origin[0], - SVdata (svent)->state.angles);//FIXME + MSG_WriteCoordAngleV (&sv.signon, + (vec_t*)&SVdata (svent)->state.origin,//FIXME + SVdata (svent)->state.angles); } }