summaryrefslogtreecommitdiff
path: root/source/sw_misc.c
diff options
context:
space:
mode:
authorAndrey Nazarov <skuller@skuller.net>2008-08-16 10:19:42 +0000
committerAndrey Nazarov <skuller@skuller.net>2008-08-16 10:19:42 +0000
commit1526e22e4ff29153e9c127081e8ea8d9e2f33b8c (patch)
treeb361766433d4a7b4a111865afd52803e2bbf7754 /source/sw_misc.c
parente826e5f176f21cd18b3bbc22887a266835ada57c (diff)
Split some monolithic include files into smaller ones.
Use single BSP models cache for refresh and collision subsystems. Refresh libraries may not longer be dynamically loaded. Made gi.TagMalloc use separate tag namespace to avoid conflicts with engine reserverd tags. Fixed listing order of MVD channels in chooser menu. A lot of misc changes... MSVC build is definitely broken now.
Diffstat (limited to 'source/sw_misc.c')
-rw-r--r--source/sw_misc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/sw_misc.c b/source/sw_misc.c
index c23db4a..d16891b 100644
--- a/source/sw_misc.c
+++ b/source/sw_misc.c
@@ -110,7 +110,7 @@ void D_ViewChanged (void)
if ( r_newrefdef.rdflags & RDF_NOWORLDMODEL )
{
memset( d_pzbuffer, 0xff, vid.width * vid.height * sizeof( d_pzbuffer[0] ) );
- Draw_Fill( r_newrefdef.x, r_newrefdef.y, r_newrefdef.width, r_newrefdef.height, /*( int ) sw_clearcolor->value & 0xff*/0 );
+ R_DrawFill( r_newrefdef.x, r_newrefdef.y, r_newrefdef.width, r_newrefdef.height, /*( int ) sw_clearcolor->value & 0xff*/0 );
}
D_Patch ();
@@ -128,7 +128,7 @@ void R_PrintTimes (void)
int r_time2;
int ms;
- r_time2 = sys.Milliseconds ();
+ r_time2 = Sys_Milliseconds ();
ms = r_time2 - r_time1;
@@ -147,7 +147,7 @@ void R_PrintDSpeeds (void)
{
int ms, dp_time, r_time2, rw_time, db_time, se_time, de_time, da_time;
- r_time2 = sys.Milliseconds ();
+ r_time2 = Sys_Milliseconds ();
da_time = (da_time2 - da_time1);
dp_time = (dp_time2 - dp_time1);
@@ -218,7 +218,7 @@ void TransformVector (vec3_t in, vec3_t out)
R_TransformPlane
================
*/
-void R_TransformPlane (mplane_t *p, float *normal, float *dist)
+void R_TransformPlane (cplane_t *p, float *normal, float *dist)
{
float d;
@@ -388,11 +388,11 @@ void R_SetupFrame (void)
// current viewleaf
if ( !( r_newrefdef.rdflags & RDF_NOWORLDMODEL ) )
{
- r_viewleaf = Mod_PointInLeaf (r_origin, r_worldmodel);
+ r_viewleaf = BSP_PointLeaf (r_worldmodel->nodes, r_origin);
r_viewcluster = r_viewleaf->cluster;
}
- if (sw_waterwarp->value && (r_newrefdef.rdflags & RDF_UNDERWATER) )
+ if (sw_waterwarp->integer && (r_newrefdef.rdflags & RDF_UNDERWATER) )
r_dowarp = qtrue;
else
r_dowarp = qfalse;