diff --git a/ref/soft/r_context.c b/ref/soft/r_context.c index fb9fec98..d2555937 100644 --- a/ref/soft/r_context.c +++ b/ref/soft/r_context.c @@ -563,8 +563,8 @@ int EXPORT GetRefAPI( int version, ref_interface_t *funcs, ref_api_t *engfuncs, return 0; // fill in our callbacks - memcpy( funcs, &gReffuncs, sizeof( ref_interface_t )); - memcpy( &gEngfuncs, engfuncs, sizeof( ref_api_t )); + *funcs = gReffuncs; + gEngfuncs = *engfuncs; gpGlobals = globals; gp_cl = (ref_client_t *)ENGINE_GET_PARM( PARM_GET_CLIENT_PTR ); diff --git a/ref/soft/r_part.c b/ref/soft/r_part.c index 19bd04ba..c40852da 100644 --- a/ref/soft/r_part.c +++ b/ref/soft/r_part.c @@ -291,7 +291,6 @@ void GAME_EXPORT CL_DrawParticlesExternal( const ref_viewpass_t *rvp, qboolean t { ref_instance_t oldRI = RI; - memcpy( &oldRI, &RI, sizeof( ref_instance_t )); R_SetupRefParams( rvp ); R_SetupFrustum(); // R_SetupGL( false ); // don't touch GL-states @@ -303,5 +302,5 @@ void GAME_EXPORT CL_DrawParticlesExternal( const ref_viewpass_t *rvp, qboolean t gEngfuncs.CL_DrawEFX( frametime, trans_pass ); // restore internal state - memcpy( &RI, &oldRI, sizeof( ref_instance_t )); + RI = oldRI; } diff --git a/ref/soft/r_sprite.c b/ref/soft/r_sprite.c index 5acda0bd..d7aa9ae1 100644 --- a/ref/soft/r_sprite.c +++ b/ref/soft/r_sprite.c @@ -54,7 +54,7 @@ static const byte *R_SpriteLoadFrame( model_t *mod, const void *pin, mspritefram char texname[128]; int bytes = 1; - memcpy( &pinframe, pin, sizeof(dspriteframe_t)); + memcpy( &pinframe, pin, sizeof( dspriteframe_t )); if( sprite_version == SPRITE_VERSION_32 ) bytes = 4;