[openjk] 06/23: Change refimport ri from ptr type to value type
Simon McVittie
smcv at debian.org
Thu Jan 11 17:28:59 UTC 2018
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository openjk.
commit ae3900fcd8bc19a9322c506977af24bb627e3794
Author: Xycaleth <alex at acslo.com>
Date: Sun Dec 24 13:18:39 2017 +0000
Change refimport ri from ptr type to value type
This is mainly for making it similar to the SP renderer. ri. was
preferred over ri-> as there is one less level of indirection (and so
potentially more performant).
The shell command
sed -i '' 's/ri\->\([A-Z]\)/ri.\1/g' *.cpp
was run to do the majority of the find/replace.
---
codemp/ghoul2/G2_gore.cpp | 2 +-
codemp/rd-common/tr_common.h | 2 +-
codemp/rd-common/tr_font.cpp | 40 +--
codemp/rd-common/tr_image_jpg.cpp | 8 +-
codemp/rd-common/tr_image_load.cpp | 4 +-
codemp/rd-common/tr_image_png.cpp | 40 +--
codemp/rd-common/tr_image_tga.cpp | 4 +-
codemp/rd-dedicated/G2_API.cpp | 20 +-
codemp/rd-dedicated/G2_bones.cpp | 6 +-
codemp/rd-dedicated/G2_misc.cpp | 4 +-
codemp/rd-dedicated/tr_ghoul2.cpp | 6 +-
codemp/rd-dedicated/tr_init.cpp | 274 ++++++++--------
codemp/rd-dedicated/tr_local.h | 3 +-
codemp/rd-dedicated/tr_main.cpp | 2 +-
codemp/rd-dedicated/tr_model.cpp | 42 +--
codemp/rd-dedicated/tr_shader.cpp | 8 +-
codemp/rd-dedicated/tr_skin.cpp | 12 +-
codemp/rd-vanilla/G2_API.cpp | 50 +--
codemp/rd-vanilla/G2_bolts.cpp | 2 +-
codemp/rd-vanilla/G2_bones.cpp | 72 ++---
codemp/rd-vanilla/G2_misc.cpp | 20 +-
codemp/rd-vanilla/glext.h | 2 +-
codemp/rd-vanilla/tr_WorldEffects.cpp | 60 ++--
codemp/rd-vanilla/tr_backend.cpp | 22 +-
codemp/rd-vanilla/tr_bsp.cpp | 50 +--
codemp/rd-vanilla/tr_cmds.cpp | 24 +-
codemp/rd-vanilla/tr_ghoul2.cpp | 24 +-
codemp/rd-vanilla/tr_image.cpp | 94 +++---
codemp/rd-vanilla/tr_init.cpp | 554 ++++++++++++++++----------------
codemp/rd-vanilla/tr_light.cpp | 2 +-
codemp/rd-vanilla/tr_local.h | 2 -
codemp/rd-vanilla/tr_main.cpp | 8 +-
codemp/rd-vanilla/tr_mesh.cpp | 6 +-
codemp/rd-vanilla/tr_model.cpp | 74 ++---
codemp/rd-vanilla/tr_scene.cpp | 14 +-
codemp/rd-vanilla/tr_shade.cpp | 4 +-
codemp/rd-vanilla/tr_shade_calc.cpp | 8 +-
codemp/rd-vanilla/tr_shader.cpp | 334 +++++++++----------
codemp/rd-vanilla/tr_skin.cpp | 30 +-
codemp/rd-vanilla/tr_subs.cpp | 22 +-
codemp/rd-vanilla/tr_surface.cpp | 2 +-
codemp/rd-vanilla/tr_surfacesprites.cpp | 2 +-
codemp/rd-vanilla/tr_terrain.cpp | 28 +-
codemp/rd-vanilla/tr_world.cpp | 32 +-
44 files changed, 1008 insertions(+), 1011 deletions(-)
diff --git a/codemp/ghoul2/G2_gore.cpp b/codemp/ghoul2/G2_gore.cpp
index 719d1de..f821093 100644
--- a/codemp/ghoul2/G2_gore.cpp
+++ b/codemp/ghoul2/G2_gore.cpp
@@ -34,7 +34,7 @@ GoreTextureCoordinates::~GoreTextureCoordinates()
{
if ( tex[i] )
{
- ri->Z_Free(tex[i]);
+ ri.Z_Free(tex[i]);
tex[i] = NULL;
}
}
diff --git a/codemp/rd-common/tr_common.h b/codemp/rd-common/tr_common.h
index 2f7be80..9dc5a26 100644
--- a/codemp/rd-common/tr_common.h
+++ b/codemp/rd-common/tr_common.h
@@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "../rd-common/tr_public.h"
#include "../rd-common/tr_font.h"
-extern refimport_t *ri;
+extern refimport_t ri;
/*
================================================================================
diff --git a/codemp/rd-common/tr_font.cpp b/codemp/rd-common/tr_font.cpp
index 029ff20..0e80477 100644
--- a/codemp/rd-common/tr_font.cpp
+++ b/codemp/rd-common/tr_font.cpp
@@ -146,7 +146,7 @@ struct ThaiCodes_t
//
// read the valid-codes table in...
//
- int iBytesRead = ri->FS_ReadFile( sFILENAME_THAI_CODES, (void **) &piData );
+ int iBytesRead = ri.FS_ReadFile( sFILENAME_THAI_CODES, (void **) &piData );
if (iBytesRead > 0 && !(iBytesRead&3)) // valid length and multiple of 4 bytes long
{
int iTableEntries = iBytesRead / sizeof(int);
@@ -155,18 +155,18 @@ struct ThaiCodes_t
{
m_mapValidCodes[ piData[i] ] = i; // convert MBCS code to sequential index...
}
- ri->FS_FreeFile( piData ); // dispose of original
+ ri.FS_FreeFile( piData ); // dispose of original
// now read in the widths... (I'll keep these in a simple STL vector, so they'all disappear when the <map> entries do...
//
- iBytesRead = ri->FS_ReadFile( sFILENAME_THAI_WIDTHS, (void **) &piData );
+ iBytesRead = ri.FS_ReadFile( sFILENAME_THAI_WIDTHS, (void **) &piData );
if (iBytesRead > 0 && !(iBytesRead&3) && iBytesRead>>2/*sizeof(int)*/ == iTableEntries)
{
for (int i=0; i<iTableEntries; i++)
{
m_viGlyphWidths.push_back( piData[i] );
}
- ri->FS_FreeFile( piData ); // dispose of original
+ ri.FS_FreeFile( piData ); // dispose of original
}
else
{
@@ -864,10 +864,10 @@ CFontInfo::CFontInfo(const char *_fontName)
m_fAltSBCSFontScaleFactor = -1;
m_bIsFakeAlienLanguage = !strcmp(_fontName,"aurabesh"); // dont try and make SBCS or asian overrides for this
- len = ri->FS_ReadFile(fontName, NULL);
+ len = ri.FS_ReadFile(fontName, NULL);
if (len == sizeof(dfontdat_t))
{
- ri->FS_ReadFile(fontName, &buff);
+ ri.FS_ReadFile(fontName, &buff);
fontdat = (dfontdat_t *)buff;
for(i = 0; i < GLYPH_COUNT; i++)
@@ -902,7 +902,7 @@ CFontInfo::CFontInfo(const char *_fontName)
mDescender = mHeight - mAscender;
}
- ri->FS_FreeFile(buff);
+ ri.FS_FreeFile(buff);
}
else
{
@@ -922,7 +922,7 @@ CFontInfo::CFontInfo(const char *_fontName)
g_vFontArray[g_iCurrentFontIndex++] = this;
- if ( ri->Cvar_VariableIntegerValue( "com_buildScript" ) == 2)
+ if ( ri.Cvar_VariableIntegerValue( "com_buildScript" ) == 2)
{
Com_Printf( "com_buildScript(2): Registering foreign fonts...\n" );
static qboolean bDone = qfalse; // Do this once only (for speed)...
@@ -942,12 +942,12 @@ CFontInfo::CFontInfo(const char *_fontName)
char sTemp[MAX_QPATH];
sprintf(sTemp,"fonts/%s.tga", g_SBCSOverrideLanguages[i].m_psName );
- ri->FS_FOpenFileRead( sTemp, &f, qfalse );
- if (f) ri->FS_FCloseFile( f );
+ ri.FS_FOpenFileRead( sTemp, &f, qfalse );
+ if (f) ri.FS_FCloseFile( f );
sprintf(sTemp,"fonts/%s.fontdat", g_SBCSOverrideLanguages[i].m_psName );
- ri->FS_FOpenFileRead( sTemp, &f, qfalse );
- if (f) ri->FS_FCloseFile( f );
+ ri.FS_FOpenFileRead( sTemp, &f, qfalse );
+ if (f) ri.FS_FCloseFile( f );
}
// asian MBCS override languages...
@@ -964,14 +964,14 @@ CFontInfo::CFontInfo(const char *_fontName)
{
// additional files needed for Thai language...
//
- ri->FS_FOpenFileRead( sFILENAME_THAI_WIDTHS , &f, qfalse );
+ ri.FS_FOpenFileRead( sFILENAME_THAI_WIDTHS , &f, qfalse );
if (f) {
- ri->FS_FCloseFile( f );
+ ri.FS_FCloseFile( f );
}
- ri->FS_FOpenFileRead( sFILENAME_THAI_CODES, &f, qfalse );
+ ri.FS_FOpenFileRead( sFILENAME_THAI_CODES, &f, qfalse );
if (f) {
- ri->FS_FCloseFile( f );
+ ri.FS_FCloseFile( f );
}
}
break;
@@ -982,9 +982,9 @@ CFontInfo::CFontInfo(const char *_fontName)
Com_sprintf(sTemp,sizeof(sTemp), "fonts/%s_%d_1024_%d.tga", psLang, 1024/m_iAsianGlyphsAcross, i);
// RE_RegisterShaderNoMip( sTemp ); // don't actually need to load it, so...
- ri->FS_FOpenFileRead( sTemp, &f, qfalse );
+ ri.FS_FOpenFileRead( sTemp, &f, qfalse );
if (f) {
- ri->FS_FCloseFile( f );
+ ri.FS_FCloseFile( f );
}
}
}
@@ -1032,7 +1032,7 @@ void CFontInfo::UpdateAsianIfNeeded( bool bForceReEval /* = false */ )
{
// failed to load a needed file, reset to English...
//
- ri->Cvar_Set("se_language", "english");
+ ri.Cvar_Set("se_language", "english");
Com_Error( ERR_DROP, psFailureReason );
}
}
@@ -1481,7 +1481,7 @@ void RE_Font_DrawString(int ox, int oy, const char *psText, const float *rgba, c
if(iFontHandle & STYLE_BLINK)
{
- if((ri->Milliseconds() >> 7) & 1)
+ if((ri.Milliseconds() >> 7) & 1)
{
return;
}
diff --git a/codemp/rd-common/tr_image_jpg.cpp b/codemp/rd-common/tr_image_jpg.cpp
index 504e0c5..e94d0ed 100644
--- a/codemp/rd-common/tr_image_jpg.cpp
+++ b/codemp/rd-common/tr_image_jpg.cpp
@@ -89,7 +89,7 @@ void LoadJPG( const char *filename, unsigned char **pic, int *width, int *height
* requires it in order to read binary files.
*/
- int len = ri->FS_ReadFile ( ( char * ) filename, &fbuffer.v);
+ int len = ri.FS_ReadFile ( ( char * ) filename, &fbuffer.v);
if (!fbuffer.b || len < 0) {
return;
}
@@ -150,7 +150,7 @@ void LoadJPG( const char *filename, unsigned char **pic, int *width, int *height
)
{
// Free the memory to make sure we don't leak memory
- ri->FS_FreeFile (fbuffer.v);
+ ri.FS_FreeFile (fbuffer.v);
jpeg_destroy_decompress(&cinfo);
Com_Printf("LoadJPG: %s has an invalid image format: %dx%d*4=%d, components: %d", filename,
@@ -213,7 +213,7 @@ void LoadJPG( const char *filename, unsigned char **pic, int *width, int *height
* so as to simplify the setjmp error logic above. (Actually, I don't
* think that jpeg_destroy can do an error exit, but why assume anything...)
*/
- ri->FS_FreeFile (fbuffer.v);
+ ri.FS_FreeFile (fbuffer.v);
/* At this point you may want to check to see whether any corrupt-data
* warnings occurred (test whether jerr.pub.num_warnings is nonzero).
*/
@@ -414,7 +414,7 @@ void RE_SaveJPG(const char * filename, int quality, int image_width, int image_h
out = (byte *)Hunk_AllocateTempMemory(bufSize);
bufSize = RE_SaveJPGToBuffer(out, bufSize, quality, image_width, image_height, image_buffer, padding);
- ri->FS_WriteFile(filename, out, bufSize);
+ ri.FS_WriteFile(filename, out, bufSize);
Hunk_FreeTempMemory(out);
}
diff --git a/codemp/rd-common/tr_image_load.cpp b/codemp/rd-common/tr_image_load.cpp
index d34a7c7..05b2054 100644
--- a/codemp/rd-common/tr_image_load.cpp
+++ b/codemp/rd-common/tr_image_load.cpp
@@ -60,13 +60,13 @@ qboolean R_ImageLoader_Add ( const char *extension, ImageLoaderFn imageLoader )
{
if ( numImageLoaders >= MAX_IMAGE_LOADERS )
{
- ri->Printf (PRINT_DEVELOPER, "R_AddImageLoader: Cannot add any more image loaders (maximum %d).\n", MAX_IMAGE_LOADERS);
+ ri.Printf (PRINT_DEVELOPER, "R_AddImageLoader: Cannot add any more image loaders (maximum %d).\n", MAX_IMAGE_LOADERS);
return qfalse;
}
if ( FindImageLoader (extension) != NULL )
{
- ri->Printf (PRINT_DEVELOPER, "R_AddImageLoader: Image loader already exists for extension \"%s\".\n", extension);
+ ri.Printf (PRINT_DEVELOPER, "R_AddImageLoader: Image loader already exists for extension \"%s\".\n", extension);
return qfalse;
}
diff --git a/codemp/rd-common/tr_image_png.cpp b/codemp/rd-common/tr_image_png.cpp
index 208b042..0bb6ecf 100644
--- a/codemp/rd-common/tr_image_png.cpp
+++ b/codemp/rd-common/tr_image_png.cpp
@@ -27,10 +27,10 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
void user_write_data( png_structp png_ptr, png_bytep data, png_size_t length ) {
fileHandle_t fp = *(fileHandle_t*)png_get_io_ptr( png_ptr );
- ri->FS_Write( data, length, fp );
+ ri.FS_Write( data, length, fp );
}
void user_flush_data( png_structp png_ptr ) {
- //TODO: ri->FS_Flush?
+ //TODO: ri.FS_Flush?
}
int RE_SavePNG( const char *filename, byte *buf, size_t width, size_t height, int byteDepth ) {
@@ -49,7 +49,7 @@ int RE_SavePNG( const char *filename, byte *buf, size_t width, size_t height, in
*/
int depth = 8;
- fp = ri->FS_FOpenFileWrite( filename, qtrue );
+ fp = ri.FS_FOpenFileWrite( filename, qtrue );
if ( !fp ) {
goto fopen_failed;
}
@@ -117,7 +117,7 @@ png_failure:
png_create_info_struct_failed:
png_destroy_write_struct (&png_ptr, &info_ptr);
png_create_write_struct_failed:
- ri->FS_FCloseFile( fp );
+ ri.FS_FCloseFile( fp );
fopen_failed:
return status;
}
@@ -125,12 +125,12 @@ fopen_failed:
void user_read_data( png_structp png_ptr, png_bytep data, png_size_t length );
void png_print_error ( png_structp png_ptr, png_const_charp err )
{
- ri->Printf (PRINT_ERROR, "%s\n", err);
+ ri.Printf (PRINT_ERROR, "%s\n", err);
}
void png_print_warning ( png_structp png_ptr, png_const_charp warning )
{
- ri->Printf (PRINT_WARNING, "%s\n", warning);
+ ri.Printf (PRINT_WARNING, "%s\n", warning);
}
bool IsPowerOfTwo ( int i ) { return (i & (i - 1)) == 0; }
@@ -140,7 +140,7 @@ struct PNGFileReader
PNGFileReader ( char *buf ) : buf(buf), offset(0), png_ptr(NULL), info_ptr(NULL) {}
~PNGFileReader()
{
- ri->FS_FreeFile (buf);
+ ri.FS_FreeFile (buf);
png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
}
@@ -159,14 +159,14 @@ struct PNGFileReader
if ( !png_check_sig (ident, SIGNATURE_LEN) )
{
- ri->Printf (PRINT_ERROR, "PNG signature not found in given image.");
+ ri.Printf (PRINT_ERROR, "PNG signature not found in given image.");
return 0;
}
png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, png_print_error, png_print_warning);
if ( png_ptr == NULL )
{
- ri->Printf (PRINT_ERROR, "Could not allocate enough memory to load the image.");
+ ri.Printf (PRINT_ERROR, "Could not allocate enough memory to load the image.");
return 0;
}
@@ -199,7 +199,7 @@ struct PNGFileReader
// so that the graphics driver doesn't have to fiddle about with the texture when uploading.
if ( !IsPowerOfTwo (width_) || !IsPowerOfTwo (height_) )
{
- ri->Printf (PRINT_ERROR, "Width or height is not a power-of-two.\n");
+ ri.Printf (PRINT_ERROR, "Width or height is not a power-of-two.\n");
return 0;
}
@@ -209,7 +209,7 @@ struct PNGFileReader
// PNG_COLOR_TYPE_GRAY.
if ( colortype != PNG_COLOR_TYPE_RGB && colortype != PNG_COLOR_TYPE_RGBA )
{
- ri->Printf (PRINT_ERROR, "Image is not 24-bit or 32-bit.");
+ ri.Printf (PRINT_ERROR, "Image is not 24-bit or 32-bit.");
return 0;
}
@@ -223,20 +223,20 @@ struct PNGFileReader
png_read_update_info (png_ptr, info_ptr);
// We always assume there are 4 channels. RGB channels are expanded to RGBA when read.
- byte *tempData = (byte *)ri->Z_Malloc (width_ * height_ * 4, TAG_TEMP_PNG, qfalse, 4);
+ byte *tempData = (byte *)ri.Z_Malloc (width_ * height_ * 4, TAG_TEMP_PNG, qfalse, 4);
if ( !tempData )
{
- ri->Printf (PRINT_ERROR, "Could not allocate enough memory to load the image.");
+ ri.Printf (PRINT_ERROR, "Could not allocate enough memory to load the image.");
return 0;
}
// Dynamic array of row pointers, with 'height' elements, initialized to NULL.
- byte **row_pointers = (byte **)ri->Hunk_AllocateTempMemory (sizeof (byte *) * height_);
+ byte **row_pointers = (byte **)ri.Hunk_AllocateTempMemory (sizeof (byte *) * height_);
if ( !row_pointers )
{
- ri->Printf (PRINT_ERROR, "Could not allocate enough memory to load the image.");
+ ri.Printf (PRINT_ERROR, "Could not allocate enough memory to load the image.");
- ri->Z_Free (tempData);
+ ri.Z_Free (tempData);
return 0;
}
@@ -244,8 +244,8 @@ struct PNGFileReader
// Re-set the jmp so that these new memory allocations can be reclaimed
if ( setjmp (png_jmpbuf (png_ptr)) )
{
- ri->Hunk_FreeTempMemory (row_pointers);
- ri->Z_Free (tempData);
+ ri.Hunk_FreeTempMemory (row_pointers);
+ ri.Z_Free (tempData);
return 0;
}
@@ -259,7 +259,7 @@ struct PNGFileReader
// Finish reading
png_read_end (png_ptr, NULL);
- ri->Hunk_FreeTempMemory (row_pointers);
+ ri.Hunk_FreeTempMemory (row_pointers);
// Finally assign all the parameters
*data = tempData;
@@ -292,7 +292,7 @@ void user_read_data( png_structp png_ptr, png_bytep data, png_size_t length ) {
void LoadPNG ( const char *filename, byte **data, int *width, int *height )
{
char *buf = NULL;
- int len = ri->FS_ReadFile (filename, (void **)&buf);
+ int len = ri.FS_ReadFile (filename, (void **)&buf);
if ( len < 0 || buf == NULL )
{
return;
diff --git a/codemp/rd-common/tr_image_tga.cpp b/codemp/rd-common/tr_image_tga.cpp
index 09ff775..58dbb7f 100644
--- a/codemp/rd-common/tr_image_tga.cpp
+++ b/codemp/rd-common/tr_image_tga.cpp
@@ -74,7 +74,7 @@ void LoadTGA ( const char *name, byte **pic, int *width, int *height)
// load the file
//
byte *pTempLoadedBuffer = 0;
- ri->FS_ReadFile ( ( char * ) name, (void **)&pTempLoadedBuffer);
+ ri.FS_ReadFile ( ( char * ) name, (void **)&pTempLoadedBuffer);
if (!pTempLoadedBuffer) {
return;
}
@@ -373,7 +373,7 @@ void LoadTGA ( const char *name, byte **pic, int *width, int *height)
TGADone:
- ri->FS_FreeFile (pTempLoadedBuffer);
+ ri.FS_FreeFile (pTempLoadedBuffer);
if (bFormatErrors)
{
diff --git a/codemp/rd-dedicated/G2_API.cpp b/codemp/rd-dedicated/G2_API.cpp
index 4b45ef6..a18edd3 100644
--- a/codemp/rd-dedicated/G2_API.cpp
+++ b/codemp/rd-dedicated/G2_API.cpp
@@ -242,7 +242,7 @@ qboolean G2API_OverrideServerWithClientData(CGhoul2Info_v& ghoul2, int modelInde
CGhoul2Info *serverInstance = &ghoul2[modelIndex];
CGhoul2Info *clientInstance;
- if (ri->Cvar_VariableIntegerValue( "dedicated" ))
+ if (ri.Cvar_VariableIntegerValue( "dedicated" ))
{ //No client to get from!
return qfalse;
}
@@ -552,15 +552,15 @@ void G2API_CleanGhoul2Models(CGhoul2Info_v **ghoul2Ptr)
qboolean G2_ShouldRegisterServer(void)
{
- if ( !ri->GetCurrentVM )
+ if ( !ri.GetCurrentVM )
return qfalse;
- vm_t *currentVM = ri->GetCurrentVM();
+ vm_t *currentVM = ri.GetCurrentVM();
if ( currentVM && currentVM->slot == VM_GAME )
{
- if ( ri->Cvar_VariableIntegerValue( "cl_running" ) &&
- ri->Com_TheHunkMarkHasBeenMade() && ShaderHashTableExists())
+ if ( ri.Cvar_VariableIntegerValue( "cl_running" ) &&
+ ri.Com_TheHunkMarkHasBeenMade() && ShaderHashTableExists())
{ //if the hunk has been marked then we are now loading client assets so don't load on server.
return qfalse;
}
@@ -2555,14 +2555,14 @@ void G2API_AddSkinGore(CGhoul2Info_v &ghoul2,SSkinGoreData &gore)
int lod;
ResetGoreTag();
- const int lodbias=Com_Clamp ( 0, 2,G2_DecideTraceLod(ghoul2[0], ri->Cvar_VariableIntegerValue( "r_lodbias" )));
+ const int lodbias=Com_Clamp ( 0, 2,G2_DecideTraceLod(ghoul2[0], ri.Cvar_VariableIntegerValue( "r_lodbias" )));
const int maxLod =Com_Clamp (0,ghoul2[0].currentModel->numLods,3); //limit to the number of lods the main model has
for(lod=lodbias;lod<maxLod;lod++)
{
// now having done that, time to build the model
- ri->GetG2VertSpaceServer()->ResetHeap();
+ ri.GetG2VertSpaceServer()->ResetHeap();
- G2_TransformModel(ghoul2, gore.currentTime, gore.scale,ri->GetG2VertSpaceServer(),lod,true);
+ G2_TransformModel(ghoul2, gore.currentTime, gore.scale,ri.GetG2VertSpaceServer(),lod,true);
// now walk each model and compute new texture coordinates
G2_TraceModels(ghoul2, transHitLocation, transRayDirection, 0, gore.entNum, 0,lod,0.0f,gore.SSize,gore.TSize,gore.theta,gore.shader,&gore,qtrue);
@@ -2580,7 +2580,7 @@ qboolean G2_TestModelPointers(CGhoul2Info *ghlInfo) // returns true if the model
ghlInfo->mValid=false;
if (ghlInfo->mModelindex != -1)
{
- if (ri->Cvar_VariableIntegerValue( "dedicated" ) ||
+ if (ri.Cvar_VariableIntegerValue( "dedicated" ) ||
(G2_ShouldRegisterServer())) //supreme hackery!
{
ghlInfo->mModel = RE_RegisterServerModel(ghlInfo->mFileName);
@@ -2671,7 +2671,7 @@ qboolean G2_SetupModelPointers(CGhoul2Info *ghlInfo) // returns true if the mode
// RJ - experimental optimization!
if (!ghlInfo->mModel || 1)
{
- if (ri->Cvar_VariableIntegerValue( "dedicated" ) ||
+ if (ri.Cvar_VariableIntegerValue( "dedicated" ) ||
(G2_ShouldRegisterServer())) //supreme hackery!
{
ghlInfo->mModel = RE_RegisterServerModel(ghlInfo->mFileName);
diff --git a/codemp/rd-dedicated/G2_bones.cpp b/codemp/rd-dedicated/G2_bones.cpp
index 65c5d67..1df9d71 100644
--- a/codemp/rd-dedicated/G2_bones.cpp
+++ b/codemp/rd-dedicated/G2_bones.cpp
@@ -2578,17 +2578,17 @@ int ragTraceCount = 0;
void Rag_Trace( trace_t *results, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, const int passEntityNum, const int contentmask, const EG2_Collision eG2TraceType, const int useLod )
{
#ifdef _DEBUG
- int ragPreTrace = ri->Milliseconds();
+ int ragPreTrace = ri.Milliseconds();
#endif
{
results->entityNum = ENTITYNUM_NONE;
//SV_Trace(results, start, mins, maxs, end, passEntityNum, contentmask, eG2TraceType, useLod);
- ri->CM_BoxTrace(results, start, end, mins, maxs, 0, contentmask, 0);
+ ri.CM_BoxTrace(results, start, end, mins, maxs, 0, contentmask, 0);
results->entityNum = results->fraction != 1.0 ? ENTITYNUM_WORLD : ENTITYNUM_NONE;
}
#ifdef _DEBUG
- int ragPostTrace = ri->Milliseconds();
+ int ragPostTrace = ri.Milliseconds();
ragTraceTime += (ragPostTrace - ragPreTrace);
if (results->startsolid)
diff --git a/codemp/rd-dedicated/G2_misc.cpp b/codemp/rd-dedicated/G2_misc.cpp
index 3f612fa..1bcec8e 100644
--- a/codemp/rd-dedicated/G2_misc.cpp
+++ b/codemp/rd-dedicated/G2_misc.cpp
@@ -551,7 +551,7 @@ void G2_TransformModel(CGhoul2Info_v &ghoul2, const int frameNum, vec3_t scale,
if ( cg_g2MarksAllModels == NULL )
{
- cg_g2MarksAllModels = ri->Cvar_Get( "cg_g2MarksAllModels", "0", 0, "" );
+ cg_g2MarksAllModels = ri.Cvar_Get( "cg_g2MarksAllModels", "0", 0, "" );
}
if (cg_g2MarksAllModels == NULL
@@ -1499,7 +1499,7 @@ void G2_TraceModels(CGhoul2Info_v &ghoul2, vec3_t rayStart, vec3_t rayEnd, Colli
if ( cg_g2MarksAllModels == NULL )
{
- cg_g2MarksAllModels = ri->Cvar_Get( "cg_g2MarksAllModels", "0", 0, "" );
+ cg_g2MarksAllModels = ri.Cvar_Get( "cg_g2MarksAllModels", "0", 0, "" );
}
if (cg_g2MarksAllModels == NULL
diff --git a/codemp/rd-dedicated/tr_ghoul2.cpp b/codemp/rd-dedicated/tr_ghoul2.cpp
index cbc0058..4190b9d 100644
--- a/codemp/rd-dedicated/tr_ghoul2.cpp
+++ b/codemp/rd-dedicated/tr_ghoul2.cpp
@@ -1894,7 +1894,7 @@ void G2_TransformGhoulBones(boneInfo_v &rootBoneList,mdxaBone_t &rootMatrix, CGh
ghoul2.mBoneCache->mUnsquash=false;
// master smoothing control
- if (HackadelicOnClient && smooth && !ri->Cvar_VariableIntegerValue( "dedicated" ))
+ if (HackadelicOnClient && smooth && !ri.Cvar_VariableIntegerValue( "dedicated" ))
{
ghoul2.mBoneCache->mLastTouch=ghoul2.mBoneCache->mLastLastTouch;
/*
@@ -3353,7 +3353,7 @@ qboolean R_LoadMDXM( model_t *mod, void *buffer, const char *mod_name, qboolean
if (!bAlreadyFound)
{
// horrible new hackery, if !bAlreadyFound then we've just done a tag-morph, so we need to set the
- // bool reference passed into this function to true, to tell the caller NOT to do an ri->FS_Freefile since
+ // bool reference passed into this function to true, to tell the caller NOT to do an ri.FS_Freefile since
// we've hijacked that memory block...
//
// Aaaargh. Kill me now...
@@ -3793,7 +3793,7 @@ qboolean R_LoadMDXA( model_t *mod, void *buffer, const char *mod_name, qboolean
memcpy( mdxa, buffer, oSize );
#else
// horrible new hackery, if !bAlreadyFound then we've just done a tag-morph, so we need to set the
- // bool reference passed into this function to true, to tell the caller NOT to do an ri->FS_Freefile since
+ // bool reference passed into this function to true, to tell the caller NOT to do an ri.FS_Freefile since
// we've hijacked that memory block...
//
// Aaaargh. Kill me now...
diff --git a/codemp/rd-dedicated/tr_init.cpp b/codemp/rd-dedicated/tr_init.cpp
index a96cdc2..fe48457 100644
--- a/codemp/rd-dedicated/tr_init.cpp
+++ b/codemp/rd-dedicated/tr_init.cpp
@@ -313,152 +313,152 @@ void R_Register( void )
//
// latched and archived variables
//
- r_allowExtensions = ri->Cvar_Get( "r_allowExtensions", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ext_compressed_textures = ri->Cvar_Get( "r_ext_compress_textures", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ext_compressed_lightmaps = ri->Cvar_Get( "r_ext_compress_lightmaps", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ext_preferred_tc_method = ri->Cvar_Get( "r_ext_preferred_tc_method", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ext_gamma_control = ri->Cvar_Get( "r_ext_gamma_control", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ext_multitexture = ri->Cvar_Get( "r_ext_multitexture", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ext_compiled_vertex_array = ri->Cvar_Get( "r_ext_compiled_vertex_array", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ext_texture_env_add = ri->Cvar_Get( "r_ext_texture_env_add", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ext_texture_filter_anisotropic = ri->Cvar_Get( "r_ext_texture_filter_anisotropic", "16", CVAR_ARCHIVE_ND, "" );
- r_DynamicGlow = ri->Cvar_Get( "r_DynamicGlow", "0", CVAR_ARCHIVE_ND, "" );
- r_DynamicGlowPasses = ri->Cvar_Get( "r_DynamicGlowPasses", "5", CVAR_ARCHIVE_ND, "" );
- r_DynamicGlowDelta = ri->Cvar_Get( "r_DynamicGlowDelta", "0.8f", CVAR_ARCHIVE_ND, "" );
- r_DynamicGlowIntensity = ri->Cvar_Get( "r_DynamicGlowIntensity", "1.13f", CVAR_ARCHIVE_ND, "" );
- r_DynamicGlowSoft = ri->Cvar_Get( "r_DynamicGlowSoft", "1", CVAR_ARCHIVE_ND, "" );
- r_DynamicGlowWidth = ri->Cvar_Get( "r_DynamicGlowWidth", "320", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_DynamicGlowHeight = ri->Cvar_Get( "r_DynamicGlowHeight", "240", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_picmip = ri->Cvar_Get( "r_picmip", "1", CVAR_ARCHIVE|CVAR_LATCH, "" );
- ri->Cvar_CheckRange( r_picmip, 0, 16, qtrue );
- r_colorMipLevels = ri->Cvar_Get( "r_colorMipLevels", "0", CVAR_LATCH, "" );
- r_detailTextures = ri->Cvar_Get( "r_detailtextures", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_texturebits = ri->Cvar_Get( "r_texturebits", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_texturebitslm = ri->Cvar_Get( "r_texturebitslm", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_colorbits = ri->Cvar_Get( "r_colorbits", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_stereo = ri->Cvar_Get( "r_stereo", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_stencilbits = ri->Cvar_Get( "r_stencilbits", "8", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_depthbits = ri->Cvar_Get( "r_depthbits", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_overBrightBits = ri->Cvar_Get( "r_overBrightBits", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ignorehwgamma = ri->Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_mode = ri->Cvar_Get( "r_mode", "4", CVAR_ARCHIVE|CVAR_LATCH, "" );
- r_fullscreen = ri->Cvar_Get( "r_fullscreen", "0", CVAR_ARCHIVE|CVAR_LATCH, "" );
- r_noborder = ri->Cvar_Get( "r_noborder", "0", CVAR_ARCHIVE|CVAR_LATCH, "" );
- r_centerWindow = ri->Cvar_Get( "r_centerWindow", "0", CVAR_ARCHIVE|CVAR_LATCH, "" );
- r_customwidth = ri->Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE|CVAR_LATCH, "" );
- r_customheight = ri->Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE|CVAR_LATCH, "" );
- r_simpleMipMaps = ri->Cvar_Get( "r_simpleMipMaps", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_vertexLight = ri->Cvar_Get( "r_vertexLight", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_uiFullScreen = ri->Cvar_Get( "r_uifullscreen", "0", CVAR_NONE, "" );
- r_subdivisions = ri->Cvar_Get( "r_subdivisions", "4", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_displayRefresh = ri->Cvar_Get( "r_displayRefresh", "0", CVAR_LATCH, "" );
- ri->Cvar_CheckRange( r_displayRefresh, 0, 200, qtrue );
- r_fullbright = ri->Cvar_Get( "r_fullbright", "0", CVAR_CHEAT, "" );
- r_intensity = ri->Cvar_Get( "r_intensity", "1", CVAR_LATCH, "" );
- r_singleShader = ri->Cvar_Get( "r_singleShader", "0", CVAR_CHEAT|CVAR_LATCH, "" );
- r_lodCurveError = ri->Cvar_Get( "r_lodCurveError", "250", CVAR_ARCHIVE_ND, "" );
- r_lodbias = ri->Cvar_Get( "r_lodbias", "0", CVAR_ARCHIVE_ND, "" );
- r_autolodscalevalue = ri->Cvar_Get( "r_autolodscalevalue", "0", CVAR_ROM, "" );
- r_flares = ri->Cvar_Get( "r_flares", "1", CVAR_ARCHIVE_ND, "" );
- r_znear = ri->Cvar_Get( "r_znear", "4", CVAR_ARCHIVE_ND, "" );
- ri->Cvar_CheckRange( r_znear, 0.001f, 10, qfalse );
- r_ignoreGLErrors = ri->Cvar_Get( "r_ignoreGLErrors", "1", CVAR_ARCHIVE_ND, "" );
- r_fastsky = ri->Cvar_Get( "r_fastsky", "0", CVAR_ARCHIVE_ND, "" );
- r_inGameVideo = ri->Cvar_Get( "r_inGameVideo", "1", CVAR_ARCHIVE_ND, "" );
- r_drawSun = ri->Cvar_Get( "r_drawSun", "0", CVAR_ARCHIVE_ND, "" );
- r_dynamiclight = ri->Cvar_Get( "r_dynamiclight", "1", CVAR_ARCHIVE, "" );
+ r_allowExtensions = ri.Cvar_Get( "r_allowExtensions", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ext_compressed_textures = ri.Cvar_Get( "r_ext_compress_textures", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ext_compressed_lightmaps = ri.Cvar_Get( "r_ext_compress_lightmaps", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ext_preferred_tc_method = ri.Cvar_Get( "r_ext_preferred_tc_method", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ext_gamma_control = ri.Cvar_Get( "r_ext_gamma_control", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ext_multitexture = ri.Cvar_Get( "r_ext_multitexture", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ext_compiled_vertex_array = ri.Cvar_Get( "r_ext_compiled_vertex_array", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ext_texture_env_add = ri.Cvar_Get( "r_ext_texture_env_add", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ext_texture_filter_anisotropic = ri.Cvar_Get( "r_ext_texture_filter_anisotropic", "16", CVAR_ARCHIVE_ND, "" );
+ r_DynamicGlow = ri.Cvar_Get( "r_DynamicGlow", "0", CVAR_ARCHIVE_ND, "" );
+ r_DynamicGlowPasses = ri.Cvar_Get( "r_DynamicGlowPasses", "5", CVAR_ARCHIVE_ND, "" );
+ r_DynamicGlowDelta = ri.Cvar_Get( "r_DynamicGlowDelta", "0.8f", CVAR_ARCHIVE_ND, "" );
+ r_DynamicGlowIntensity = ri.Cvar_Get( "r_DynamicGlowIntensity", "1.13f", CVAR_ARCHIVE_ND, "" );
+ r_DynamicGlowSoft = ri.Cvar_Get( "r_DynamicGlowSoft", "1", CVAR_ARCHIVE_ND, "" );
+ r_DynamicGlowWidth = ri.Cvar_Get( "r_DynamicGlowWidth", "320", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_DynamicGlowHeight = ri.Cvar_Get( "r_DynamicGlowHeight", "240", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_picmip = ri.Cvar_Get( "r_picmip", "1", CVAR_ARCHIVE|CVAR_LATCH, "" );
+ ri.Cvar_CheckRange( r_picmip, 0, 16, qtrue );
+ r_colorMipLevels = ri.Cvar_Get( "r_colorMipLevels", "0", CVAR_LATCH, "" );
+ r_detailTextures = ri.Cvar_Get( "r_detailtextures", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_texturebits = ri.Cvar_Get( "r_texturebits", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_texturebitslm = ri.Cvar_Get( "r_texturebitslm", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_colorbits = ri.Cvar_Get( "r_colorbits", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_stereo = ri.Cvar_Get( "r_stereo", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_stencilbits = ri.Cvar_Get( "r_stencilbits", "8", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_depthbits = ri.Cvar_Get( "r_depthbits", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_overBrightBits = ri.Cvar_Get( "r_overBrightBits", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_mode = ri.Cvar_Get( "r_mode", "4", CVAR_ARCHIVE|CVAR_LATCH, "" );
+ r_fullscreen = ri.Cvar_Get( "r_fullscreen", "0", CVAR_ARCHIVE|CVAR_LATCH, "" );
+ r_noborder = ri.Cvar_Get( "r_noborder", "0", CVAR_ARCHIVE|CVAR_LATCH, "" );
+ r_centerWindow = ri.Cvar_Get( "r_centerWindow", "0", CVAR_ARCHIVE|CVAR_LATCH, "" );
+ r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE|CVAR_LATCH, "" );
+ r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE|CVAR_LATCH, "" );
+ r_simpleMipMaps = ri.Cvar_Get( "r_simpleMipMaps", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_vertexLight = ri.Cvar_Get( "r_vertexLight", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_uiFullScreen = ri.Cvar_Get( "r_uifullscreen", "0", CVAR_NONE, "" );
+ r_subdivisions = ri.Cvar_Get( "r_subdivisions", "4", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_displayRefresh = ri.Cvar_Get( "r_displayRefresh", "0", CVAR_LATCH, "" );
+ ri.Cvar_CheckRange( r_displayRefresh, 0, 200, qtrue );
+ r_fullbright = ri.Cvar_Get( "r_fullbright", "0", CVAR_CHEAT, "" );
+ r_intensity = ri.Cvar_Get( "r_intensity", "1", CVAR_LATCH, "" );
+ r_singleShader = ri.Cvar_Get( "r_singleShader", "0", CVAR_CHEAT|CVAR_LATCH, "" );
+ r_lodCurveError = ri.Cvar_Get( "r_lodCurveError", "250", CVAR_ARCHIVE_ND, "" );
+ r_lodbias = ri.Cvar_Get( "r_lodbias", "0", CVAR_ARCHIVE_ND, "" );
+ r_autolodscalevalue = ri.Cvar_Get( "r_autolodscalevalue", "0", CVAR_ROM, "" );
+ r_flares = ri.Cvar_Get( "r_flares", "1", CVAR_ARCHIVE_ND, "" );
+ r_znear = ri.Cvar_Get( "r_znear", "4", CVAR_ARCHIVE_ND, "" );
+ ri.Cvar_CheckRange( r_znear, 0.001f, 10, qfalse );
+ r_ignoreGLErrors = ri.Cvar_Get( "r_ignoreGLErrors", "1", CVAR_ARCHIVE_ND, "" );
+ r_fastsky = ri.Cvar_Get( "r_fastsky", "0", CVAR_ARCHIVE_ND, "" );
+ r_inGameVideo = ri.Cvar_Get( "r_inGameVideo", "1", CVAR_ARCHIVE_ND, "" );
+ r_drawSun = ri.Cvar_Get( "r_drawSun", "0", CVAR_ARCHIVE_ND, "" );
+ r_dynamiclight = ri.Cvar_Get( "r_dynamiclight", "1", CVAR_ARCHIVE, "" );
// rjr - removed for hacking
-// r_dlightBacks = ri->Cvar_Get( "r_dlightBacks", "1", CVAR_CHEAT, "" );
- r_finish = ri->Cvar_Get( "r_finish", "0", CVAR_ARCHIVE_ND, "" );
- r_textureMode = ri->Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE, "" );
- r_swapInterval = ri->Cvar_Get( "r_swapInterval", "0", SWAPINTERVAL_FLAGS, "" );
- r_markcount = ri->Cvar_Get( "r_markcount", "100", CVAR_ARCHIVE_ND, "" );
- r_gamma = ri->Cvar_Get( "r_gamma", "1", CVAR_ARCHIVE_ND, "" );
- r_facePlaneCull = ri->Cvar_Get( "r_facePlaneCull", "1", CVAR_ARCHIVE_ND, "" );
- r_cullRoofFaces = ri->Cvar_Get( "r_cullRoofFaces", "0", CVAR_CHEAT, "" ); //attempted smart method of culling out upwards facing surfaces on roofs for automap shots -rww
- r_roofCullCeilDist = ri->Cvar_Get( "r_roofCullCeilDist", "256", CVAR_CHEAT, "" ); //attempted smart method of culling out upwards facing surfaces on roofs for automap shots -rww
- r_roofCullFloorDist = ri->Cvar_Get( "r_roofCeilFloorDist", "128", CVAR_CHEAT, "" ); //attempted smart method of culling out upwards facing surfaces on roofs for automap shots -rww
- r_primitives = ri->Cvar_Get( "r_primitives", "0", CVAR_ARCHIVE_ND, "" );
- ri->Cvar_CheckRange( r_primitives, MIN_PRIMITIVES, MAX_PRIMITIVES, qtrue );
- r_ambientScale = ri->Cvar_Get( "r_ambientScale", "0.6", CVAR_CHEAT, "" );
- r_directedScale = ri->Cvar_Get( "r_directedScale", "1", CVAR_CHEAT, "" );
- r_autoMap = ri->Cvar_Get( "r_autoMap", "0", CVAR_ARCHIVE_ND, "" ); //automap renderside toggle for debugging -rww
- r_autoMapBackAlpha = ri->Cvar_Get( "r_autoMapBackAlpha", "0", CVAR_NONE, "" ); //alpha of automap bg -rww
- r_autoMapDisable = ri->Cvar_Get( "r_autoMapDisable", "1", CVAR_NONE, "" );
- r_showImages = ri->Cvar_Get( "r_showImages", "0", CVAR_CHEAT, "" );
- r_debugLight = ri->Cvar_Get( "r_debuglight", "0", CVAR_TEMP, "" );
- r_debugSort = ri->Cvar_Get( "r_debugSort", "0", CVAR_CHEAT, "" );
- r_dlightStyle = ri->Cvar_Get( "r_dlightStyle", "1", CVAR_TEMP, "" );
- r_surfaceSprites = ri->Cvar_Get( "r_surfaceSprites", "1", CVAR_TEMP, "" );
- r_surfaceWeather = ri->Cvar_Get( "r_surfaceWeather", "0", CVAR_TEMP, "" );
- r_windSpeed = ri->Cvar_Get( "r_windSpeed", "0", CVAR_NONE, "" );
- r_windAngle = ri->Cvar_Get( "r_windAngle", "0", CVAR_NONE, "" );
- r_windGust = ri->Cvar_Get( "r_windGust", "0", CVAR_NONE, "" );
- r_windDampFactor = ri->Cvar_Get( "r_windDampFactor", "0.1", CVAR_NONE, "" );
- r_windPointForce = ri->Cvar_Get( "r_windPointForce", "0", CVAR_NONE, "" );
- r_windPointX = ri->Cvar_Get( "r_windPointX", "0", CVAR_NONE, "" );
- r_windPointY = ri->Cvar_Get( "r_windPointY", "0", CVAR_NONE, "" );
- r_nocurves = ri->Cvar_Get( "r_nocurves", "0", CVAR_CHEAT, "" );
- r_drawworld = ri->Cvar_Get( "r_drawworld", "1", CVAR_CHEAT, "" );
- r_drawfog = ri->Cvar_Get( "r_drawfog", "2", CVAR_CHEAT, "" );
- r_lightmap = ri->Cvar_Get( "r_lightmap", "0", CVAR_CHEAT, "" );
- r_portalOnly = ri->Cvar_Get( "r_portalOnly", "0", CVAR_CHEAT, "" );
- r_skipBackEnd = ri->Cvar_Get( "r_skipBackEnd", "0", CVAR_CHEAT, "" );
- r_measureOverdraw = ri->Cvar_Get( "r_measureOverdraw", "0", CVAR_CHEAT, "" );
- r_lodscale = ri->Cvar_Get( "r_lodscale", "5", CVAR_NONE, "" );
- r_norefresh = ri->Cvar_Get( "r_norefresh", "0", CVAR_CHEAT, "" );
- r_drawentities = ri->Cvar_Get( "r_drawentities", "1", CVAR_CHEAT, "" );
- r_ignore = ri->Cvar_Get( "r_ignore", "1", CVAR_CHEAT, "" );
- r_nocull = ri->Cvar_Get( "r_nocull", "0", CVAR_CHEAT, "" );
- r_novis = ri->Cvar_Get( "r_novis", "0", CVAR_CHEAT, "" );
- r_showcluster = ri->Cvar_Get( "r_showcluster", "0", CVAR_CHEAT, "" );
- r_speeds = ri->Cvar_Get( "r_speeds", "0", CVAR_CHEAT, "" );
- r_verbose = ri->Cvar_Get( "r_verbose", "0", CVAR_CHEAT, "" );
- r_logFile = ri->Cvar_Get( "r_logFile", "0", CVAR_CHEAT, "" );
- r_debugSurface = ri->Cvar_Get( "r_debugSurface", "0", CVAR_CHEAT, "" );
- r_nobind = ri->Cvar_Get( "r_nobind", "0", CVAR_CHEAT, "" );
- r_showtris = ri->Cvar_Get( "r_showtris", "0", CVAR_CHEAT, "" );
- r_showsky = ri->Cvar_Get( "r_showsky", "0", CVAR_CHEAT, "" );
- r_shownormals = ri->Cvar_Get( "r_shownormals", "0", CVAR_CHEAT, "" );
- r_clear = ri->Cvar_Get( "r_clear", "0", CVAR_CHEAT, "" );
- r_offsetFactor = ri->Cvar_Get( "r_offsetfactor", "-1", CVAR_CHEAT, "" );
- r_offsetUnits = ri->Cvar_Get( "r_offsetunits", "-2", CVAR_CHEAT, "" );
- r_lockpvs = ri->Cvar_Get( "r_lockpvs", "0", CVAR_CHEAT, "" );
- r_noportals = ri->Cvar_Get( "r_noportals", "0", CVAR_CHEAT, "" );
- r_shadows = ri->Cvar_Get( "cg_shadows", "1", CVAR_NONE, "" );
- r_shadowRange = ri->Cvar_Get( "r_shadowRange", "1000", CVAR_NONE, "" );
- r_maxpolys = ri->Cvar_Get( "r_maxpolys", XSTRING( DEFAULT_MAX_POLYS ), CVAR_NONE, "" );
- r_maxpolyverts = ri->Cvar_Get( "r_maxpolyverts", XSTRING( DEFAULT_MAX_POLYVERTS ), CVAR_NONE, "" );
+// r_dlightBacks = ri.Cvar_Get( "r_dlightBacks", "1", CVAR_CHEAT, "" );
+ r_finish = ri.Cvar_Get( "r_finish", "0", CVAR_ARCHIVE_ND, "" );
+ r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE, "" );
+ r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0", SWAPINTERVAL_FLAGS, "" );
+ r_markcount = ri.Cvar_Get( "r_markcount", "100", CVAR_ARCHIVE_ND, "" );
+ r_gamma = ri.Cvar_Get( "r_gamma", "1", CVAR_ARCHIVE_ND, "" );
+ r_facePlaneCull = ri.Cvar_Get( "r_facePlaneCull", "1", CVAR_ARCHIVE_ND, "" );
+ r_cullRoofFaces = ri.Cvar_Get( "r_cullRoofFaces", "0", CVAR_CHEAT, "" ); //attempted smart method of culling out upwards facing surfaces on roofs for automap shots -rww
+ r_roofCullCeilDist = ri.Cvar_Get( "r_roofCullCeilDist", "256", CVAR_CHEAT, "" ); //attempted smart method of culling out upwards facing surfaces on roofs for automap shots -rww
+ r_roofCullFloorDist = ri.Cvar_Get( "r_roofCeilFloorDist", "128", CVAR_CHEAT, "" ); //attempted smart method of culling out upwards facing surfaces on roofs for automap shots -rww
+ r_primitives = ri.Cvar_Get( "r_primitives", "0", CVAR_ARCHIVE_ND, "" );
+ ri.Cvar_CheckRange( r_primitives, MIN_PRIMITIVES, MAX_PRIMITIVES, qtrue );
+ r_ambientScale = ri.Cvar_Get( "r_ambientScale", "0.6", CVAR_CHEAT, "" );
+ r_directedScale = ri.Cvar_Get( "r_directedScale", "1", CVAR_CHEAT, "" );
+ r_autoMap = ri.Cvar_Get( "r_autoMap", "0", CVAR_ARCHIVE_ND, "" ); //automap renderside toggle for debugging -rww
+ r_autoMapBackAlpha = ri.Cvar_Get( "r_autoMapBackAlpha", "0", CVAR_NONE, "" ); //alpha of automap bg -rww
+ r_autoMapDisable = ri.Cvar_Get( "r_autoMapDisable", "1", CVAR_NONE, "" );
+ r_showImages = ri.Cvar_Get( "r_showImages", "0", CVAR_CHEAT, "" );
+ r_debugLight = ri.Cvar_Get( "r_debuglight", "0", CVAR_TEMP, "" );
+ r_debugSort = ri.Cvar_Get( "r_debugSort", "0", CVAR_CHEAT, "" );
+ r_dlightStyle = ri.Cvar_Get( "r_dlightStyle", "1", CVAR_TEMP, "" );
+ r_surfaceSprites = ri.Cvar_Get( "r_surfaceSprites", "1", CVAR_TEMP, "" );
+ r_surfaceWeather = ri.Cvar_Get( "r_surfaceWeather", "0", CVAR_TEMP, "" );
+ r_windSpeed = ri.Cvar_Get( "r_windSpeed", "0", CVAR_NONE, "" );
+ r_windAngle = ri.Cvar_Get( "r_windAngle", "0", CVAR_NONE, "" );
+ r_windGust = ri.Cvar_Get( "r_windGust", "0", CVAR_NONE, "" );
+ r_windDampFactor = ri.Cvar_Get( "r_windDampFactor", "0.1", CVAR_NONE, "" );
+ r_windPointForce = ri.Cvar_Get( "r_windPointForce", "0", CVAR_NONE, "" );
+ r_windPointX = ri.Cvar_Get( "r_windPointX", "0", CVAR_NONE, "" );
+ r_windPointY = ri.Cvar_Get( "r_windPointY", "0", CVAR_NONE, "" );
+ r_nocurves = ri.Cvar_Get( "r_nocurves", "0", CVAR_CHEAT, "" );
+ r_drawworld = ri.Cvar_Get( "r_drawworld", "1", CVAR_CHEAT, "" );
+ r_drawfog = ri.Cvar_Get( "r_drawfog", "2", CVAR_CHEAT, "" );
+ r_lightmap = ri.Cvar_Get( "r_lightmap", "0", CVAR_CHEAT, "" );
+ r_portalOnly = ri.Cvar_Get( "r_portalOnly", "0", CVAR_CHEAT, "" );
+ r_skipBackEnd = ri.Cvar_Get( "r_skipBackEnd", "0", CVAR_CHEAT, "" );
+ r_measureOverdraw = ri.Cvar_Get( "r_measureOverdraw", "0", CVAR_CHEAT, "" );
+ r_lodscale = ri.Cvar_Get( "r_lodscale", "5", CVAR_NONE, "" );
+ r_norefresh = ri.Cvar_Get( "r_norefresh", "0", CVAR_CHEAT, "" );
+ r_drawentities = ri.Cvar_Get( "r_drawentities", "1", CVAR_CHEAT, "" );
+ r_ignore = ri.Cvar_Get( "r_ignore", "1", CVAR_CHEAT, "" );
+ r_nocull = ri.Cvar_Get( "r_nocull", "0", CVAR_CHEAT, "" );
+ r_novis = ri.Cvar_Get( "r_novis", "0", CVAR_CHEAT, "" );
+ r_showcluster = ri.Cvar_Get( "r_showcluster", "0", CVAR_CHEAT, "" );
+ r_speeds = ri.Cvar_Get( "r_speeds", "0", CVAR_CHEAT, "" );
+ r_verbose = ri.Cvar_Get( "r_verbose", "0", CVAR_CHEAT, "" );
+ r_logFile = ri.Cvar_Get( "r_logFile", "0", CVAR_CHEAT, "" );
+ r_debugSurface = ri.Cvar_Get( "r_debugSurface", "0", CVAR_CHEAT, "" );
+ r_nobind = ri.Cvar_Get( "r_nobind", "0", CVAR_CHEAT, "" );
+ r_showtris = ri.Cvar_Get( "r_showtris", "0", CVAR_CHEAT, "" );
+ r_showsky = ri.Cvar_Get( "r_showsky", "0", CVAR_CHEAT, "" );
+ r_shownormals = ri.Cvar_Get( "r_shownormals", "0", CVAR_CHEAT, "" );
+ r_clear = ri.Cvar_Get( "r_clear", "0", CVAR_CHEAT, "" );
+ r_offsetFactor = ri.Cvar_Get( "r_offsetfactor", "-1", CVAR_CHEAT, "" );
+ r_offsetUnits = ri.Cvar_Get( "r_offsetunits", "-2", CVAR_CHEAT, "" );
+ r_lockpvs = ri.Cvar_Get( "r_lockpvs", "0", CVAR_CHEAT, "" );
+ r_noportals = ri.Cvar_Get( "r_noportals", "0", CVAR_CHEAT, "" );
+ r_shadows = ri.Cvar_Get( "cg_shadows", "1", CVAR_NONE, "" );
+ r_shadowRange = ri.Cvar_Get( "r_shadowRange", "1000", CVAR_NONE, "" );
+ r_maxpolys = ri.Cvar_Get( "r_maxpolys", XSTRING( DEFAULT_MAX_POLYS ), CVAR_NONE, "" );
+ r_maxpolyverts = ri.Cvar_Get( "r_maxpolyverts", XSTRING( DEFAULT_MAX_POLYVERTS ), CVAR_NONE, "" );
/*
Ghoul2 Insert Start
*/
#ifdef _DEBUG
- r_noPrecacheGLA = ri->Cvar_Get( "r_noPrecacheGLA", "0", CVAR_CHEAT, "" );
+ r_noPrecacheGLA = ri.Cvar_Get( "r_noPrecacheGLA", "0", CVAR_CHEAT, "" );
#endif
- r_noServerGhoul2 = ri->Cvar_Get( "r_noserverghoul2", "0", CVAR_CHEAT, "" );
- r_Ghoul2AnimSmooth = ri->Cvar_Get( "r_ghoul2animsmooth", "0.3", CVAR_NONE, "" );
- r_Ghoul2UnSqashAfterSmooth = ri->Cvar_Get( "r_ghoul2unsqashaftersmooth", "1", CVAR_NONE, "" );
- broadsword = ri->Cvar_Get( "broadsword", "0", CVAR_NONE, "" );
- broadsword_kickbones = ri->Cvar_Get( "broadsword_kickbones", "1", CVAR_NONE, "" );
- broadsword_kickorigin = ri->Cvar_Get( "broadsword_kickorigin", "1", CVAR_NONE, "" );
- broadsword_dontstopanim = ri->Cvar_Get( "broadsword_dontstopanim", "0", CVAR_NONE, "" );
- broadsword_waitforshot = ri->Cvar_Get( "broadsword_waitforshot", "0", CVAR_NONE, "" );
- broadsword_playflop = ri->Cvar_Get( "broadsword_playflop", "1", CVAR_NONE, "" );
- broadsword_smallbbox = ri->Cvar_Get( "broadsword_smallbbox", "0", CVAR_NONE, "" );
- broadsword_extra1 = ri->Cvar_Get( "broadsword_extra1", "0", CVAR_NONE, "" );
- broadsword_extra2 = ri->Cvar_Get( "broadsword_extra2", "0", CVAR_NONE, "" );
- broadsword_effcorr = ri->Cvar_Get( "broadsword_effcorr", "1", CVAR_NONE, "" );
- broadsword_ragtobase = ri->Cvar_Get( "broadsword_ragtobase", "2", CVAR_NONE, "" );
- broadsword_dircap = ri->Cvar_Get( "broadsword_dircap", "64", CVAR_NONE, "" );
+ r_noServerGhoul2 = ri.Cvar_Get( "r_noserverghoul2", "0", CVAR_CHEAT, "" );
+ r_Ghoul2AnimSmooth = ri.Cvar_Get( "r_ghoul2animsmooth", "0.3", CVAR_NONE, "" );
+ r_Ghoul2UnSqashAfterSmooth = ri.Cvar_Get( "r_ghoul2unsqashaftersmooth", "1", CVAR_NONE, "" );
+ broadsword = ri.Cvar_Get( "broadsword", "0", CVAR_NONE, "" );
+ broadsword_kickbones = ri.Cvar_Get( "broadsword_kickbones", "1", CVAR_NONE, "" );
+ broadsword_kickorigin = ri.Cvar_Get( "broadsword_kickorigin", "1", CVAR_NONE, "" );
+ broadsword_dontstopanim = ri.Cvar_Get( "broadsword_dontstopanim", "0", CVAR_NONE, "" );
+ broadsword_waitforshot = ri.Cvar_Get( "broadsword_waitforshot", "0", CVAR_NONE, "" );
+ broadsword_playflop = ri.Cvar_Get( "broadsword_playflop", "1", CVAR_NONE, "" );
+ broadsword_smallbbox = ri.Cvar_Get( "broadsword_smallbbox", "0", CVAR_NONE, "" );
+ broadsword_extra1 = ri.Cvar_Get( "broadsword_extra1", "0", CVAR_NONE, "" );
+ broadsword_extra2 = ri.Cvar_Get( "broadsword_extra2", "0", CVAR_NONE, "" );
+ broadsword_effcorr = ri.Cvar_Get( "broadsword_effcorr", "1", CVAR_NONE, "" );
+ broadsword_ragtobase = ri.Cvar_Get( "broadsword_ragtobase", "2", CVAR_NONE, "" );
+ broadsword_dircap = ri.Cvar_Get( "broadsword_dircap", "64", CVAR_NONE, "" );
/*
Ghoul2 Insert End
*/
- r_modelpoolmegs = ri->Cvar_Get("r_modelpoolmegs", "20", CVAR_ARCHIVE, "" );
- if (ri->Sys_LowPhysicalMemory() )
- ri->Cvar_Set("r_modelpoolmegs", "0");
+ r_modelpoolmegs = ri.Cvar_Get("r_modelpoolmegs", "20", CVAR_ARCHIVE, "" );
+ if (ri.Sys_LowPhysicalMemory() )
+ ri.Cvar_Set("r_modelpoolmegs", "0");
for ( size_t i = 0; i < numCommands; i++ )
- ri->Cmd_AddCommand( commands[i].cmd, commands[i].func, "" );
+ ri.Cmd_AddCommand( commands[i].cmd, commands[i].func, "" );
}
@@ -530,7 +530,7 @@ void RE_Shutdown( qboolean destroyWindow, qboolean restarting ) {
// Com_Printf ("RE_Shutdown( %i )\n", destroyWindow );
for ( size_t i = 0; i < numCommands; i++ )
- ri->Cmd_RemoveCommand( commands[i].cmd );
+ ri.Cmd_RemoveCommand( commands[i].cmd );
tr.registered = qfalse;
}
@@ -553,7 +553,7 @@ refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
static refexport_t re;
assert( rimp );
- ri = rimp;
+ ri = *rimp;
memset( &re, 0, sizeof( re ) );
diff --git a/codemp/rd-dedicated/tr_local.h b/codemp/rd-dedicated/tr_local.h
index d09f278..2207419 100644
--- a/codemp/rd-dedicated/tr_local.h
+++ b/codemp/rd-dedicated/tr_local.h
@@ -26,6 +26,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
typedef unsigned int GLuint;
#include "qcommon/qfiles.h"
+#include "rd-common/tr_common.h"
#include "rd-common/tr_public.h"
#include "ghoul2/ghoul2_shared.h" //rwwRMG - added
@@ -1852,6 +1853,4 @@ typedef struct decalPoly_s
} decalPoly_t;
-extern refimport_t *ri;
-
qboolean ShaderHashTableExists(void);
diff --git a/codemp/rd-dedicated/tr_main.cpp b/codemp/rd-dedicated/tr_main.cpp
index e1c1f44..542183f 100644
--- a/codemp/rd-dedicated/tr_main.cpp
+++ b/codemp/rd-dedicated/tr_main.cpp
@@ -27,7 +27,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
trGlobals_t tr;
-refimport_t *ri = NULL;
+refimport_t ri;
void R_AddTerrainSurfaces(void);
diff --git a/codemp/rd-dedicated/tr_model.cpp b/codemp/rd-dedicated/tr_model.cpp
index af13ebf..ff15e7d 100644
--- a/codemp/rd-dedicated/tr_model.cpp
+++ b/codemp/rd-dedicated/tr_model.cpp
@@ -164,13 +164,13 @@ qboolean RE_RegisterModels_GetDiskFile( const char *psModelFileName, void **ppvB
return qtrue;
}
- ri->FS_ReadFile( sModelName, ppvBuffer );
+ ri.FS_ReadFile( sModelName, ppvBuffer );
*pqbAlreadyCached = qfalse;
qboolean bSuccess = !!(*ppvBuffer)?qtrue:qfalse;
if (bSuccess)
{
- ri->Printf( PRINT_DEVELOPER, "RE_RegisterModels_GetDiskFile(): Disk-loading \"%s\"\n",psModelFileName);
+ ri.Printf( PRINT_DEVELOPER, "RE_RegisterModels_GetDiskFile(): Disk-loading \"%s\"\n",psModelFileName);
}
return bSuccess;
@@ -221,7 +221,7 @@ void *RE_RegisterModels_Malloc(int iSize, void *pvDiskBufferIfJustLoaded, const
ModelBin.iAllocSize = iSize;
int iCheckSum;
- if (ri->FS_FileIsInPAK(sModelName, &iCheckSum) == 1)
+ if (ri.FS_FileIsInPAK(sModelName, &iCheckSum) == 1)
{
ModelBin.iPAKFileCheckSum = iCheckSum; // else ModelBin's constructor will leave it as -1
}
@@ -271,7 +271,7 @@ void *RE_RegisterServerModels_Malloc(int iSize, void *pvDiskBufferIfJustLoaded,
ModelBin.iAllocSize = iSize;
int iCheckSum;
- if (ri->FS_FileIsInPAK(sModelName, &iCheckSum) == 1)
+ if (ri.FS_FileIsInPAK(sModelName, &iCheckSum) == 1)
{
ModelBin.iPAKFileCheckSum = iCheckSum; // else ModelBin's constructor will leave it as -1
}
@@ -330,11 +330,11 @@ qboolean RE_RegisterModels_LevelLoadEnd(qboolean bDeleteEverythingNotUsedThisLev
assert(CachedModels);
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "RE_RegisterModels_LevelLoadEnd():\n");
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "RE_RegisterModels_LevelLoadEnd():\n");
if (gbInsideRegisterModel)
{
- ri->Printf( PRINT_DEVELOPER, "(Inside RE_RegisterModel (z_malloc recovery?), exiting...\n");
+ ri.Printf( PRINT_DEVELOPER, "(Inside RE_RegisterModel (z_malloc recovery?), exiting...\n");
}
else
{
@@ -361,10 +361,10 @@ qboolean RE_RegisterModels_LevelLoadEnd(qboolean bDeleteEverythingNotUsedThisLev
if (bDeleteThis)
{
const char *psModelName = (*itModel).first.c_str();
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "Dumping \"%s\"", psModelName);
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "Dumping \"%s\"", psModelName);
#ifdef _DEBUG
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED ", used on lvl %d\n",CachedModel.iLastLevelUsedOn);
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED ", used on lvl %d\n",CachedModel.iLastLevelUsedOn);
#endif
if (CachedModel.pModelDiskImage) {
@@ -383,7 +383,7 @@ qboolean RE_RegisterModels_LevelLoadEnd(qboolean bDeleteEverythingNotUsedThisLev
}
}
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "RE_RegisterModels_LevelLoadEnd(): Ok\n");
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "RE_RegisterModels_LevelLoadEnd(): Ok\n");
return bAtLeastoneModelFreed;
}
@@ -397,7 +397,7 @@ qboolean RE_RegisterModels_LevelLoadEnd(qboolean bDeleteEverythingNotUsedThisLev
//
static void RE_RegisterModels_DumpNonPure(void)
{
- ri->Printf( PRINT_DEVELOPER, "RE_RegisterModels_DumpNonPure():\n");
+ ri.Printf( PRINT_DEVELOPER, "RE_RegisterModels_DumpNonPure():\n");
if(!CachedModels) {
return;
@@ -411,7 +411,7 @@ static void RE_RegisterModels_DumpNonPure(void)
CachedEndianedModelBinary_t &CachedModel = (*itModel).second;
int iCheckSum = -1;
- int iInPak = ri->FS_FileIsInPAK(psModelName, &iCheckSum);
+ int iInPak = ri.FS_FileIsInPAK(psModelName, &iCheckSum);
if (iInPak == -1 || iCheckSum != CachedModel.iPAKFileCheckSum)
{
@@ -419,7 +419,7 @@ static void RE_RegisterModels_DumpNonPure(void)
{
// either this is not from a PAK, or it's from a non-pure one, so ditch it...
//
- ri->Printf( PRINT_DEVELOPER, "Dumping none pure model \"%s\"", psModelName);
+ ri.Printf( PRINT_DEVELOPER, "Dumping none pure model \"%s\"", psModelName);
if (CachedModel.pModelDiskImage) {
Z_Free(CachedModel.pModelDiskImage);
@@ -437,7 +437,7 @@ static void RE_RegisterModels_DumpNonPure(void)
}
}
- ri->Printf( PRINT_DEVELOPER, "RE_RegisterModels_DumpNonPure(): Ok\n");
+ ri.Printf( PRINT_DEVELOPER, "RE_RegisterModels_DumpNonPure(): Ok\n");
}
void RE_RegisterModels_Info_f( void )
@@ -504,7 +504,7 @@ void RE_RegisterMedia_LevelLoadBegin(const char *psMapName, ForceReload_e eForce
}
else
{
- if ( ri->Cvar_VariableIntegerValue( "sv_pure" ) )
+ if ( ri.Cvar_VariableIntegerValue( "sv_pure" ) )
{
RE_RegisterModels_DumpNonPure();
}
@@ -676,7 +676,7 @@ qboolean ServerLoadMDXA( model_t *mod, void *buffer, const char *mod_name, qbool
if (!bAlreadyFound)
{
// horrible new hackery, if !bAlreadyFound then we've just done a tag-morph, so we need to set the
- // bool reference passed into this function to true, to tell the caller NOT to do an ri->FS_Freefile since
+ // bool reference passed into this function to true, to tell the caller NOT to do an ri.FS_Freefile since
// we've hijacked that memory block...
//
// Aaaargh. Kill me now...
@@ -799,7 +799,7 @@ qboolean ServerLoadMDXM( model_t *mod, void *buffer, const char *mod_name, qbool
if (!bAlreadyFound)
{
// horrible new hackery, if !bAlreadyFound then we've just done a tag-morph, so we need to set the
- // bool reference passed into this function to true, to tell the caller NOT to do an ri->FS_Freefile since
+ // bool reference passed into this function to true, to tell the caller NOT to do an ri.FS_Freefile since
// we've hijacked that memory block...
//
// Aaaargh. Kill me now...
@@ -973,7 +973,7 @@ Ghoul2 Insert End
if (!r_noServerGhoul2)
{ //keep it from choking when it gets to these checks in the g2 code. Registering all r_ cvars for the server would be a Bad Thing though.
- r_noServerGhoul2 = ri->Cvar_Get( "r_noserverghoul2", "0", 0, "");
+ r_noServerGhoul2 = ri.Cvar_Get( "r_noserverghoul2", "0", 0, "");
}
if ( !name || !name[0] ) {
@@ -1060,7 +1060,7 @@ Ghoul2 Insert End
}
if (!bAlreadyCached){ // important to check!!
- ri->FS_FreeFile (buf);
+ ri.FS_FreeFile (buf);
}
if ( !loaded ) {
@@ -1138,7 +1138,7 @@ Ghoul2 Insert End
}
if ( strlen( name ) >= MAX_QPATH ) {
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "Model name exceeds MAX_QPATH\n" );
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "Model name exceeds MAX_QPATH\n" );
return 0;
}
@@ -1280,7 +1280,7 @@ Ghoul2 Insert End
}
if (!bAlreadyCached){ // important to check!!
- ri->FS_FreeFile (buf);
+ ri.FS_FreeFile (buf);
}
if ( !loaded ) {
@@ -1412,7 +1412,7 @@ static qboolean R_LoadMD3 (model_t *mod, int lod, void *buffer, const char *mod_
if (!bAlreadyFound)
{
// horrible new hackery, if !bAlreadyFound then we've just done a tag-morph, so we need to set the
- // bool reference passed into this function to true, to tell the caller NOT to do an ri->FS_Freefile since
+ // bool reference passed into this function to true, to tell the caller NOT to do an ri.FS_Freefile since
// we've hijacked that memory block...
//
// Aaaargh. Kill me now...
diff --git a/codemp/rd-dedicated/tr_shader.cpp b/codemp/rd-dedicated/tr_shader.cpp
index 03501c9..d8c49a5 100644
--- a/codemp/rd-dedicated/tr_shader.cpp
+++ b/codemp/rd-dedicated/tr_shader.cpp
@@ -2083,7 +2083,7 @@ static qboolean ParseShader( const char **text )
else if ( token[0] == '{' )
{
if ( s >= MAX_SHADER_STAGES ) {
- ri->Printf( PRINT_WARNING, "WARNING: too many stages in shader %s (max is %i)\n", shader.name, MAX_SHADER_STAGES );
+ ri.Printf( PRINT_WARNING, "WARNING: too many stages in shader %s (max is %i)\n", shader.name, MAX_SHADER_STAGES );
return qfalse;
}
@@ -2403,7 +2403,7 @@ static shader_t *GeneratePermanentShader( void ) {
return tr.defaultShader;
}
- newShader = (struct shader_s *)ri->Hunk_Alloc( sizeof( shader_t ), h_low );
+ newShader = (struct shader_s *)ri.Hunk_Alloc( sizeof( shader_t ), h_low );
*newShader = shader;
@@ -2886,7 +2886,7 @@ static shader_t *FinishShader( void ) {
{
if (vertexLightmap)
{
-// ri->DPrintf( "WARNING: shader '%s' has VERTEX forced lightmap!\n", shader.name );
+// ri.DPrintf( "WARNING: shader '%s' has VERTEX forced lightmap!\n", shader.name );
}
else
{
@@ -3096,7 +3096,7 @@ shader_t *R_FindShader( const char *name, const int *lightmapIndex, const byte *
else if ( lightmapIndex[0] < LIGHTMAP_2D )
{
// negative lightmap indexes cause stray pointers (think tr.lightmaps[lightmapIndex])
- ri->Printf( PRINT_WARNING, "WARNING: shader '%s' has invalid lightmap index of %d\n", name, lightmapIndex[0] );
+ ri.Printf( PRINT_WARNING, "WARNING: shader '%s' has invalid lightmap index of %d\n", name, lightmapIndex[0] );
lightmapIndex = lightmapsVertex;
}
diff --git a/codemp/rd-dedicated/tr_skin.cpp b/codemp/rd-dedicated/tr_skin.cpp
index 0fac2de..ad179d0 100644
--- a/codemp/rd-dedicated/tr_skin.cpp
+++ b/codemp/rd-dedicated/tr_skin.cpp
@@ -96,7 +96,7 @@ qhandle_t RE_RegisterIndividualSkin( const char *name , qhandle_t hSkin)
char surfName[MAX_QPATH];
// load and parse the skin file
- ri->FS_ReadFile( name, (void **)&text );
+ ri.FS_ReadFile( name, (void **)&text );
if ( !text ) {
#ifndef FINAL_BUILD
Com_Printf( "WARNING: RE_RegisterSkin( '%s' ) failed to load!\n", name );
@@ -155,7 +155,7 @@ qhandle_t RE_RegisterIndividualSkin( const char *name , qhandle_t hSkin)
skin->numSurfaces++;
}
- ri->FS_FreeFile( text );
+ ri.FS_FreeFile( text );
// never let a skin have 0 shaders
@@ -350,8 +350,8 @@ Mangled version of the above function to load .skin files on the server.
qhandle_t RE_RegisterServerSkin( const char *name ) {
qhandle_t r;
- if (ri->Cvar_VariableIntegerValue( "cl_running" ) &&
- ri->Com_TheHunkMarkHasBeenMade() &&
+ if (ri.Cvar_VariableIntegerValue( "cl_running" ) &&
+ ri.Com_TheHunkMarkHasBeenMade() &&
ShaderHashTableExists())
{ //If the client is running then we can go straight into the normal registerskin func
return RE_RegisterSkin(name);
@@ -375,10 +375,10 @@ void R_InitSkins( void ) {
tr.numSkins = 1;
// make the default skin have all default shaders
- skin = tr.skins[0] = (struct skin_s *)ri->Hunk_Alloc( sizeof( skin_t ), h_low );
+ skin = tr.skins[0] = (struct skin_s *)ri.Hunk_Alloc( sizeof( skin_t ), h_low );
Q_strncpyz( skin->name, "<default skin>", sizeof( skin->name ) );
skin->numSurfaces = 1;
- skin->surfaces[0] = (_skinSurface_t *)ri->Hunk_Alloc( sizeof( skinSurface_t ), h_low );
+ skin->surfaces[0] = (_skinSurface_t *)ri.Hunk_Alloc( sizeof( skinSurface_t ), h_low );
skin->surfaces[0]->shader = tr.defaultShader;
}
diff --git a/codemp/rd-vanilla/G2_API.cpp b/codemp/rd-vanilla/G2_API.cpp
index 065f3b9..e4af2a3 100644
--- a/codemp/rd-vanilla/G2_API.cpp
+++ b/codemp/rd-vanilla/G2_API.cpp
@@ -55,7 +55,7 @@ void G2_DEBUG_ReportLeaks(void)
if (!g_G2AllocTrackInit)
{
- ri->Printf( PRINT_ALL, "g2 leak tracker was never initialized!\n");
+ ri.Printf( PRINT_ALL, "g2 leak tracker was never initialized!\n");
return;
}
@@ -63,17 +63,17 @@ void G2_DEBUG_ReportLeaks(void)
{
if (g_G2AllocTrack[i])
{
- ri->Printf( PRINT_ALL, "Bad guy found in slot %i, attempting to access...", i);
+ ri.Printf( PRINT_ALL, "Bad guy found in slot %i, attempting to access...", i);
CGhoul2Info_v &g2v = *g_G2AllocTrack[i];
CGhoul2Info &g2 = g2v[0];
if (g2v.IsValid() && g2.mFileName && g2.mFileName[0])
{
- ri->Printf( PRINT_ALL, "Bad guy's filename is %s\n", g2.mFileName);
+ ri.Printf( PRINT_ALL, "Bad guy's filename is %s\n", g2.mFileName);
}
else
{
- ri->Printf( PRINT_ALL, "He's not valid! BURN HIM!\n");
+ ri.Printf( PRINT_ALL, "He's not valid! BURN HIM!\n");
}
}
i++;
@@ -108,11 +108,11 @@ void G2_DEBUG_ShovePtrInTracker(CGhoul2Info_v *g2)
if (g2v[0].currentModel && g2v[0].currentModel->name && g2v[0].currentModel->name[0])
{
- ri->Printf( PRINT_ALL, "%s could not be fit into g2 debug instance tracker.\n", g2v[0].currentModel->name);
+ ri.Printf( PRINT_ALL, "%s could not be fit into g2 debug instance tracker.\n", g2v[0].currentModel->name);
}
else
{
- ri->Printf( PRINT_ALL, "Crap g2 instance passed to instance tracker (in).\n");
+ ri.Printf( PRINT_ALL, "Crap g2 instance passed to instance tracker (in).\n");
}
}
@@ -139,11 +139,11 @@ void G2_DEBUG_RemovePtrFromTracker(CGhoul2Info_v *g2)
if (g2v[0].currentModel && g2v[0].currentModel->name && g2v[0].currentModel->name[0])
{
- ri->Printf( PRINT_ALL, "%s not in g2 debug instance tracker.\n", g2v[0].currentModel->name);
+ ri.Printf( PRINT_ALL, "%s not in g2 debug instance tracker.\n", g2v[0].currentModel->name);
}
else
{
- ri->Printf( PRINT_ALL, "Crap g2 instance passed to instance tracker (out).\n");
+ ri.Printf( PRINT_ALL, "Crap g2 instance passed to instance tracker (out).\n");
}
}
#endif
@@ -160,7 +160,7 @@ void G2API_SetTime(int currentTime,int clock)
{
assert(clock>=0&&clock<NUM_G2T_TIME);
#if G2_DEBUG_TIME
- ri->Printf( PRINT_ALL, "Set Time: before c%6d s%6d",G2TimeBases[1],G2TimeBases[0]);
+ ri.Printf( PRINT_ALL, "Set Time: before c%6d s%6d",G2TimeBases[1],G2TimeBases[0]);
#endif
G2TimeBases[clock]=currentTime;
if (G2TimeBases[1]>G2TimeBases[0]+200)
@@ -169,7 +169,7 @@ void G2API_SetTime(int currentTime,int clock)
return;
}
#if G2_DEBUG_TIME
- ri->Printf( PRINT_ALL, " after c%6d s%6d\n",G2TimeBases[1],G2TimeBases[0]);
+ ri.Printf( PRINT_ALL, " after c%6d s%6d\n",G2TimeBases[1],G2TimeBases[0]);
#endif
}
@@ -240,7 +240,7 @@ qboolean G2API_OverrideServerWithClientData(CGhoul2Info_v& ghoul2, int modelInde
CGhoul2Info *serverInstance = &ghoul2[modelIndex];
CGhoul2Info *clientInstance;
- if (ri->Cvar_VariableIntegerValue( "dedicated" ))
+ if (ri.Cvar_VariableIntegerValue( "dedicated" ))
{ //No client to get from!
return qfalse;
}
@@ -657,7 +657,7 @@ void RestoreGhoul2InfoArray()
TheGhoul2InfoArray();
size_t size;
- const void *data = ri->PD_Load (PERSISTENT_G2DATA, &size);
+ const void *data = ri.PD_Load (PERSISTENT_G2DATA, &size);
if ( data == NULL )
{
return;
@@ -684,7 +684,7 @@ void SaveGhoul2InfoArray()
assert (written == size);
- if ( !ri->PD_Store (PERSISTENT_G2DATA, data, size) )
+ if ( !ri.PD_Store (PERSISTENT_G2DATA, data, size) )
{
Com_Printf (S_COLOR_RED "ERROR: Failed to store persistent renderer data.\n");
}
@@ -737,8 +737,8 @@ void G2API_CleanGhoul2Models(CGhoul2Info_v **ghoul2Ptr)
strcpy(fName, "None?!");
}
- ri->Printf( PRINT_ALL, "ERROR, GHOUL2 INSTANCE BEING REMOVED BELONGS TO A REFENTITY!\nThis is in caps because it's important. Tell Rich and save the following text.\n\n");
- ri->Printf( PRINT_ALL, "Ref num: %i\nModel: %s\nFilename: %s\n", i, mName, fName);
+ ri.Printf( PRINT_ALL, "ERROR, GHOUL2 INSTANCE BEING REMOVED BELONGS TO A REFENTITY!\nThis is in caps because it's important. Tell Rich and save the following text.\n\n");
+ ri.Printf( PRINT_ALL, "Ref num: %i\nModel: %s\nFilename: %s\n", i, mName, fName);
R_SetRNumEntities(0); //avoid recursive error
Com_Error(ERR_DROP, "Write down or save this error message, show it to Rich\nRef num: %i\nModel: %s\nFilename: %s\n", i, mName, fName);
@@ -771,12 +771,12 @@ void G2API_CleanGhoul2Models(CGhoul2Info_v **ghoul2Ptr)
qboolean G2_ShouldRegisterServer(void)
{
- vm_t *currentVM = ri->GetCurrentVM();
+ vm_t *currentVM = ri.GetCurrentVM();
if ( currentVM && currentVM->slot == VM_GAME )
{
- if ( ri->Cvar_VariableIntegerValue( "cl_running" ) &&
- ri->Com_TheHunkMarkHasBeenMade() && ShaderHashTableExists())
+ if ( ri.Cvar_VariableIntegerValue( "cl_running" ) &&
+ ri.Com_TheHunkMarkHasBeenMade() && ShaderHashTableExists())
{ //if the hunk has been marked then we are now loading client assets so don't load on server.
return qfalse;
}
@@ -1661,7 +1661,7 @@ void G2API_AnimateG2ModelsRag(CGhoul2Info_v &ghoul2, int AcurrentTime,CRagDollUp
/*
if (ragTraceTime)
{
- ri->Printf( PRINT_ALL, "Rag trace time: %i (%i STARTSOLID, %i TOTAL)\n", ragTraceTime, ragSSCount, ragTraceCount);
+ ri.Printf( PRINT_ALL, "Rag trace time: %i (%i STARTSOLID, %i TOTAL)\n", ragTraceTime, ragSSCount, ragTraceCount);
}
*/
@@ -2581,7 +2581,7 @@ char *G2API_GetSurfaceName(CGhoul2Info_v& ghoul2, int modelIndex, int surfNumber
//may have.. but how did they get that surf index to begin with? Oh well.
if (surfNumber < 0 || surfNumber >= mod->mdxm->numSurfaces)
{
- ri->Printf( PRINT_ALL, "G2API_GetSurfaceName: You passed in an invalid surface number (%i) for model %s.\n", surfNumber, ghlInfo->mFileName);
+ ri.Printf( PRINT_ALL, "G2API_GetSurfaceName: You passed in an invalid surface number (%i) for model %s.\n", surfNumber, ghlInfo->mFileName);
return noSurface;
}
@@ -2795,14 +2795,14 @@ void G2API_AddSkinGore(CGhoul2Info_v &ghoul2,SSkinGoreData &gore)
int lod;
ResetGoreTag();
- const int lodbias=Com_Clamp ( 0, 2,G2_DecideTraceLod(ghoul2[0], ri->Cvar_VariableIntegerValue( "r_lodbias" )));
+ const int lodbias=Com_Clamp ( 0, 2,G2_DecideTraceLod(ghoul2[0], ri.Cvar_VariableIntegerValue( "r_lodbias" )));
const int maxLod =Com_Clamp (0,ghoul2[0].currentModel->numLods,3); //limit to the number of lods the main model has
for(lod=lodbias;lod<maxLod;lod++)
{
// now having done that, time to build the model
- ri->GetG2VertSpaceServer()->ResetHeap();
+ ri.GetG2VertSpaceServer()->ResetHeap();
- G2_TransformModel(ghoul2, gore.currentTime, gore.scale,ri->GetG2VertSpaceServer(),lod,true);
+ G2_TransformModel(ghoul2, gore.currentTime, gore.scale,ri.GetG2VertSpaceServer(),lod,true);
// now walk each model and compute new texture coordinates
G2_TraceModels(ghoul2, transHitLocation, transRayDirection, 0, gore.entNum, 0,lod,0.0f,gore.SSize,gore.TSize,gore.theta,gore.shader,&gore,qtrue);
@@ -2820,7 +2820,7 @@ qboolean G2_TestModelPointers(CGhoul2Info *ghlInfo) // returns true if the model
ghlInfo->mValid=false;
if (ghlInfo->mModelindex != -1)
{
- if (ri->Cvar_VariableIntegerValue( "dedicated" ) ||
+ if (ri.Cvar_VariableIntegerValue( "dedicated" ) ||
(G2_ShouldRegisterServer())) //supreme hackery!
{
ghlInfo->mModel = RE_RegisterServerModel(ghlInfo->mFileName);
@@ -2911,7 +2911,7 @@ qboolean G2_SetupModelPointers(CGhoul2Info *ghlInfo) // returns true if the mode
// RJ - experimental optimization!
if (!ghlInfo->mModel || 1)
{
- if (ri->Cvar_VariableIntegerValue( "dedicated" ) ||
+ if (ri.Cvar_VariableIntegerValue( "dedicated" ) ||
(G2_ShouldRegisterServer())) //supreme hackery!
{
ghlInfo->mModel = RE_RegisterServerModel(ghlInfo->mFileName);
diff --git a/codemp/rd-vanilla/G2_bolts.cpp b/codemp/rd-vanilla/G2_bolts.cpp
index db30d6f..cc35e65 100644
--- a/codemp/rd-vanilla/G2_bolts.cpp
+++ b/codemp/rd-vanilla/G2_bolts.cpp
@@ -193,7 +193,7 @@ int G2_Add_Bolt(CGhoul2Info *ghlInfo, boltInfo_v &bltlist, surfaceInfo_v &slist,
// didn't find it? Error
//assert(0&&x == mod_a->mdxa->numBones);
#ifdef _DEBUG
-// ri->Printf( PRINT_ALL, "WARNING: %s not found on skeleton\n", boneName);
+// ri.Printf( PRINT_ALL, "WARNING: %s not found on skeleton\n", boneName);
#endif
return -1;
}
diff --git a/codemp/rd-vanilla/G2_bones.cpp b/codemp/rd-vanilla/G2_bones.cpp
index 4d95362..6737950 100644
--- a/codemp/rd-vanilla/G2_bones.cpp
+++ b/codemp/rd-vanilla/G2_bones.cpp
@@ -105,11 +105,11 @@ int G2_Add_Bone (const model_t *mod, boneInfo_v &blist, const char *boneName)
// didn't find it? Error
//assert(0);
#ifdef _DEBUG
- ri->Printf( PRINT_ALL, "WARNING: Failed to add bone %s\n", boneName);
+ ri.Printf( PRINT_ALL, "WARNING: Failed to add bone %s\n", boneName);
#endif
#ifdef _RAG_PRINT_TEST
- ri->Printf( PRINT_ALL, "WARNING: Failed to add bone %s\n", boneName);
+ ri.Printf( PRINT_ALL, "WARNING: Failed to add bone %s\n", boneName);
#endif
return -1;
}
@@ -137,7 +137,7 @@ int G2_Add_Bone (const model_t *mod, boneInfo_v &blist, const char *boneName)
}
#ifdef _RAG_PRINT_TEST
- ri->Printf( PRINT_ALL, "New bone added for %s\n", boneName);
+ ri.Printf( PRINT_ALL, "New bone added for %s\n", boneName);
#endif
// ok, we didn't find an existing bone of that name, or an empty slot. Lets add an entry
tempBone.boneNumber = x;
@@ -2693,11 +2693,11 @@ int ragTraceCount = 0;
void Rag_Trace( trace_t *results, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, const int passEntityNum, const int contentmask, const EG2_Collision eG2TraceType, const int useLod )
{
#ifdef _DEBUG
- int ragPreTrace = ri->Milliseconds();
+ int ragPreTrace = ri.Milliseconds();
#endif
- if ( ri->CGVMLoaded() )
+ if ( ri.CGVMLoaded() )
{
- ragCallbackTraceLine_t *callData = (ragCallbackTraceLine_t *)ri->GetSharedMemory();
+ ragCallbackTraceLine_t *callData = (ragCallbackTraceLine_t *)ri.GetSharedMemory();
VectorCopy(start, callData->start);
VectorCopy(end, callData->end);
@@ -2706,7 +2706,7 @@ void Rag_Trace( trace_t *results, const vec3_t start, const vec3_t mins, const v
callData->ignore = passEntityNum;
callData->mask = contentmask;
- ri->CGVM_RagCallback( RAG_CALLBACK_TRACELINE );
+ ri.CGVM_RagCallback( RAG_CALLBACK_TRACELINE );
*results = callData->tr;
}
@@ -2714,12 +2714,12 @@ void Rag_Trace( trace_t *results, const vec3_t start, const vec3_t mins, const v
{
results->entityNum = ENTITYNUM_NONE;
//SV_Trace(results, start, mins, maxs, end, passEntityNum, contentmask, eG2TraceType, useLod);
- ri->CM_BoxTrace(results, start, end, mins, maxs, 0, contentmask, 0);
+ ri.CM_BoxTrace(results, start, end, mins, maxs, 0, contentmask, 0);
results->entityNum = results->fraction != 1.0 ? ENTITYNUM_WORLD : ENTITYNUM_NONE;
}
#ifdef _DEBUG
- int ragPostTrace = ri->Milliseconds();
+ int ragPostTrace = ri.Milliseconds();
ragTraceTime += (ragPostTrace - ragPreTrace);
if (results->startsolid)
@@ -2890,24 +2890,24 @@ static inline bool G2_ApplyRealBonePhysics(boneInfo_t &bone, SRagEffector &e, CR
#ifdef _DEBUG_BONE_NAMES
static inline void G2_RagDebugBox(vec3_t mins, vec3_t maxs, int duration)
{
- if ( !ri->CGVMLoaded() )
+ if ( !ri.CGVMLoaded() )
return;
- ragCallbackDebugBox_t *callData = (ragCallbackDebugBox_t *)ri->GetSharedMemory();
+ ragCallbackDebugBox_t *callData = (ragCallbackDebugBox_t *)ri.GetSharedMemory();
callData->duration = duration;
VectorCopy(mins, callData->mins);
VectorCopy(maxs, callData->maxs);
- ri->CGVM_RagCallback( RAG_CALLBACK_DEBUGBOX );
+ ri.CGVM_RagCallback( RAG_CALLBACK_DEBUGBOX );
}
static inline void G2_RagDebugLine(vec3_t start, vec3_t end, int time, int color, int radius)
{
- if ( !ri->CGVMLoaded() )
+ if ( !ri.CGVMLoaded() )
return;
- ragCallbackDebugLine_t *callData = (ragCallbackDebugLine_t *)ri->GetSharedMemory();
+ ragCallbackDebugLine_t *callData = (ragCallbackDebugLine_t *)ri.GetSharedMemory();
VectorCopy(start, callData->start);
VectorCopy(end, callData->end);
@@ -2915,7 +2915,7 @@ static inline void G2_RagDebugLine(vec3_t start, vec3_t end, int time, int color
callData->color = color;
callData->radius = radius;
- ri->CGVM_RagCallback( RAG_CALLBACK_DEBUGLINE );
+ ri.CGVM_RagCallback( RAG_CALLBACK_DEBUGLINE );
}
#endif
@@ -3048,15 +3048,15 @@ static bool G2_RagDollSettlePositionNumeroTrois(CGhoul2Info_v &ghoul2V, const ve
{
//SRagDollEffectorCollision args(e.currentOrigin,tr);
//params->EffectorCollision(args);
- if ( ri->CGVMLoaded() )
+ if ( ri.CGVMLoaded() )
{ //make a callback and see if the cgame wants to help us out
- ragCallbackBoneInSolid_t *callData = (ragCallbackBoneInSolid_t *)ri->GetSharedMemory();
+ ragCallbackBoneInSolid_t *callData = (ragCallbackBoneInSolid_t *)ri.GetSharedMemory();
VectorCopy(e.currentOrigin, callData->bonePos);
callData->entNum = params->me;
callData->solidCount = bone.solidCount;
- ri->CGVM_RagCallback( RAG_CALLBACK_BONEINSOLID );
+ ri.CGVM_RagCallback( RAG_CALLBACK_BONEINSOLID );
}
}
}
@@ -3075,15 +3075,15 @@ static bool G2_RagDollSettlePositionNumeroTrois(CGhoul2Info_v &ghoul2V, const ve
//SRagDollEffectorCollision args(e.currentOrigin,tr);
//args.useTracePlane=true;
//params->EffectorCollision(args);
- if ( ri->CGVMLoaded() )
+ if ( ri.CGVMLoaded() )
{ //make a callback and see if the cgame wants to help us out
- ragCallbackBoneInSolid_t *callData = (ragCallbackBoneInSolid_t *)ri->GetSharedMemory();
+ ragCallbackBoneInSolid_t *callData = (ragCallbackBoneInSolid_t *)ri.GetSharedMemory();
VectorCopy(e.currentOrigin, callData->bonePos);
callData->entNum = params->me;
callData->solidCount = bone.solidCount;
- ri->CGVM_RagCallback( RAG_CALLBACK_BONEINSOLID );
+ ri.CGVM_RagCallback( RAG_CALLBACK_BONEINSOLID );
}
}
}
@@ -3168,15 +3168,15 @@ static bool G2_RagDollSettlePositionNumeroTrois(CGhoul2Info_v &ghoul2V, const ve
//SRagDollEffectorCollision args(e.currentOrigin,tr);
//args.useTracePlane=true;
//params->EffectorCollision(args);
- if ( ri->CGVMLoaded() )
+ if ( ri.CGVMLoaded() )
{ //make a callback and see if the cgame wants to help us out
- ragCallbackBoneInSolid_t *callData = (ragCallbackBoneInSolid_t *)ri->GetSharedMemory();
+ ragCallbackBoneInSolid_t *callData = (ragCallbackBoneInSolid_t *)ri.GetSharedMemory();
VectorCopy(e.currentOrigin, callData->bonePos);
callData->entNum = params->me;
callData->solidCount = bone.solidCount;
- ri->CGVM_RagCallback( RAG_CALLBACK_BONEINSOLID );
+ ri.CGVM_RagCallback( RAG_CALLBACK_BONEINSOLID );
}
}
}
@@ -3203,15 +3203,15 @@ static bool G2_RagDollSettlePositionNumeroTrois(CGhoul2Info_v &ghoul2V, const ve
//SRagDollEffectorCollision args(e.currentOrigin,tr);
//args.useTracePlane=true;
//params->EffectorCollision(args);
- if ( ri->CGVMLoaded() )
+ if ( ri.CGVMLoaded() )
{ //make a callback and see if the cgame wants to help us out
- ragCallbackBoneInSolid_t *callData = (ragCallbackBoneInSolid_t *)ri->GetSharedMemory();
+ ragCallbackBoneInSolid_t *callData = (ragCallbackBoneInSolid_t *)ri.GetSharedMemory();
VectorCopy(e.currentOrigin, callData->bonePos);
callData->entNum = params->me;
callData->solidCount = bone.solidCount;
- ri->CGVM_RagCallback( RAG_CALLBACK_BONEINSOLID );
+ ri.CGVM_RagCallback( RAG_CALLBACK_BONEINSOLID );
}
}
}
@@ -3354,7 +3354,7 @@ void G2_RagPrintMatrix(mdxaBone_t *mat)
n++;
}
strcat(x, "\n");
- ri->Printf( PRINT_ALL, x);
+ ri.Printf( PRINT_ALL, x);
}
#endif
@@ -3716,7 +3716,7 @@ static bool G2_RagDollSettlePositionNumeroTrois(CGhoul2Info_v &ghoul2V, const ve
VectorCopy(basePos, goalSpot);
goalSpot[2] = (params->position[2]-23)-testMins[2];
#endif
- //ri->Printf( PRINT_ALL, "%i: %f %f %f\n", bone.boneNumber, basePos[0], basePos[1], basePos[2]);
+ //ri.Printf( PRINT_ALL, "%i: %f %f %f\n", bone.boneNumber, basePos[0], basePos[1], basePos[2]);
}
else
{ //if deep in solid want to try to rise up out of solid before hinting back to base
@@ -3810,7 +3810,7 @@ static bool G2_RagDollSettlePositionNumeroTrois(CGhoul2Info_v &ghoul2V, const ve
{
bone.solidCount++;
#if 0
- if ( ri->CGVMLoaded() && bone.solidCount > 8 )
+ if ( ri.CGVMLoaded() && bone.solidCount > 8 )
{ //make a callback and see if the cgame wants to help us out
Rag_Trace(&solidTr, params->position, testMins, testMaxs, e.currentOrigin, ignoreNum, RAG_MASK, G2_NOCOLLIDE, 0);
@@ -3819,13 +3819,13 @@ static bool G2_RagDollSettlePositionNumeroTrois(CGhoul2Info_v &ghoul2V, const ve
(solidTr.plane.normal[2] < 0.1f || solidTr.plane.normal[2] > -0.1f))// && //don't do anything against flat around
// e.currentOrigin[2] > pelvisPos[2])
{
- ragCallbackBoneInSolid_t *callData = (ragCallbackBoneInSolid_t *)ri->GetSharedMemory();
+ ragCallbackBoneInSolid_t *callData = (ragCallbackBoneInSolid_t *)ri.GetSharedMemory();
VectorCopy(e.currentOrigin, callData->bonePos);
callData->entNum = params->me;
callData->solidCount = bone.solidCount;
- ri->CGVM_RagCallback( RAG_CALLBACK_BONEINSOLID );
+ ri.CGVM_RagCallback( RAG_CALLBACK_BONEINSOLID );
}
}
#endif
@@ -3838,7 +3838,7 @@ static bool G2_RagDollSettlePositionNumeroTrois(CGhoul2Info_v &ghoul2V, const ve
assert(debugBoneName);
- ri->Printf( PRINT_ALL, "High bone (%s, %i) solid count: %i\n", debugBoneName, bone.boneNumber, bone.solidCount);
+ ri.Printf( PRINT_ALL, "High bone (%s, %i) solid count: %i\n", debugBoneName, bone.boneNumber, bone.solidCount);
VectorAdd(e.currentOrigin, testMins, absmin);
VectorAdd(e.currentOrigin, testMaxs, absmax);
@@ -3935,17 +3935,17 @@ static float AngleNormZero(float theta)
static inline void G2_BoneSnap(CGhoul2Info_v &ghoul2V, boneInfo_t &bone, CRagDollUpdateParams *params)
{
- if ( !ri->CGVMLoaded() || !params )
+ if ( !ri.CGVMLoaded() || !params )
{
return;
}
- ragCallbackBoneSnap_t *callData = (ragCallbackBoneSnap_t *)ri->GetSharedMemory();
+ ragCallbackBoneSnap_t *callData = (ragCallbackBoneSnap_t *)ri.GetSharedMemory();
callData->entNum = params->me;
strcpy(callData->boneName, G2_Get_Bone_Name(&ghoul2V[0], ghoul2V[0].mBlist, bone.boneNumber));
- ri->CGVM_RagCallback( RAG_CALLBACK_BONESNAP );
+ ri.CGVM_RagCallback( RAG_CALLBACK_BONESNAP );
}
static void G2_RagDollSolve(CGhoul2Info_v &ghoul2V,int g2Index,float decay,int frameNum,const vec3_t currentOrg,bool limitAngles,CRagDollUpdateParams *params)
diff --git a/codemp/rd-vanilla/G2_misc.cpp b/codemp/rd-vanilla/G2_misc.cpp
index 76468bb..02cded0 100644
--- a/codemp/rd-vanilla/G2_misc.cpp
+++ b/codemp/rd-vanilla/G2_misc.cpp
@@ -276,13 +276,13 @@ void G2_List_Model_Surfaces(const char *fileName)
for ( x = 0 ; x < mod_m->mdxm->numSurfaces ; x++)
{
- ri->Printf( PRINT_ALL, "Surface %i Name %s\n", x, surf->name);
+ ri.Printf( PRINT_ALL, "Surface %i Name %s\n", x, surf->name);
if ( r_verbose->integer )
{
- ri->Printf( PRINT_ALL, "Num Descendants %i\n", surf->numChildren);
+ ri.Printf( PRINT_ALL, "Num Descendants %i\n", surf->numChildren);
for (i=0; i<surf->numChildren; i++)
{
- ri->Printf( PRINT_ALL, "Descendant %i\n", surf->childIndexes[i]);
+ ri.Printf( PRINT_ALL, "Descendant %i\n", surf->childIndexes[i]);
}
}
// find the next surface
@@ -314,17 +314,17 @@ void G2_List_Model_Bones(const char *fileName, int frame)
for (x=0; x< mod_a->mdxa->numBones; x++)
{
skel = (mdxaSkel_t *)((byte *)header + sizeof(mdxaHeader_t) + offsets->offsets[x]);
- ri->Printf( PRINT_ALL, "Bone %i Name %s\n", x, skel->name);
+ ri.Printf( PRINT_ALL, "Bone %i Name %s\n", x, skel->name);
- ri->Printf( PRINT_ALL, "X pos %f, Y pos %f, Z pos %f\n", skel->BasePoseMat.matrix[0][3], skel->BasePoseMat.matrix[1][3], skel->BasePoseMat.matrix[2][3]);
+ ri.Printf( PRINT_ALL, "X pos %f, Y pos %f, Z pos %f\n", skel->BasePoseMat.matrix[0][3], skel->BasePoseMat.matrix[1][3], skel->BasePoseMat.matrix[2][3]);
// if we are in verbose mode give us more details
if ( r_verbose->integer )
{
- ri->Printf( PRINT_ALL, "Num Descendants %i\n", skel->numChildren);
+ ri.Printf( PRINT_ALL, "Num Descendants %i\n", skel->numChildren);
for (i=0; i<skel->numChildren; i++)
{
- ri->Printf( PRINT_ALL, "Num Descendants %i\n", skel->numChildren);
+ ri.Printf( PRINT_ALL, "Num Descendants %i\n", skel->numChildren);
}
}
}
@@ -551,7 +551,7 @@ void G2_TransformModel(CGhoul2Info_v &ghoul2, const int frameNum, vec3_t scale,
if ( cg_g2MarksAllModels == NULL )
{
- cg_g2MarksAllModels = ri->Cvar_Get( "cg_g2MarksAllModels", "0", 0, "" );
+ cg_g2MarksAllModels = ri.Cvar_Get( "cg_g2MarksAllModels", "0", 0, "" );
}
if (cg_g2MarksAllModels == NULL
@@ -1162,7 +1162,7 @@ static bool G2_TracePolys(const mdxmSurface_t *surface, const mdxmSurfHierarchy_
newCol.mLocation = *(hitMatReg[shader->hitLocation].loc +
((int)(y_pos * hitMatReg[shader->hitLocation].height) * hitMatReg[shader->hitLocation].width) +
((int)(x_pos * hitMatReg[shader->hitLocation].width)));
- ri->Printf( PRINT_ALL, "G2_TracePolys hit location: %d\n", newCol.mLocation);
+ ri.Printf( PRINT_ALL, "G2_TracePolys hit location: %d\n", newCol.mLocation);
}
if (shader->hitMaterial)
@@ -1500,7 +1500,7 @@ void G2_TraceModels(CGhoul2Info_v &ghoul2, vec3_t rayStart, vec3_t rayEnd, Colli
if ( cg_g2MarksAllModels == NULL )
{
- cg_g2MarksAllModels = ri->Cvar_Get( "cg_g2MarksAllModels", "0", 0, "" );
+ cg_g2MarksAllModels = ri.Cvar_Get( "cg_g2MarksAllModels", "0", 0, "" );
}
if (cg_g2MarksAllModels == NULL
diff --git a/codemp/rd-vanilla/glext.h b/codemp/rd-vanilla/glext.h
index 63ea7f2..bedd070 100644
--- a/codemp/rd-vanilla/glext.h
+++ b/codemp/rd-vanilla/glext.h
@@ -11767,4 +11767,4 @@ GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (co
}
#endif
-#endif
\ No newline at end of file
+#endif
diff --git a/codemp/rd-vanilla/tr_WorldEffects.cpp b/codemp/rd-vanilla/tr_WorldEffects.cpp
index 223438a..67acd6c 100644
--- a/codemp/rd-vanilla/tr_WorldEffects.cpp
+++ b/codemp/rd-vanilla/tr_WorldEffects.cpp
@@ -558,7 +558,7 @@ public:
//---------------------------------------------------------------------
if (!mWeatherZones.size())
{
- ri->Printf( PRINT_ALL, "WARNING: No Weather Zones Encountered\n");
+ ri.Printf( PRINT_ALL, "WARNING: No Weather Zones Encountered\n");
AddWeatherZone(tr.world->bmodels[0].bounds[0], tr.world->bmodels[0].bounds[1]);
}
@@ -595,7 +595,7 @@ public:
CurPos[2] = (zbase + q) * POINTCACHE_CELL_SIZE;
CurPos += Mins;
- contents = ri->CM_PointContents(CurPos.v, 0);
+ contents = ri.CM_PointContents(CurPos.v, 0);
if (contents&CONTENTS_INSIDE || contents&CONTENTS_OUTSIDE)
{
curPosOutside = ((contents&CONTENTS_OUTSIDE)!=0);
@@ -642,7 +642,7 @@ public:
{
if (!mCacheInit)
{
- return ContentsOutside(ri->CM_PointContents(pos.v, 0));
+ return ContentsOutside(ri.CM_PointContents(pos.v, 0));
}
for (int zone=0; zone<mWeatherZones.size(); zone++)
{
@@ -1330,7 +1330,7 @@ ratl::vector_vs<CWeatherParticleCloud, MAX_PARTICLE_CLOUDS> mParticleClouds;
////////////////////////////////////////////////////////////////////////////////////////
void R_InitWorldEffects(void)
{
- srand(ri->Milliseconds());
+ srand(ri.Milliseconds());
for (int i=0; i<mParticleClouds.size(); i++)
{
@@ -1416,7 +1416,7 @@ void RB_RenderWorldEffects(void)
}
if (false)
{
- ri->Printf( PRINT_ALL, "Weather: %d Particles Rendered\n", mParticlesRendered);
+ ri.Printf( PRINT_ALL, "Weather: %d Particles Rendered\n", mParticlesRendered);
}
}
}
@@ -1425,7 +1425,7 @@ void RB_RenderWorldEffects(void)
void R_WorldEffect_f(void)
{
char temp[2048] = {0};
- ri->Cmd_ArgsBuffer( temp, sizeof( temp ) );
+ ri.Cmd_ArgsBuffer( temp, sizeof( temp ) );
RE_WorldEffectCommand( temp );
}
@@ -1441,14 +1441,14 @@ qboolean WE_ParseVector( const char **text, int count, float *v ) {
// FIXME: spaces are currently required after parens, should change parseext...
token = COM_ParseExt( text, qfalse );
if ( strcmp( token, "(" ) ) {
- ri->Printf (PRINT_WARNING, "WARNING: missing parenthesis in weather effect\n" );
+ ri.Printf (PRINT_WARNING, "WARNING: missing parenthesis in weather effect\n" );
return qfalse;
}
for ( i = 0 ; i < count ; i++ ) {
token = COM_ParseExt( text, qfalse );
if ( !token[0] ) {
- ri->Printf (PRINT_WARNING, "WARNING: missing vector element in weather effect\n" );
+ ri.Printf (PRINT_WARNING, "WARNING: missing vector element in weather effect\n" );
return qfalse;
}
v[i] = atof( token );
@@ -1456,7 +1456,7 @@ qboolean WE_ParseVector( const char **text, int count, float *v ) {
token = COM_ParseExt( text, qfalse );
if ( strcmp( token, ")" ) ) {
- ri->Printf (PRINT_WARNING, "WARNING: missing parenthesis in weather effect\n" );
+ ri.Printf (PRINT_WARNING, "WARNING: missing parenthesis in weather effect\n" );
return qfalse;
}
@@ -1830,27 +1830,27 @@ void RE_WorldEffectCommand(const char *command)
}
else
{
- ri->Printf( PRINT_ALL, "Weather Effect: Please enter a valid command.\n" );
- ri->Printf( PRINT_ALL, " die\n" );
- ri->Printf( PRINT_ALL, " clear\n" );
- ri->Printf( PRINT_ALL, " freeze\n" );
- ri->Printf( PRINT_ALL, " zone (mins) (maxs)\n" );
- ri->Printf( PRINT_ALL, " wind\n" );
- ri->Printf( PRINT_ALL, " constantwind (velocity)\n" );
- ri->Printf( PRINT_ALL, " gustingwind\n" );
- //ri->Printf( PRINT_ALL, " windzone (mins) (maxs) (velocity)\n" );
- ri->Printf( PRINT_ALL, " lightrain\n" );
- ri->Printf( PRINT_ALL, " rain\n" );
- ri->Printf( PRINT_ALL, " acidrain\n" );
- ri->Printf( PRINT_ALL, " heavyrain\n" );
- ri->Printf( PRINT_ALL, " snow\n" );
- ri->Printf( PRINT_ALL, " spacedust\n" );
- ri->Printf( PRINT_ALL, " sand\n" );
- ri->Printf( PRINT_ALL, " fog\n" );
- ri->Printf( PRINT_ALL, " heavyrainfog\n" );
- ri->Printf( PRINT_ALL, " light_fog\n" );
- ri->Printf( PRINT_ALL, " outsideshake\n" );
- ri->Printf( PRINT_ALL, " outsidepain\n" );
+ ri.Printf( PRINT_ALL, "Weather Effect: Please enter a valid command.\n" );
+ ri.Printf( PRINT_ALL, " die\n" );
+ ri.Printf( PRINT_ALL, " clear\n" );
+ ri.Printf( PRINT_ALL, " freeze\n" );
+ ri.Printf( PRINT_ALL, " zone (mins) (maxs)\n" );
+ ri.Printf( PRINT_ALL, " wind\n" );
+ ri.Printf( PRINT_ALL, " constantwind (velocity)\n" );
+ ri.Printf( PRINT_ALL, " gustingwind\n" );
+ //ri.Printf( PRINT_ALL, " windzone (mins) (maxs) (velocity)\n" );
+ ri.Printf( PRINT_ALL, " lightrain\n" );
+ ri.Printf( PRINT_ALL, " rain\n" );
+ ri.Printf( PRINT_ALL, " acidrain\n" );
+ ri.Printf( PRINT_ALL, " heavyrain\n" );
+ ri.Printf( PRINT_ALL, " snow\n" );
+ ri.Printf( PRINT_ALL, " spacedust\n" );
+ ri.Printf( PRINT_ALL, " sand\n" );
+ ri.Printf( PRINT_ALL, " fog\n" );
+ ri.Printf( PRINT_ALL, " heavyrainfog\n" );
+ ri.Printf( PRINT_ALL, " light_fog\n" );
+ ri.Printf( PRINT_ALL, " outsideshake\n" );
+ ri.Printf( PRINT_ALL, " outsidepain\n" );
}
}
diff --git a/codemp/rd-vanilla/tr_backend.cpp b/codemp/rd-vanilla/tr_backend.cpp
index eb6ee3f..d509199 100644
--- a/codemp/rd-vanilla/tr_backend.cpp
+++ b/codemp/rd-vanilla/tr_backend.cpp
@@ -61,7 +61,7 @@ void GL_Bind( image_t *image ) {
int texnum;
if ( !image ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "GL_Bind: NULL image\n" );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "GL_Bind: NULL image\n" );
texnum = tr.defaultImage->texnum;
} else {
texnum = image->texnum;
@@ -1203,7 +1203,7 @@ void RB_SetGL2D (void) {
qglDisable( GL_CLIP_PLANE0 );
// set time for 2D shaders
- backEnd.refdef.time = ri->Milliseconds()*ri->Cvar_VariableValue( "timescale" );
+ backEnd.refdef.time = ri.Milliseconds()*ri.Cvar_VariableValue( "timescale" );
backEnd.refdef.floatTime = backEnd.refdef.time * 0.001f;
}
@@ -1235,7 +1235,7 @@ void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *
start = end = 0;
if ( r_speeds->integer ) {
- start = ri->Milliseconds()*ri->Cvar_VariableValue( "timescale" );
+ start = ri.Milliseconds()*ri.Cvar_VariableValue( "timescale" );
}
// make sure rows and cols are powers of 2
@@ -1264,8 +1264,8 @@ void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *
}
if ( r_speeds->integer ) {
- end = ri->Milliseconds()*ri->Cvar_VariableValue( "timescale" );
- ri->Printf( PRINT_ALL, "qglTexSubImage2D %i, %i: %i msec\n", cols, rows, end - start );
+ end = ri.Milliseconds()*ri.Cvar_VariableValue( "timescale" );
+ ri.Printf( PRINT_ALL, "qglTexSubImage2D %i, %i: %i msec\n", cols, rows, end - start );
}
RB_SetGL2D();
@@ -1785,7 +1785,7 @@ void RB_ShowImages( void ) {
qglFinish();
-// start = ri->Milliseconds()*ri->Cvar_VariableValue( "timescale" );
+// start = ri.Milliseconds()*ri.Cvar_VariableValue( "timescale" );
int i=0;
@@ -1819,8 +1819,8 @@ void RB_ShowImages( void ) {
qglFinish();
-// end = ri->Milliseconds()*ri->Cvar_VariableValue( "timescale" );
-// ri->Printf( PRINT_ALL, "%i msec to draw all images\n", end - start );
+// end = ri.Milliseconds()*ri.Cvar_VariableValue( "timescale" );
+// ri.Printf( PRINT_ALL, "%i msec to draw all images\n", end - start );
}
static void RB_GammaCorrectRender()
@@ -1919,7 +1919,7 @@ const void *RB_SwapBuffers( const void *data ) {
GLimp_LogComment( "***************** RB_SwapBuffers *****************\n\n\n" );
- ri->WIN_Present(&window);
+ ri.WIN_Present(&window);
backEnd.projection2D = qfalse;
@@ -1956,7 +1956,7 @@ extern const void *R_DrawWireframeAutomap(const void *data); //tr_world.cpp
void RB_ExecuteRenderCommands( const void *data ) {
int t1, t2;
- t1 = ri->Milliseconds()*ri->Cvar_VariableValue( "timescale" );
+ t1 = ri.Milliseconds()*ri.Cvar_VariableValue( "timescale" );
while ( 1 ) {
data = PADP(data, sizeof(void *));
@@ -1995,7 +1995,7 @@ void RB_ExecuteRenderCommands( const void *data ) {
case RC_END_OF_LIST:
default:
// stop rendering
- t2 = ri->Milliseconds()*ri->Cvar_VariableValue( "timescale" );
+ t2 = ri.Milliseconds()*ri.Cvar_VariableValue( "timescale" );
backEnd.pc.msec = t2 - t1;
return;
}
diff --git a/codemp/rd-vanilla/tr_bsp.cpp b/codemp/rd-vanilla/tr_bsp.cpp
index 24ae1b3..d8b1703 100644
--- a/codemp/rd-vanilla/tr_bsp.cpp
+++ b/codemp/rd-vanilla/tr_bsp.cpp
@@ -248,7 +248,7 @@ static void R_LoadLightmaps( lump_t *l, const char *psMapName, world_t &worldDat
}
if ( r_lightmap->integer == 2 ) {
- ri->Printf( PRINT_ALL, "Brightest lightmap value: %d\n", ( int ) ( maxIntensity * 255 ) );
+ ri.Printf( PRINT_ALL, "Brightest lightmap value: %d\n", ( int ) ( maxIntensity * 255 ) );
}
}
@@ -375,7 +375,7 @@ static void ParseFace( dsurface_t *ds, mapVert_t *verts, msurface_t *surf, int *
numPoints = LittleLong( ds->numVerts );
if (numPoints > MAX_FACE_POINTS) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: MAX_FACE_POINTS exceeded: %i\n", numPoints);
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: MAX_FACE_POINTS exceeded: %i\n", numPoints);
numPoints = MAX_FACE_POINTS;
surf->shader = tr.defaultShader;
}
@@ -859,7 +859,7 @@ int R_StitchPatches( int grid1num, int grid2num, world_t &worldData ) {
fabs(v1[2] - v2[2]) < .01)
continue;
//
- //ri->Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+ //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
// insert column into grid2 right after after column l
if (m) row = grid2->height-1;
else row = 0;
@@ -905,7 +905,7 @@ int R_StitchPatches( int grid1num, int grid2num, world_t &worldData ) {
fabs(v1[2] - v2[2]) < .01)
continue;
//
- //ri->Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+ //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
// insert row into grid2 right after after row l
if (m) column = grid2->width-1;
else column = 0;
@@ -960,7 +960,7 @@ int R_StitchPatches( int grid1num, int grid2num, world_t &worldData ) {
fabs(v1[2] - v2[2]) < .01)
continue;
//
- //ri->Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+ //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
// insert column into grid2 right after after column l
if (m) row = grid2->height-1;
else row = 0;
@@ -1006,7 +1006,7 @@ int R_StitchPatches( int grid1num, int grid2num, world_t &worldData ) {
fabs(v1[2] - v2[2]) < .01)
continue;
//
- //ri->Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+ //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
// insert row into grid2 right after after row l
if (m) column = grid2->width-1;
else column = 0;
@@ -1062,7 +1062,7 @@ int R_StitchPatches( int grid1num, int grid2num, world_t &worldData ) {
fabs(v1[2] - v2[2]) < .01)
continue;
//
- //ri->Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+ //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
// insert column into grid2 right after after column l
if (m) row = grid2->height-1;
else row = 0;
@@ -1108,7 +1108,7 @@ int R_StitchPatches( int grid1num, int grid2num, world_t &worldData ) {
fabs(v1[2] - v2[2]) < .01)
continue;
//
- //ri->Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+ //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
// insert row into grid2 right after after row l
if (m) column = grid2->width-1;
else column = 0;
@@ -1165,7 +1165,7 @@ int R_StitchPatches( int grid1num, int grid2num, world_t &worldData ) {
fabs(v1[2] - v2[2]) < .01)
continue;
//
- //ri->Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+ //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
// insert column into grid2 right after after column l
if (m) row = grid2->height-1;
else row = 0;
@@ -1211,7 +1211,7 @@ int R_StitchPatches( int grid1num, int grid2num, world_t &worldData ) {
fabs(v1[2] - v2[2]) < .01)
continue;
//
- //ri->Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+ //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
// insert row into grid2 right after after row l
if (m) column = grid2->width-1;
else column = 0;
@@ -1296,7 +1296,7 @@ void R_StitchAllPatches( world_t &worldData ) {
}
}
while (stitched);
-// ri->Printf( PRINT_ALL, "stitched %d LoD cracks\n", numstitches );
+// ri.Printf( PRINT_ALL, "stitched %d LoD cracks\n", numstitches );
}
/*
@@ -1401,7 +1401,7 @@ static void R_LoadSurfaces( lump_t *surfs, lump_t *verts, lump_t *indexLump, wor
R_MovePatchSurfacesToHunk(worldData);
#endif
- ri->Printf( PRINT_ALL, "...loaded %d faces, %i meshes, %i trisurfs, %i flares\n", numFaces, numMeshes, numTriSurfs, numFlares );
+ ri.Printf( PRINT_ALL, "...loaded %d faces, %i meshes, %i trisurfs, %i flares\n", numFaces, numMeshes, numTriSurfs, numFlares );
}
@@ -1430,7 +1430,7 @@ static void R_LoadSubmodels( lump_t *l, world_t &worldData, int index ) {
assert( model != NULL ); // this should never happen
if ( model == NULL ) {
- ri->Error(ERR_DROP, "R_LoadSubmodels: R_AllocModel() failed");
+ ri.Error(ERR_DROP, "R_LoadSubmodels: R_AllocModel() failed");
}
model->type = MOD_BRUSH;
@@ -1859,7 +1859,7 @@ void R_LoadLightGridArray( lump_t *l, world_t &worldData ) {
w->numGridArrayElements = w->lightGridBounds[0] * w->lightGridBounds[1] * w->lightGridBounds[2];
if ( (unsigned)l->filelen != w->numGridArrayElements * sizeof(*w->lightGridArray) ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: light grid array mismatch\n" );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: light grid array mismatch\n" );
w->lightGridData = NULL;
return;
}
@@ -1931,7 +1931,7 @@ void R_LoadEntities( lump_t *l, world_t &worldData ) {
if (!Q_strncmp(keyname, s, strlen(s)) ) {
s = strchr(value, ';');
if (!s) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: no semi colon in vertexshaderremap '%s'\n", value );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: no semi colon in vertexshaderremap '%s'\n", value );
break;
}
*s++ = 0;
@@ -1945,7 +1945,7 @@ void R_LoadEntities( lump_t *l, world_t &worldData ) {
if (!Q_strncmp(keyname, s, strlen(s)) ) {
s = strchr(value, ';');
if (!s) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: no semi colon in shaderremap '%s'\n", value );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: no semi colon in shaderremap '%s'\n", value );
break;
}
*s++ = 0;
@@ -2036,15 +2036,15 @@ void RE_LoadWorldMap_Actual( const char *name, world_t &worldData, int index )
// check for cached disk file from the server first...
//
- if (ri->CM_GetCachedMapDiskImage())
+ if (ri.CM_GetCachedMapDiskImage())
{
- buffer = (byte *)ri->CM_GetCachedMapDiskImage();
+ buffer = (byte *)ri.CM_GetCachedMapDiskImage();
}
else
{
// still needs loading...
//
- ri->FS_ReadFile( name, (void **)&buffer );
+ ri.FS_ReadFile( name, (void **)&buffer );
if ( !buffer ) {
Com_Error (ERR_DROP, "RE_LoadWorldMap: %s not found", name);
}
@@ -2098,14 +2098,14 @@ void RE_LoadWorldMap_Actual( const char *name, world_t &worldData, int index )
tr.world = &worldData;
}
- if (ri->CM_GetCachedMapDiskImage())
+ if (ri.CM_GetCachedMapDiskImage())
{
- Z_Free( ri->CM_GetCachedMapDiskImage() );
- ri->CM_SetCachedMapDiskImage( NULL );
+ Z_Free( ri.CM_GetCachedMapDiskImage() );
+ ri.CM_SetCachedMapDiskImage( NULL );
}
else
{
- ri->FS_FreeFile( buffer );
+ ri.FS_FreeFile( buffer );
}
}
@@ -2114,7 +2114,7 @@ void RE_LoadWorldMap_Actual( const char *name, world_t &worldData, int index )
//
void RE_LoadWorldMap( const char *name )
{
- ri->CM_SetUsingCache( qtrue );
+ ri.CM_SetUsingCache( qtrue );
RE_LoadWorldMap_Actual( name, s_worldData, 0 );
- ri->CM_SetUsingCache( qfalse );
+ ri.CM_SetUsingCache( qfalse );
}
diff --git a/codemp/rd-vanilla/tr_cmds.cpp b/codemp/rd-vanilla/tr_cmds.cpp
index 6d55d65..203f782 100644
--- a/codemp/rd-vanilla/tr_cmds.cpp
+++ b/codemp/rd-vanilla/tr_cmds.cpp
@@ -39,33 +39,33 @@ void R_PerformanceCounters( void ) {
if (r_speeds->integer == 1) {
const float texSize = R_SumOfUsedImages( qfalse )/(8*1048576.0f)*(r_texturebits->integer?r_texturebits->integer:glConfig.colorBits);
- ri->Printf( PRINT_ALL, "%i/%i shdrs/srfs %i leafs %i vrts %i/%i tris %.2fMB tex %.2f dc\n",
+ ri.Printf( PRINT_ALL, "%i/%i shdrs/srfs %i leafs %i vrts %i/%i tris %.2fMB tex %.2f dc\n",
backEnd.pc.c_shaders, backEnd.pc.c_surfaces, tr.pc.c_leafs, backEnd.pc.c_vertexes,
backEnd.pc.c_indexes/3, backEnd.pc.c_totalIndexes/3,
texSize, backEnd.pc.c_overDraw / (float)(glConfig.vidWidth * glConfig.vidHeight) );
} else if (r_speeds->integer == 2) {
- ri->Printf( PRINT_ALL, "(patch) %i sin %i sclip %i sout %i bin %i bclip %i bout\n",
+ ri.Printf( PRINT_ALL, "(patch) %i sin %i sclip %i sout %i bin %i bclip %i bout\n",
tr.pc.c_sphere_cull_patch_in, tr.pc.c_sphere_cull_patch_clip, tr.pc.c_sphere_cull_patch_out,
tr.pc.c_box_cull_patch_in, tr.pc.c_box_cull_patch_clip, tr.pc.c_box_cull_patch_out );
- ri->Printf( PRINT_ALL, "(md3) %i sin %i sclip %i sout %i bin %i bclip %i bout\n",
+ ri.Printf( PRINT_ALL, "(md3) %i sin %i sclip %i sout %i bin %i bclip %i bout\n",
tr.pc.c_sphere_cull_md3_in, tr.pc.c_sphere_cull_md3_clip, tr.pc.c_sphere_cull_md3_out,
tr.pc.c_box_cull_md3_in, tr.pc.c_box_cull_md3_clip, tr.pc.c_box_cull_md3_out );
} else if (r_speeds->integer == 3) {
- ri->Printf( PRINT_ALL, "viewcluster: %i\n", tr.viewCluster );
+ ri.Printf( PRINT_ALL, "viewcluster: %i\n", tr.viewCluster );
} else if (r_speeds->integer == 4) {
if ( backEnd.pc.c_dlightVertexes ) {
- ri->Printf( PRINT_ALL, "dlight srf:%i culled:%i verts:%i tris:%i\n",
+ ri.Printf( PRINT_ALL, "dlight srf:%i culled:%i verts:%i tris:%i\n",
tr.pc.c_dlightSurfaces, tr.pc.c_dlightSurfacesCulled,
backEnd.pc.c_dlightVertexes, backEnd.pc.c_dlightIndexes / 3 );
}
}
else if (r_speeds->integer == 5 )
{
- ri->Printf( PRINT_ALL, "zFar: %.0f\n", tr.viewParms.zFar );
+ ri.Printf( PRINT_ALL, "zFar: %.0f\n", tr.viewParms.zFar );
}
else if (r_speeds->integer == 6 )
{
- ri->Printf( PRINT_ALL, "flare adds:%i tests:%i renders:%i\n",
+ ri.Printf( PRINT_ALL, "flare adds:%i tests:%i renders:%i\n",
backEnd.pc.c_flareAdds, backEnd.pc.c_flareTests, backEnd.pc.c_flareRenders );
}
else if (r_speeds->integer == 7) {
@@ -73,7 +73,7 @@ void R_PerformanceCounters( void ) {
const float backBuff= glConfig.vidWidth * glConfig.vidHeight * glConfig.colorBits / (8.0f * 1024*1024);
const float depthBuff= glConfig.vidWidth * glConfig.vidHeight * glConfig.depthBits / (8.0f * 1024*1024);
const float stencilBuff= glConfig.vidWidth * glConfig.vidHeight * glConfig.stencilBits / (8.0f * 1024*1024);
- ri->Printf( PRINT_ALL, "Tex MB %.2f + buffers %.2f MB = Total %.2fMB\n",
+ ri.Printf( PRINT_ALL, "Tex MB %.2f + buffers %.2f MB = Total %.2fMB\n",
texSize, backBuff*2+depthBuff+stencilBuff, texSize+backBuff*2+depthBuff+stencilBuff);
}
@@ -336,14 +336,14 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
{
if ( glConfig.stencilBits < 4 )
{
- ri->Printf( PRINT_ALL, "Warning: not enough stencil bits to measure overdraw: %d\n", glConfig.stencilBits );
- ri->Cvar_Set( "r_measureOverdraw", "0" );
+ ri.Printf( PRINT_ALL, "Warning: not enough stencil bits to measure overdraw: %d\n", glConfig.stencilBits );
+ ri.Cvar_Set( "r_measureOverdraw", "0" );
r_measureOverdraw->modified = qfalse;
}
else if ( r_shadows->integer == 2 )
{
- ri->Printf( PRINT_ALL, "Warning: stencil shadows and overdraw measurement are mutually exclusive\n" );
- ri->Cvar_Set( "r_measureOverdraw", "0" );
+ ri.Printf( PRINT_ALL, "Warning: stencil shadows and overdraw measurement are mutually exclusive\n" );
+ ri.Cvar_Set( "r_measureOverdraw", "0" );
r_measureOverdraw->modified = qfalse;
}
else
diff --git a/codemp/rd-vanilla/tr_ghoul2.cpp b/codemp/rd-vanilla/tr_ghoul2.cpp
index dbc2ca4..78adfcc 100644
--- a/codemp/rd-vanilla/tr_ghoul2.cpp
+++ b/codemp/rd-vanilla/tr_ghoul2.cpp
@@ -77,7 +77,7 @@ void G2Time_ResetTimers(void)
void G2Time_ReportTimers(void)
{
- ri->Printf( PRINT_ALL, "\n---------------------------------\nRenderSurfaces: %i\nR_AddGhoulSurfaces: %i\nG2_TransformGhoulBones: %i\nG2_ProcessGeneratedSurfaceBolts: %i\nProcessModelBoltSurfaces: %i\nG2_ConstructGhoulSkeleton: %i\nRB_SurfaceGhoul: %i\nG2_SetupModelPointers: %i\n\nPrecise frame time: %i\nTransformGhoulBones calls: %i\n---------------------------------\n\n",
+ ri.Printf( PRINT_ALL, "\n---------------------------------\nRenderSurfaces: %i\nR_AddGhoulSurfaces: %i\nG2_TransformGhoulBones: %i\nG2_ProcessGeneratedSurfaceBolts: %i\nProcessModelBoltSurfaces: %i\nG2_ConstructGhoulSkeleton: %i\nRB_SurfaceGhoul: %i\nG2_SetupModelPointers: %i\n\nPrecise frame time: %i\nTransformGhoulBones calls: %i\n---------------------------------\n\n",
G2Time_RenderSurfaces,
G2Time_R_AddGHOULSurfaces,
G2Time_G2_TransformGhoulBones,
@@ -1372,7 +1372,7 @@ void G2_RagGetAnimMatrix(CGhoul2Info &ghoul2, const int boneNum, mdxaBone_t &mat
if (bListIndex == -1)
{
#ifdef _RAG_PRINT_TEST
- ri->Printf( PRINT_ALL, "Attempting to add %s\n", skel->name);
+ ri.Printf( PRINT_ALL, "Attempting to add %s\n", skel->name);
#endif
bListIndex = G2_Add_Bone(ghoul2.animModel, ghoul2.mBlist, skel->name);
}
@@ -1429,7 +1429,7 @@ void G2_RagGetAnimMatrix(CGhoul2Info &ghoul2, const int boneNum, mdxaBone_t &mat
}
else
{
- ri->Printf( PRINT_ALL, "BAD LIST INDEX: %s, %s [%i]\n", skel->name, pskel->name, parent);
+ ri.Printf( PRINT_ALL, "BAD LIST INDEX: %s, %s [%i]\n", skel->name, pskel->name, parent);
}
#endif
}
@@ -1443,7 +1443,7 @@ void G2_RagGetAnimMatrix(CGhoul2Info &ghoul2, const int boneNum, mdxaBone_t &mat
}
else
{
- ri->Printf( PRINT_ALL, "BAD LIST INDEX: %s\n", skel->name);
+ ri.Printf( PRINT_ALL, "BAD LIST INDEX: %s\n", skel->name);
}
#endif
//bone.animFrameMatrix = ghoul2.mBoneCache->mFinalBones[boneNum].boneMatrix;
@@ -1458,7 +1458,7 @@ void G2_RagGetAnimMatrix(CGhoul2Info &ghoul2, const int boneNum, mdxaBone_t &mat
#ifdef _RAG_PRINT_TEST
if (!actuallySet)
{
- ri->Printf( PRINT_ALL, "SET FAILURE\n");
+ ri.Printf( PRINT_ALL, "SET FAILURE\n");
G2_RagPrintMatrix(&bone.animFrameMatrix);
}
#endif
@@ -2052,7 +2052,7 @@ void G2_TransformGhoulBones(boneInfo_v &rootBoneList,mdxaBone_t &rootMatrix, CGh
ghoul2.mBoneCache->mUnsquash=false;
// master smoothing control
- if (HackadelicOnClient && smooth && !ri->Cvar_VariableIntegerValue( "dedicated" ))
+ if (HackadelicOnClient && smooth && !ri.Cvar_VariableIntegerValue( "dedicated" ))
{
ghoul2.mBoneCache->mLastTouch=ghoul2.mBoneCache->mLastLastTouch;
/*
@@ -4226,7 +4226,7 @@ qboolean R_LoadMDXM( model_t *mod, void *buffer, const char *mod_name, qboolean
}
if (version != MDXM_VERSION) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "R_LoadMDXM: %s has wrong version (%i should be %i)\n",
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "R_LoadMDXM: %s has wrong version (%i should be %i)\n",
mod_name, version, MDXM_VERSION);
return qfalse;
}
@@ -4243,7 +4243,7 @@ qboolean R_LoadMDXM( model_t *mod, void *buffer, const char *mod_name, qboolean
if (!bAlreadyFound)
{
// horrible new hackery, if !bAlreadyFound then we've just done a tag-morph, so we need to set the
- // bool reference passed into this function to true, to tell the caller NOT to do an ri->FS_Freefile since
+ // bool reference passed into this function to true, to tell the caller NOT to do an ri.FS_Freefile since
// we've hijacked that memory block...
//
// Aaaargh. Kill me now...
@@ -4267,7 +4267,7 @@ qboolean R_LoadMDXM( model_t *mod, void *buffer, const char *mod_name, qboolean
if (!mdxm->animIndex)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "R_LoadMDXM: missing animation file %s for mesh %s\n", mdxm->animName, mdxm->name);
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "R_LoadMDXM: missing animation file %s for mesh %s\n", mdxm->animName, mdxm->name);
return qfalse;
}
@@ -4673,7 +4673,7 @@ qboolean R_LoadMDXA( model_t *mod, void *buffer, const char *mod_name, qboolean
}
if (version != MDXA_VERSION) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "R_LoadMDXA: %s has wrong version (%i should be %i)\n",
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "R_LoadMDXA: %s has wrong version (%i should be %i)\n",
mod_name, version, MDXA_VERSION);
return qfalse;
}
@@ -4707,7 +4707,7 @@ qboolean R_LoadMDXA( model_t *mod, void *buffer, const char *mod_name, qboolean
memcpy( mdxa, buffer, oSize );
#else
// horrible new hackery, if !bAlreadyFound then we've just done a tag-morph, so we need to set the
- // bool reference passed into this function to true, to tell the caller NOT to do an ri->FS_Freefile since
+ // bool reference passed into this function to true, to tell the caller NOT to do an ri.FS_Freefile since
// we've hijacked that memory block...
//
// Aaaargh. Kill me now...
@@ -4841,7 +4841,7 @@ qboolean R_LoadMDXA( model_t *mod, void *buffer, const char *mod_name, qboolean
#endif //CREATE_LIMB_HIERARCHY
if ( mdxa->numFrames < 1 ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "R_LoadMDXA: %s has no frames\n", mod_name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "R_LoadMDXA: %s has no frames\n", mod_name );
return qfalse;
}
diff --git a/codemp/rd-vanilla/tr_image.cpp b/codemp/rd-vanilla/tr_image.cpp
index c2da9c6..23de173 100644
--- a/codemp/rd-vanilla/tr_image.cpp
+++ b/codemp/rd-vanilla/tr_image.cpp
@@ -80,9 +80,9 @@ void GL_TextureMode( const char *string ) {
}
if ( i == numTextureModes ) {
- ri->Printf( PRINT_ALL, "bad filter name\n" );
+ ri.Printf( PRINT_ALL, "bad filter name\n" );
for ( i = 0; i < numTextureModes ; i++ ) {
- ri->Printf( PRINT_ALL, "%s\n", modes[i].name );
+ ri.Printf( PRINT_ALL, "%s\n", modes[i].name );
}
return;
}
@@ -92,7 +92,7 @@ void GL_TextureMode( const char *string ) {
// If the level they requested is less than possible, set the max possible...
if ( r_ext_texture_filter_anisotropic->value > glConfig.maxTextureFilterAnisotropy )
- ri->Cvar_SetValue( "r_ext_texture_filter_anisotropic", glConfig.maxTextureFilterAnisotropy );
+ ri.Cvar_SetValue( "r_ext_texture_filter_anisotropic", glConfig.maxTextureFilterAnisotropy );
// change all the existing mipmap texture objects
R_Images_StartIteration();
@@ -231,76 +231,76 @@ void R_ImageList_f( void ) {
float texBytes = 0.0f;
const char *yesno[] = {"no ", "yes"};
- ri->Printf( PRINT_ALL, "\n -w-- -h-- -mm- -if-- wrap --name-------\n");
+ ri.Printf( PRINT_ALL, "\n -w-- -h-- -mm- -if-- wrap --name-------\n");
int iNumImages = R_Images_StartIteration();
while ( (image = R_Images_GetNextIteration()) != NULL)
{
texels += image->width*image->height;
texBytes += image->width*image->height * R_BytesPerTex (image->internalFormat);
- ri->Printf( PRINT_ALL, "%4i: %4i %4i %s ",
+ ri.Printf( PRINT_ALL, "%4i: %4i %4i %s ",
i, image->width, image->height, yesno[image->mipmap] );
switch ( image->internalFormat ) {
case 1:
- ri->Printf( PRINT_ALL, "I " );
+ ri.Printf( PRINT_ALL, "I " );
break;
case 2:
- ri->Printf( PRINT_ALL, "IA " );
+ ri.Printf( PRINT_ALL, "IA " );
break;
case 3:
- ri->Printf( PRINT_ALL, "RGB " );
+ ri.Printf( PRINT_ALL, "RGB " );
break;
case 4:
- ri->Printf( PRINT_ALL, "RGBA " );
+ ri.Printf( PRINT_ALL, "RGBA " );
break;
case GL_RGBA8:
- ri->Printf( PRINT_ALL, "RGBA8" );
+ ri.Printf( PRINT_ALL, "RGBA8" );
break;
case GL_RGB8:
- ri->Printf( PRINT_ALL, "RGB8" );
+ ri.Printf( PRINT_ALL, "RGB8" );
break;
case GL_RGB4_S3TC:
- ri->Printf( PRINT_ALL, "S3TC " );
+ ri.Printf( PRINT_ALL, "S3TC " );
break;
case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
- ri->Printf( PRINT_ALL, "DXT1 " );
+ ri.Printf( PRINT_ALL, "DXT1 " );
break;
case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
- ri->Printf( PRINT_ALL, "DXT5 " );
+ ri.Printf( PRINT_ALL, "DXT5 " );
break;
case GL_RGBA4:
- ri->Printf( PRINT_ALL, "RGBA4" );
+ ri.Printf( PRINT_ALL, "RGBA4" );
break;
case GL_RGB5:
- ri->Printf( PRINT_ALL, "RGB5 " );
+ ri.Printf( PRINT_ALL, "RGB5 " );
break;
default:
- ri->Printf( PRINT_ALL, "???? " );
+ ri.Printf( PRINT_ALL, "???? " );
}
switch ( image->wrapClampMode ) {
case GL_REPEAT:
- ri->Printf( PRINT_ALL, "rept " );
+ ri.Printf( PRINT_ALL, "rept " );
break;
case GL_CLAMP:
- ri->Printf( PRINT_ALL, "clmp " );
+ ri.Printf( PRINT_ALL, "clmp " );
break;
case GL_CLAMP_TO_EDGE:
- ri->Printf( PRINT_ALL, "clpE " );
+ ri.Printf( PRINT_ALL, "clpE " );
break;
default:
- ri->Printf( PRINT_ALL, "%4i ", image->wrapClampMode );
+ ri.Printf( PRINT_ALL, "%4i ", image->wrapClampMode );
break;
}
- ri->Printf( PRINT_ALL, "%s\n", image->imgName );
+ ri.Printf( PRINT_ALL, "%s\n", image->imgName );
i++;
}
- ri->Printf( PRINT_ALL, " ---------\n");
- ri->Printf( PRINT_ALL, " -w-- -h-- -mm- -if- wrap --name-------\n");
- ri->Printf( PRINT_ALL, " %i total texels (not including mipmaps)\n", texels );
- ri->Printf( PRINT_ALL, " %.2fMB total texture mem (not including mipmaps)\n", texBytes/1048576.0f );
- ri->Printf( PRINT_ALL, " %i total images\n\n", iNumImages );
+ ri.Printf( PRINT_ALL, " ---------\n");
+ ri.Printf( PRINT_ALL, " -w-- -h-- -mm- -if- wrap --name-------\n");
+ ri.Printf( PRINT_ALL, " %i total texels (not including mipmaps)\n", texels );
+ ri.Printf( PRINT_ALL, " %.2fMB total texture mem (not including mipmaps)\n", texBytes/1048576.0f );
+ ri.Printf( PRINT_ALL, " %i total images\n\n", iNumImages );
}
//=======================================================================
@@ -855,22 +855,22 @@ void RE_RegisterImages_Info_f( void )
int iNumImages = R_Images_StartIteration();
while ( (pImage = R_Images_GetNextIteration()) != NULL)
{
- ri->Printf( PRINT_ALL, "%d: (%4dx%4dy) \"%s\"",iImage, pImage->width, pImage->height, pImage->imgName);
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED ", levused %d",pImage->iLastLevelUsedOn);
- ri->Printf( PRINT_ALL, "\n");
+ ri.Printf( PRINT_ALL, "%d: (%4dx%4dy) \"%s\"",iImage, pImage->width, pImage->height, pImage->imgName);
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED ", levused %d",pImage->iLastLevelUsedOn);
+ ri.Printf( PRINT_ALL, "\n");
iTexels += pImage->width * pImage->height;
iImage++;
}
- ri->Printf( PRINT_ALL, "%d Images. %d (%.2fMB) texels total, (not including mipmaps)\n",iNumImages, iTexels, (float)iTexels / 1024.0f / 1024.0f);
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "RE_RegisterMedia_GetLevel(): %d",RE_RegisterMedia_GetLevel());
+ ri.Printf( PRINT_ALL, "%d Images. %d (%.2fMB) texels total, (not including mipmaps)\n",iNumImages, iTexels, (float)iTexels / 1024.0f / 1024.0f);
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "RE_RegisterMedia_GetLevel(): %d",RE_RegisterMedia_GetLevel());
}
// currently, this just goes through all the images and dumps any not referenced on this level...
//
qboolean RE_RegisterImages_LevelLoadEnd(void)
{
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "RE_RegisterImages_LevelLoadEnd():\n");
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "RE_RegisterImages_LevelLoadEnd():\n");
// int iNumImages = AllocatedImages.size(); // more for curiosity, really.
@@ -890,7 +890,7 @@ qboolean RE_RegisterImages_LevelLoadEnd(void)
{
// nope, so dump it...
//
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "Dumping image \"%s\"\n",pImage->imgName);
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "Dumping image \"%s\"\n",pImage->imgName);
R_Images_DeleteImageContents(pImage);
@@ -912,10 +912,10 @@ qboolean RE_RegisterImages_LevelLoadEnd(void)
// iNumImages = R_Images_StartIteration();
// if (iNumImages > MAX_DRAWIMAGES)
// {
-// ri->Printf( PRINT_ALL, S_COLOR_YELLOW "Level uses %d images, old limit was MAX_DRAWIMAGES (%d)\n", iNumImages, MAX_DRAWIMAGES);
+// ri.Printf( PRINT_ALL, S_COLOR_YELLOW "Level uses %d images, old limit was MAX_DRAWIMAGES (%d)\n", iNumImages, MAX_DRAWIMAGES);
// }
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "RE_RegisterImages_LevelLoadEnd(): Ok\n");
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "RE_RegisterImages_LevelLoadEnd(): Ok\n");
GL_ResetBinds();
@@ -949,13 +949,13 @@ static image_t *R_FindImageFile_NoLoad(const char *name, qboolean mipmap, qboole
//
if ( strcmp( pName, "*white" ) ) {
if ( pImage->mipmap != !!mipmap ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: reused image %s with mixed mipmap parm\n", pName );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: reused image %s with mixed mipmap parm\n", pName );
}
if ( pImage->allowPicmip != !!allowPicmip ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: reused image %s with mixed allowPicmip parm\n", pName );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: reused image %s with mixed allowPicmip parm\n", pName );
}
if ( pImage->wrapClampMode != glWrapClampMode ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: reused image %s with mixed glWrapClampMode parm\n", pName );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: reused image %s with mixed glWrapClampMode parm\n", pName );
}
}
@@ -1085,7 +1085,7 @@ image_t *R_FindImageFile( const char *name, qboolean mipmap, qboolean allowPicmi
int width, height;
byte *pic;
- if (!name || ri->Cvar_VariableIntegerValue( "dedicated" ) ) // stop ghoul2 horribleness as regards image loading from server
+ if (!name || ri.Cvar_VariableIntegerValue( "dedicated" ) ) // stop ghoul2 horribleness as regards image loading from server
{
return NULL;
}
@@ -1115,7 +1115,7 @@ image_t *R_FindImageFile( const char *name, qboolean mipmap, qboolean allowPicmi
//
if ( (width&(width-1)) || (height&(height-1)) )
{
- ri->Printf( PRINT_ALL, "Refusing to load non-power-2-dims(%d,%d) pic \"%s\"...\n", width,height,name );
+ ri.Printf( PRINT_ALL, "Refusing to load non-power-2-dims(%d,%d) pic \"%s\"...\n", width,height,name );
return NULL;
}
@@ -1433,13 +1433,13 @@ void R_SetColorMappings( void ) {
if ( r_intensity->value < 1.0f ) {
- ri->Cvar_Set( "r_intensity", "1" );
+ ri.Cvar_Set( "r_intensity", "1" );
}
if ( r_gamma->value < 0.5f ) {
- ri->Cvar_Set( "r_gamma", "0.5" );
+ ri.Cvar_Set( "r_gamma", "0.5" );
} else if ( r_gamma->value > 3.0f ) {
- ri->Cvar_Set( "r_gamma", "3.0" );
+ ri.Cvar_Set( "r_gamma", "3.0" );
}
g = r_gamma->value;
@@ -1466,7 +1466,7 @@ void R_SetColorMappings( void ) {
if ( glConfig.deviceSupportsGamma )
{
- ri->WIN_SetGamma( &glConfig, s_gammatable, s_gammatable, s_gammatable );
+ ri.WIN_SetGamma( &glConfig, s_gammatable, s_gammatable, s_gammatable );
}
}
@@ -1502,7 +1502,7 @@ void R_SetGammaCorrectionLUT()
gammaCorrected[i] = Com_Clampi(0, 255, inf << shift);
}
- byte *lutTable = (byte *)ri->Hunk_AllocateTempMemory(64 * 64 * 64 * 3);
+ byte *lutTable = (byte *)ri.Hunk_AllocateTempMemory(64 * 64 * 64 * 3);
byte *write = lutTable;
for ( int z = 0; z < 64; z++ )
{
@@ -1521,7 +1521,7 @@ void R_SetGammaCorrectionLUT()
qglPixelStorei(GL_UNPACK_ALIGNMENT, 1);
qglTexSubImage3D(GL_TEXTURE_3D, 0, 0, 0, 0, 64, 64, 64, GL_RGB, GL_UNSIGNED_BYTE, lutTable);
- ri->Hunk_FreeTempMemory(lutTable);
+ ri.Hunk_FreeTempMemory(lutTable);
}
}
diff --git a/codemp/rd-vanilla/tr_init.cpp b/codemp/rd-vanilla/tr_init.cpp
index 68ed651..8dde47c 100644
--- a/codemp/rd-vanilla/tr_init.cpp
+++ b/codemp/rd-vanilla/tr_init.cpp
@@ -270,7 +270,7 @@ void RE_GetBModelVerts( int bmodelIndex, vec3_t *verts, vec3_t normal );
void R_Splash()
{
image_t *pImage;
-/* const char* s = ri->Cvar_VariableString("se_language");
+/* const char* s = ri.Cvar_VariableString("se_language");
if (Q_stricmp(s,"english"))
{
pImage = R_FindImageFile( "menu/splash_eur", qfalse, qfalse, qfalse, GL_CLAMP);
@@ -308,7 +308,7 @@ void R_Splash()
qglVertex2f(x2, y2);
qglEnd();
- ri->WIN_Present(&window);
+ ri.WIN_Present(&window);
}
/*
@@ -322,8 +322,8 @@ static void GLW_InitTextureCompression( void )
bool newer_tc, old_tc;
// Check for available tc methods.
- newer_tc = ri->GL_ExtensionSupported("GL_ARB_texture_compression") && ri->GL_ExtensionSupported("GL_EXT_texture_compression_s3tc");
- old_tc = ri->GL_ExtensionSupported("GL_S3_s3tc");
+ newer_tc = ri.GL_ExtensionSupported("GL_ARB_texture_compression") && ri.GL_ExtensionSupported("GL_EXT_texture_compression_s3tc");
+ old_tc = ri.GL_ExtensionSupported("GL_S3_s3tc");
if ( old_tc )
{
@@ -437,7 +437,7 @@ static void GLimp_InitExtensions( void )
{
Com_Printf ("*** IGNORING OPENGL EXTENSIONS ***\n" );
g_bDynamicGlowSupported = false;
- ri->Cvar_Set( "r_DynamicGlow","0" );
+ ri.Cvar_Set( "r_DynamicGlow","0" );
return;
}
@@ -448,7 +448,7 @@ static void GLimp_InitExtensions( void )
// GL_EXT_texture_env_add
glConfig.textureEnvAddAvailable = qfalse;
- if ( ri->GL_ExtensionSupported( "GL_EXT_texture_env_add" ) )
+ if ( ri.GL_ExtensionSupported( "GL_EXT_texture_env_add" ) )
{
if ( r_ext_texture_env_add->integer )
{
@@ -468,7 +468,7 @@ static void GLimp_InitExtensions( void )
// GL_EXT_texture_filter_anisotropic
glConfig.maxTextureFilterAnisotropy = 0;
- if ( ri->GL_ExtensionSupported( "GL_EXT_texture_filter_anisotropic" ) )
+ if ( ri.GL_ExtensionSupported( "GL_EXT_texture_filter_anisotropic" ) )
{
qglGetFloatv( GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &glConfig.maxTextureFilterAnisotropy );
Com_Printf ("...GL_EXT_texture_filter_anisotropic available\n" );
@@ -481,16 +481,16 @@ static void GLimp_InitExtensions( void )
{
Com_Printf ("...ignoring GL_EXT_texture_filter_anisotropic\n" );
}
- ri->Cvar_SetValue( "r_ext_texture_filter_anisotropic_avail", glConfig.maxTextureFilterAnisotropy );
+ ri.Cvar_SetValue( "r_ext_texture_filter_anisotropic_avail", glConfig.maxTextureFilterAnisotropy );
if ( r_ext_texture_filter_anisotropic->value > glConfig.maxTextureFilterAnisotropy )
{
- ri->Cvar_SetValue( "r_ext_texture_filter_anisotropic_avail", glConfig.maxTextureFilterAnisotropy );
+ ri.Cvar_SetValue( "r_ext_texture_filter_anisotropic_avail", glConfig.maxTextureFilterAnisotropy );
}
}
else
{
Com_Printf ("...GL_EXT_texture_filter_anisotropic not found\n" );
- ri->Cvar_Set( "r_ext_texture_filter_anisotropic_avail", "0" );
+ ri.Cvar_Set( "r_ext_texture_filter_anisotropic_avail", "0" );
}
// GL_EXT_clamp_to_edge
@@ -501,13 +501,13 @@ static void GLimp_InitExtensions( void )
qglMultiTexCoord2fARB = NULL;
qglActiveTextureARB = NULL;
qglClientActiveTextureARB = NULL;
- if ( ri->GL_ExtensionSupported( "GL_ARB_multitexture" ) )
+ if ( ri.GL_ExtensionSupported( "GL_ARB_multitexture" ) )
{
if ( r_ext_multitexture->integer )
{
- qglMultiTexCoord2fARB = ( PFNGLMULTITEXCOORD2FARBPROC ) ri->GL_GetProcAddress( "glMultiTexCoord2fARB" );
- qglActiveTextureARB = ( PFNGLACTIVETEXTUREARBPROC ) ri->GL_GetProcAddress( "glActiveTextureARB" );
- qglClientActiveTextureARB = ( PFNGLCLIENTACTIVETEXTUREARBPROC ) ri->GL_GetProcAddress( "glClientActiveTextureARB" );
+ qglMultiTexCoord2fARB = ( PFNGLMULTITEXCOORD2FARBPROC ) ri.GL_GetProcAddress( "glMultiTexCoord2fARB" );
+ qglActiveTextureARB = ( PFNGLACTIVETEXTUREARBPROC ) ri.GL_GetProcAddress( "glActiveTextureARB" );
+ qglClientActiveTextureARB = ( PFNGLCLIENTACTIVETEXTUREARBPROC ) ri.GL_GetProcAddress( "glClientActiveTextureARB" );
if ( qglActiveTextureARB )
{
@@ -539,13 +539,13 @@ static void GLimp_InitExtensions( void )
// GL_EXT_compiled_vertex_array
qglLockArraysEXT = NULL;
qglUnlockArraysEXT = NULL;
- if ( ri->GL_ExtensionSupported( "GL_EXT_compiled_vertex_array" ) )
+ if ( ri.GL_ExtensionSupported( "GL_EXT_compiled_vertex_array" ) )
{
if ( r_ext_compiled_vertex_array->integer )
{
Com_Printf ("...using GL_EXT_compiled_vertex_array\n" );
- qglLockArraysEXT = ( PFNGLLOCKARRAYSEXTPROC ) ri->GL_GetProcAddress( "glLockArraysEXT" );
- qglUnlockArraysEXT = ( PFNGLUNLOCKARRAYSEXTPROC ) ri->GL_GetProcAddress( "glUnlockArraysEXT" );
+ qglLockArraysEXT = ( PFNGLLOCKARRAYSEXTPROC ) ri.GL_GetProcAddress( "glLockArraysEXT" );
+ qglUnlockArraysEXT = ( PFNGLUNLOCKARRAYSEXTPROC ) ri.GL_GetProcAddress( "glUnlockArraysEXT" );
if (!qglLockArraysEXT || !qglUnlockArraysEXT) {
Com_Error (ERR_FATAL, "bad getprocaddress");
}
@@ -562,7 +562,7 @@ static void GLimp_InitExtensions( void )
bool bNVRegisterCombiners = false;
// Register Combiners.
- if ( ri->GL_ExtensionSupported( "GL_NV_register_combiners" ) )
+ if ( ri.GL_ExtensionSupported( "GL_NV_register_combiners" ) )
{
// NOTE: This extension requires multitexture support (over 2 units).
if ( glConfig.maxActiveTextures >= 2 )
@@ -572,19 +572,19 @@ static void GLimp_InitExtensions( void )
// NOTE: VV guys will _definetly_ not be able to use regcoms. Pixel Shaders are just as good though :-)
// NOTE: Also, this is an nVidia specific extension (of course), so fragment shaders would serve the same purpose
// if we needed some kind of fragment/pixel manipulation support.
- qglCombinerParameterfvNV = (PFNGLCOMBINERPARAMETERFVNVPROC)ri->GL_GetProcAddress( "glCombinerParameterfvNV" );
- qglCombinerParameterivNV = (PFNGLCOMBINERPARAMETERIVNVPROC)ri->GL_GetProcAddress( "glCombinerParameterivNV" );
- qglCombinerParameterfNV = (PFNGLCOMBINERPARAMETERFNVPROC)ri->GL_GetProcAddress( "glCombinerParameterfNV" );
- qglCombinerParameteriNV = (PFNGLCOMBINERPARAMETERINVPROC)ri->GL_GetProcAddress( "glCombinerParameteriNV" );
- qglCombinerInputNV = (PFNGLCOMBINERINPUTNVPROC)ri->GL_GetProcAddress( "glCombinerInputNV" );
- qglCombinerOutputNV = (PFNGLCOMBINEROUTPUTNVPROC)ri->GL_GetProcAddress( "glCombinerOutputNV" );
- qglFinalCombinerInputNV = (PFNGLFINALCOMBINERINPUTNVPROC)ri->GL_GetProcAddress( "glFinalCombinerInputNV" );
- qglGetCombinerInputParameterfvNV = (PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC)ri->GL_GetProcAddress( "glGetCombinerInputParameterfvNV" );
- qglGetCombinerInputParameterivNV = (PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC)ri->GL_GetProcAddress( "glGetCombinerInputParameterivNV" );
- qglGetCombinerOutputParameterfvNV = (PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC)ri->GL_GetProcAddress( "glGetCombinerOutputParameterfvNV" );
- qglGetCombinerOutputParameterivNV = (PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC)ri->GL_GetProcAddress( "glGetCombinerOutputParameterivNV" );
- qglGetFinalCombinerInputParameterfvNV = (PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC)ri->GL_GetProcAddress( "glGetFinalCombinerInputParameterfvNV" );
- qglGetFinalCombinerInputParameterivNV = (PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC)ri->GL_GetProcAddress( "glGetFinalCombinerInputParameterivNV" );
+ qglCombinerParameterfvNV = (PFNGLCOMBINERPARAMETERFVNVPROC)ri.GL_GetProcAddress( "glCombinerParameterfvNV" );
+ qglCombinerParameterivNV = (PFNGLCOMBINERPARAMETERIVNVPROC)ri.GL_GetProcAddress( "glCombinerParameterivNV" );
+ qglCombinerParameterfNV = (PFNGLCOMBINERPARAMETERFNVPROC)ri.GL_GetProcAddress( "glCombinerParameterfNV" );
+ qglCombinerParameteriNV = (PFNGLCOMBINERPARAMETERINVPROC)ri.GL_GetProcAddress( "glCombinerParameteriNV" );
+ qglCombinerInputNV = (PFNGLCOMBINERINPUTNVPROC)ri.GL_GetProcAddress( "glCombinerInputNV" );
+ qglCombinerOutputNV = (PFNGLCOMBINEROUTPUTNVPROC)ri.GL_GetProcAddress( "glCombinerOutputNV" );
+ qglFinalCombinerInputNV = (PFNGLFINALCOMBINERINPUTNVPROC)ri.GL_GetProcAddress( "glFinalCombinerInputNV" );
+ qglGetCombinerInputParameterfvNV = (PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC)ri.GL_GetProcAddress( "glGetCombinerInputParameterfvNV" );
+ qglGetCombinerInputParameterivNV = (PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC)ri.GL_GetProcAddress( "glGetCombinerInputParameterivNV" );
+ qglGetCombinerOutputParameterfvNV = (PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC)ri.GL_GetProcAddress( "glGetCombinerOutputParameterfvNV" );
+ qglGetCombinerOutputParameterivNV = (PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC)ri.GL_GetProcAddress( "glGetCombinerOutputParameterivNV" );
+ qglGetFinalCombinerInputParameterfvNV = (PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC)ri.GL_GetProcAddress( "glGetFinalCombinerInputParameterfvNV" );
+ qglGetFinalCombinerInputParameterivNV = (PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC)ri.GL_GetProcAddress( "glGetFinalCombinerInputParameterivNV" );
// Validate the functions we need.
if ( !qglCombinerParameterfvNV || !qglCombinerParameterivNV || !qglCombinerParameterfNV || !qglCombinerParameteriNV || !qglCombinerInputNV ||
@@ -615,7 +615,7 @@ static void GLimp_InitExtensions( void )
// Vertex Programs.
bool bARBVertexProgram = false;
- if ( ri->GL_ExtensionSupported( "GL_ARB_vertex_program" ) )
+ if ( ri.GL_ExtensionSupported( "GL_ARB_vertex_program" ) )
{
bARBVertexProgram = true;
}
@@ -627,7 +627,7 @@ static void GLimp_InitExtensions( void )
// Fragment Programs.
bool bARBFragmentProgram = false;
- if ( ri->GL_ExtensionSupported( "GL_ARB_fragment_program" ) )
+ if ( ri.GL_ExtensionSupported( "GL_ARB_fragment_program" ) )
{
bARBFragmentProgram = true;
}
@@ -640,25 +640,25 @@ static void GLimp_InitExtensions( void )
// If we support one or the other, load the shared function pointers.
if ( bARBVertexProgram || bARBFragmentProgram )
{
- qglProgramStringARB = (PFNGLPROGRAMSTRINGARBPROC) ri->GL_GetProcAddress("glProgramStringARB");
- qglBindProgramARB = (PFNGLBINDPROGRAMARBPROC) ri->GL_GetProcAddress("glBindProgramARB");
- qglDeleteProgramsARB = (PFNGLDELETEPROGRAMSARBPROC) ri->GL_GetProcAddress("glDeleteProgramsARB");
- qglGenProgramsARB = (PFNGLGENPROGRAMSARBPROC) ri->GL_GetProcAddress("glGenProgramsARB");
- qglProgramEnvParameter4dARB = (PFNGLPROGRAMENVPARAMETER4DARBPROC) ri->GL_GetProcAddress("glProgramEnvParameter4dARB");
- qglProgramEnvParameter4dvARB = (PFNGLPROGRAMENVPARAMETER4DVARBPROC) ri->GL_GetProcAddress("glProgramEnvParameter4dvARB");
- qglProgramEnvParameter4fARB = (PFNGLPROGRAMENVPARAMETER4FARBPROC) ri->GL_GetProcAddress("glProgramEnvParameter4fARB");
- qglProgramEnvParameter4fvARB = (PFNGLPROGRAMENVPARAMETER4FVARBPROC) ri->GL_GetProcAddress("glProgramEnvParameter4fvARB");
- qglProgramLocalParameter4dARB = (PFNGLPROGRAMLOCALPARAMETER4DARBPROC) ri->GL_GetProcAddress("glProgramLocalParameter4dARB");
- qglProgramLocalParameter4dvARB = (PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) ri->GL_GetProcAddress("glProgramLocalParameter4dvARB");
- qglProgramLocalParameter4fARB = (PFNGLPROGRAMLOCALPARAMETER4FARBPROC) ri->GL_GetProcAddress("glProgramLocalParameter4fARB");
- qglProgramLocalParameter4fvARB = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) ri->GL_GetProcAddress("glProgramLocalParameter4fvARB");
- qglGetProgramEnvParameterdvARB = (PFNGLGETPROGRAMENVPARAMETERDVARBPROC) ri->GL_GetProcAddress("glGetProgramEnvParameterdvARB");
- qglGetProgramEnvParameterfvARB = (PFNGLGETPROGRAMENVPARAMETERFVARBPROC) ri->GL_GetProcAddress("glGetProgramEnvParameterfvARB");
- qglGetProgramLocalParameterdvARB = (PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) ri->GL_GetProcAddress("glGetProgramLocalParameterdvARB");
- qglGetProgramLocalParameterfvARB = (PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) ri->GL_GetProcAddress("glGetProgramLocalParameterfvARB");
- qglGetProgramivARB = (PFNGLGETPROGRAMIVARBPROC) ri->GL_GetProcAddress("glGetProgramivARB");
- qglGetProgramStringARB = (PFNGLGETPROGRAMSTRINGARBPROC) ri->GL_GetProcAddress("glGetProgramStringARB");
- qglIsProgramARB = (PFNGLISPROGRAMARBPROC) ri->GL_GetProcAddress("glIsProgramARB");
+ qglProgramStringARB = (PFNGLPROGRAMSTRINGARBPROC) ri.GL_GetProcAddress("glProgramStringARB");
+ qglBindProgramARB = (PFNGLBINDPROGRAMARBPROC) ri.GL_GetProcAddress("glBindProgramARB");
+ qglDeleteProgramsARB = (PFNGLDELETEPROGRAMSARBPROC) ri.GL_GetProcAddress("glDeleteProgramsARB");
+ qglGenProgramsARB = (PFNGLGENPROGRAMSARBPROC) ri.GL_GetProcAddress("glGenProgramsARB");
+ qglProgramEnvParameter4dARB = (PFNGLPROGRAMENVPARAMETER4DARBPROC) ri.GL_GetProcAddress("glProgramEnvParameter4dARB");
+ qglProgramEnvParameter4dvARB = (PFNGLPROGRAMENVPARAMETER4DVARBPROC) ri.GL_GetProcAddress("glProgramEnvParameter4dvARB");
+ qglProgramEnvParameter4fARB = (PFNGLPROGRAMENVPARAMETER4FARBPROC) ri.GL_GetProcAddress("glProgramEnvParameter4fARB");
+ qglProgramEnvParameter4fvARB = (PFNGLPROGRAMENVPARAMETER4FVARBPROC) ri.GL_GetProcAddress("glProgramEnvParameter4fvARB");
+ qglProgramLocalParameter4dARB = (PFNGLPROGRAMLOCALPARAMETER4DARBPROC) ri.GL_GetProcAddress("glProgramLocalParameter4dARB");
+ qglProgramLocalParameter4dvARB = (PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) ri.GL_GetProcAddress("glProgramLocalParameter4dvARB");
+ qglProgramLocalParameter4fARB = (PFNGLPROGRAMLOCALPARAMETER4FARBPROC) ri.GL_GetProcAddress("glProgramLocalParameter4fARB");
+ qglProgramLocalParameter4fvARB = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) ri.GL_GetProcAddress("glProgramLocalParameter4fvARB");
+ qglGetProgramEnvParameterdvARB = (PFNGLGETPROGRAMENVPARAMETERDVARBPROC) ri.GL_GetProcAddress("glGetProgramEnvParameterdvARB");
+ qglGetProgramEnvParameterfvARB = (PFNGLGETPROGRAMENVPARAMETERFVARBPROC) ri.GL_GetProcAddress("glGetProgramEnvParameterfvARB");
+ qglGetProgramLocalParameterdvARB = (PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) ri.GL_GetProcAddress("glGetProgramLocalParameterdvARB");
+ qglGetProgramLocalParameterfvARB = (PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) ri.GL_GetProcAddress("glGetProgramLocalParameterfvARB");
+ qglGetProgramivARB = (PFNGLGETPROGRAMIVARBPROC) ri.GL_GetProcAddress("glGetProgramivARB");
+ qglGetProgramStringARB = (PFNGLGETPROGRAMSTRINGARBPROC) ri.GL_GetProcAddress("glGetProgramStringARB");
+ qglIsProgramARB = (PFNGLISPROGRAMARBPROC) ri.GL_GetProcAddress("glIsProgramARB");
// Validate the functions we need.
if ( !qglProgramStringARB || !qglBindProgramARB || !qglDeleteProgramsARB || !qglGenProgramsARB ||
@@ -686,7 +686,7 @@ static void GLimp_InitExtensions( void )
g_bTextureRectangleHack = true;
}
- if ( ri->GL_ExtensionSupported( "GL_NV_texture_rectangle" ) || ri->GL_ExtensionSupported( "GL_EXT_texture_rectangle" ) )
+ if ( ri.GL_ExtensionSupported( "GL_NV_texture_rectangle" ) || ri.GL_ExtensionSupported( "GL_EXT_texture_rectangle" ) )
{
bTexRectSupported = true;
}
@@ -701,8 +701,8 @@ static void GLimp_InitExtensions( void )
if ( r_gammaShaders->integer && qglActiveTextureARB && bTexRectSupported && bARBVertexProgram && bARBFragmentProgram )
{
#if !defined(__APPLE__)
- qglTexImage3D = (PFNGLTEXIMAGE3DPROC)ri->GL_GetProcAddress("glTexImage3D");
- qglTexSubImage3D = (PFNGLTEXSUBIMAGE3DPROC)ri->GL_GetProcAddress("glTexSubImage3D");
+ qglTexImage3D = (PFNGLTEXIMAGE3DPROC)ri.GL_GetProcAddress("glTexImage3D");
+ qglTexSubImage3D = (PFNGLTEXSUBIMAGE3DPROC)ri.GL_GetProcAddress("glTexSubImage3D");
if ( qglTexImage3D && qglTexSubImage3D )
{
glConfigExt.doGammaCorrectionWithShaders = qtrue;
@@ -718,12 +718,12 @@ static void GLimp_InitExtensions( void )
{
g_bDynamicGlowSupported = true;
// this would overwrite any achived setting gwg
- // ri->Cvar_Set( "r_DynamicGlow", "1" );
+ // ri.Cvar_Set( "r_DynamicGlow", "1" );
}
else
{
g_bDynamicGlowSupported = false;
- ri->Cvar_Set( "r_DynamicGlow","0" );
+ ri.Cvar_Set( "r_DynamicGlow","0" );
}
}
@@ -783,7 +783,7 @@ static void InitOpenGL( void )
memset(&glConfig, 0, sizeof(glConfig));
memset(&glConfigExt, 0, sizeof(glConfigExt));
- window = ri->WIN_Init(&windowDesc, &glConfig);
+ window = ri.WIN_Init(&windowDesc, &glConfig);
Com_Printf( "GL_RENDERER: %s\n", (char *)qglGetString (GL_RENDERER) );
@@ -964,9 +964,9 @@ void R_TakeScreenshot( int x, int y, int width, int height, char *fileName ) {
if(glConfig.deviceSupportsGamma && !glConfigExt.doGammaCorrectionWithShaders)
R_GammaCorrect(allbuf + offset, memcount);
- ri->FS_WriteFile(fileName, buffer, memcount + 18);
+ ri.FS_WriteFile(fileName, buffer, memcount + 18);
- ri->Hunk_FreeTempMemory(allbuf);
+ ri.Hunk_FreeTempMemory(allbuf);
}
/*
@@ -981,7 +981,7 @@ void R_TakeScreenshotPNG( int x, int y, int width, int height, char *fileName )
buffer = RB_ReadPixels( x, y, width, height, &offset, &padlen );
RE_SavePNG( fileName, buffer, width, height, 3 );
- ri->Hunk_FreeTempMemory( buffer );
+ ri.Hunk_FreeTempMemory( buffer );
}
/*
@@ -1002,7 +1002,7 @@ void R_TakeScreenshotJPEG( int x, int y, int width, int height, char *fileName )
R_GammaCorrect(buffer + offset, memcount);
RE_SaveJPG(fileName, r_screenshotJpegQuality->integer, width, height, buffer + offset, padlen);
- ri->Hunk_FreeTempMemory(buffer);
+ ri.Hunk_FreeTempMemory(buffer);
}
/*
@@ -1046,7 +1046,7 @@ static void R_LevelShot( void ) {
allsource = RB_ReadPixels(0, 0, glConfig.vidWidth, glConfig.vidHeight, &offset, &padlen);
source = allsource + offset;
- buffer = (byte *)ri->Hunk_AllocateTempMemory(LEVELSHOTSIZE * LEVELSHOTSIZE*3 + 18);
+ buffer = (byte *)ri.Hunk_AllocateTempMemory(LEVELSHOTSIZE * LEVELSHOTSIZE*3 + 18);
Com_Memset (buffer, 0, 18);
buffer[2] = 2; // uncompressed type
buffer[12] = LEVELSHOTSIZE & 255;
@@ -1081,12 +1081,12 @@ static void R_LevelShot( void ) {
R_GammaCorrect( buffer + 18, LEVELSHOTSIZE * LEVELSHOTSIZE * 3 );
}
- ri->FS_WriteFile( checkname, buffer, LEVELSHOTSIZE * LEVELSHOTSIZE*3 + 18 );
+ ri.FS_WriteFile( checkname, buffer, LEVELSHOTSIZE * LEVELSHOTSIZE*3 + 18 );
- ri->Hunk_FreeTempMemory( buffer );
- ri->Hunk_FreeTempMemory( allsource );
+ ri.Hunk_FreeTempMemory( buffer );
+ ri.Hunk_FreeTempMemory( allsource );
- ri->Printf( PRINT_ALL, "[skipnotify]Wrote %s\n", checkname );
+ ri.Printf( PRINT_ALL, "[skipnotify]Wrote %s\n", checkname );
}
/*
@@ -1105,24 +1105,24 @@ void R_ScreenShotTGA_f (void) {
char checkname[MAX_OSPATH] = {0};
qboolean silent = qfalse;
- if ( !strcmp( ri->Cmd_Argv(1), "levelshot" ) ) {
+ if ( !strcmp( ri.Cmd_Argv(1), "levelshot" ) ) {
R_LevelShot();
return;
}
- if ( !strcmp( ri->Cmd_Argv(1), "silent" ) )
+ if ( !strcmp( ri.Cmd_Argv(1), "silent" ) )
silent = qtrue;
- if ( ri->Cmd_Argc() == 2 && !silent ) {
+ if ( ri.Cmd_Argc() == 2 && !silent ) {
// explicit filename
- Com_sprintf( checkname, sizeof( checkname ), "screenshots/%s.tga", ri->Cmd_Argv( 1 ) );
+ Com_sprintf( checkname, sizeof( checkname ), "screenshots/%s.tga", ri.Cmd_Argv( 1 ) );
}
else {
// timestamp the file
R_ScreenshotFilename( checkname, sizeof( checkname ), ".tga" );
- if ( ri->FS_FileExists( checkname ) ) {
- ri->Printf( PRINT_ALL, "ScreenShot: Couldn't create a file\n");
+ if ( ri.FS_FileExists( checkname ) ) {
+ ri.Printf( PRINT_ALL, "ScreenShot: Couldn't create a file\n");
return;
}
}
@@ -1130,7 +1130,7 @@ void R_ScreenShotTGA_f (void) {
R_TakeScreenshot( 0, 0, glConfig.vidWidth, glConfig.vidHeight, checkname );
if ( !silent )
- ri->Printf( PRINT_ALL, "[skipnotify]Wrote %s\n", checkname );
+ ri.Printf( PRINT_ALL, "[skipnotify]Wrote %s\n", checkname );
}
/*
@@ -1149,24 +1149,24 @@ void R_ScreenShotPNG_f (void) {
char checkname[MAX_OSPATH] = {0};
qboolean silent = qfalse;
- if ( !strcmp( ri->Cmd_Argv(1), "levelshot" ) ) {
+ if ( !strcmp( ri.Cmd_Argv(1), "levelshot" ) ) {
R_LevelShot();
return;
}
- if ( !strcmp( ri->Cmd_Argv(1), "silent" ) )
+ if ( !strcmp( ri.Cmd_Argv(1), "silent" ) )
silent = qtrue;
- if ( ri->Cmd_Argc() == 2 && !silent ) {
+ if ( ri.Cmd_Argc() == 2 && !silent ) {
// explicit filename
- Com_sprintf( checkname, sizeof( checkname ), "screenshots/%s.png", ri->Cmd_Argv( 1 ) );
+ Com_sprintf( checkname, sizeof( checkname ), "screenshots/%s.png", ri.Cmd_Argv( 1 ) );
}
else {
// timestamp the file
R_ScreenshotFilename( checkname, sizeof( checkname ), ".png" );
- if ( ri->FS_FileExists( checkname ) ) {
- ri->Printf( PRINT_ALL, "ScreenShot: Couldn't create a file\n");
+ if ( ri.FS_FileExists( checkname ) ) {
+ ri.Printf( PRINT_ALL, "ScreenShot: Couldn't create a file\n");
return;
}
}
@@ -1174,30 +1174,30 @@ void R_ScreenShotPNG_f (void) {
R_TakeScreenshotPNG( 0, 0, glConfig.vidWidth, glConfig.vidHeight, checkname );
if ( !silent )
- ri->Printf( PRINT_ALL, "[skipnotify]Wrote %s\n", checkname );
+ ri.Printf( PRINT_ALL, "[skipnotify]Wrote %s\n", checkname );
}
void R_ScreenShot_f (void) {
char checkname[MAX_OSPATH] = {0};
qboolean silent = qfalse;
- if ( !strcmp( ri->Cmd_Argv(1), "levelshot" ) ) {
+ if ( !strcmp( ri.Cmd_Argv(1), "levelshot" ) ) {
R_LevelShot();
return;
}
- if ( !strcmp( ri->Cmd_Argv(1), "silent" ) )
+ if ( !strcmp( ri.Cmd_Argv(1), "silent" ) )
silent = qtrue;
- if ( ri->Cmd_Argc() == 2 && !silent ) {
+ if ( ri.Cmd_Argc() == 2 && !silent ) {
// explicit filename
- Com_sprintf( checkname, sizeof( checkname ), "screenshots/%s.jpg", ri->Cmd_Argv( 1 ) );
+ Com_sprintf( checkname, sizeof( checkname ), "screenshots/%s.jpg", ri.Cmd_Argv( 1 ) );
}
else {
// timestamp the file
R_ScreenshotFilename( checkname, sizeof( checkname ), ".jpg" );
- if ( ri->FS_FileExists( checkname ) ) {
- ri->Printf( PRINT_ALL, "ScreenShot: Couldn't create a file\n" );
+ if ( ri.FS_FileExists( checkname ) ) {
+ ri.Printf( PRINT_ALL, "ScreenShot: Couldn't create a file\n" );
return;
}
}
@@ -1205,7 +1205,7 @@ void R_ScreenShot_f (void) {
R_TakeScreenshotJPEG( 0, 0, glConfig.vidWidth, glConfig.vidHeight, checkname );
if ( !silent )
- ri->Printf( PRINT_ALL, "[skipnotify]Wrote %s\n", checkname );
+ ri.Printf( PRINT_ALL, "[skipnotify]Wrote %s\n", checkname );
}
/*
@@ -1250,7 +1250,7 @@ const void *RB_TakeVideoFrameCmd( const void *data )
memcount = RE_SaveJPGToBuffer(cmd->encodeBuffer, linelen * cmd->height,
r_aviMotionJpegQuality->integer,
cmd->width, cmd->height, cBuf, padlen);
- ri->CL_WriteAVIVideoFrame(cmd->encodeBuffer, memcount);
+ ri.CL_WriteAVIVideoFrame(cmd->encodeBuffer, memcount);
}
else
{
@@ -1279,7 +1279,7 @@ const void *RB_TakeVideoFrameCmd( const void *data )
srcptr += padlen;
}
- ri->CL_WriteAVIVideoFrame(cmd->encodeBuffer, avipadwidth * cmd->height);
+ ri.CL_WriteAVIVideoFrame(cmd->encodeBuffer, avipadwidth * cmd->height);
}
return (const void *)(cmd + 1);
@@ -1336,7 +1336,7 @@ void GL_SetDefaultState( void )
================
R_PrintLongString
-Workaround for ri->Printf's 1024 characters buffer limit.
+Workaround for ri.Printf's 1024 characters buffer limit.
================
*/
void R_PrintLongString(const char *string)
@@ -1364,7 +1364,7 @@ void R_PrintLongString(const char *string)
}
Q_strncpyz( buffer, p, charsToTake + 1 );
- ri->Printf( PRINT_ALL, "%s", buffer );
+ ri.Printf( PRINT_ALL, "%s", buffer );
remainingLength -= charsToTake;
p += charsToTake;
}
@@ -1401,37 +1401,37 @@ void GfxInfo_f( void )
"GL_EXT_texture_compression_s3tc",
};
- int fullscreen = ri->Cvar_VariableIntegerValue("r_fullscreen");
- int noborder = ri->Cvar_VariableIntegerValue("r_noborder");
+ int fullscreen = ri.Cvar_VariableIntegerValue("r_fullscreen");
+ int noborder = ri.Cvar_VariableIntegerValue("r_noborder");
- ri->Printf( PRINT_ALL, "\nGL_VENDOR: %s\n", glConfig.vendor_string );
- ri->Printf( PRINT_ALL, "GL_RENDERER: %s\n", glConfig.renderer_string );
- ri->Printf( PRINT_ALL, "GL_VERSION: %s\n", glConfig.version_string );
+ ri.Printf( PRINT_ALL, "\nGL_VENDOR: %s\n", glConfig.vendor_string );
+ ri.Printf( PRINT_ALL, "GL_RENDERER: %s\n", glConfig.renderer_string );
+ ri.Printf( PRINT_ALL, "GL_VERSION: %s\n", glConfig.version_string );
R_PrintLongString( glConfigExt.originalExtensionString );
- ri->Printf( PRINT_ALL, "\n");
- ri->Printf( PRINT_ALL, "GL_MAX_TEXTURE_SIZE: %d\n", glConfig.maxTextureSize );
- ri->Printf( PRINT_ALL, "GL_MAX_TEXTURE_UNITS_ARB: %d\n", glConfig.maxActiveTextures );
- ri->Printf( PRINT_ALL, "\nPIXELFORMAT: color(%d-bits) Z(%d-bit) stencil(%d-bits)\n", glConfig.colorBits, glConfig.depthBits, glConfig.stencilBits );
- ri->Printf( PRINT_ALL, "MODE: %d, %d x %d %s%s hz:",
- ri->Cvar_VariableIntegerValue("r_mode"),
+ ri.Printf( PRINT_ALL, "\n");
+ ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_SIZE: %d\n", glConfig.maxTextureSize );
+ ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_UNITS_ARB: %d\n", glConfig.maxActiveTextures );
+ ri.Printf( PRINT_ALL, "\nPIXELFORMAT: color(%d-bits) Z(%d-bit) stencil(%d-bits)\n", glConfig.colorBits, glConfig.depthBits, glConfig.stencilBits );
+ ri.Printf( PRINT_ALL, "MODE: %d, %d x %d %s%s hz:",
+ ri.Cvar_VariableIntegerValue("r_mode"),
glConfig.vidWidth, glConfig.vidHeight,
fullscreen == 0 ? noborderstrings[noborder == 1] : noborderstrings[0],
fsstrings[fullscreen == 1] );
if ( glConfig.displayFrequency )
{
- ri->Printf( PRINT_ALL, "%d\n", glConfig.displayFrequency );
+ ri.Printf( PRINT_ALL, "%d\n", glConfig.displayFrequency );
}
else
{
- ri->Printf( PRINT_ALL, "N/A\n" );
+ ri.Printf( PRINT_ALL, "N/A\n" );
}
if ( glConfig.deviceSupportsGamma && !glConfigExt.doGammaCorrectionWithShaders )
{
- ri->Printf( PRINT_ALL, "GAMMA: hardware w/ %d overbright bits\n", tr.overbrightBits );
+ ri.Printf( PRINT_ALL, "GAMMA: hardware w/ %d overbright bits\n", tr.overbrightBits );
}
else
{
- ri->Printf( PRINT_ALL, "GAMMA: software w/ %d overbright bits\n", tr.overbrightBits );
+ ri.Printf( PRINT_ALL, "GAMMA: software w/ %d overbright bits\n", tr.overbrightBits );
}
// rendering primitives
@@ -1439,7 +1439,7 @@ void GfxInfo_f( void )
int primitives;
// default is to use triangles if compiled vertex arrays are present
- ri->Printf( PRINT_ALL, "rendering primitives: " );
+ ri.Printf( PRINT_ALL, "rendering primitives: " );
primitives = r_primitives->integer;
if ( primitives == 0 ) {
if ( qglLockArraysEXT ) {
@@ -1449,54 +1449,54 @@ void GfxInfo_f( void )
}
}
if ( primitives == -1 ) {
- ri->Printf( PRINT_ALL, "none\n" );
+ ri.Printf( PRINT_ALL, "none\n" );
} else if ( primitives == 2 ) {
- ri->Printf( PRINT_ALL, "single glDrawElements\n" );
+ ri.Printf( PRINT_ALL, "single glDrawElements\n" );
} else if ( primitives == 1 ) {
- ri->Printf( PRINT_ALL, "multiple glArrayElement\n" );
+ ri.Printf( PRINT_ALL, "multiple glArrayElement\n" );
} else if ( primitives == 3 ) {
- ri->Printf( PRINT_ALL, "multiple glColor4ubv + glTexCoord2fv + glVertex3fv\n" );
+ ri.Printf( PRINT_ALL, "multiple glColor4ubv + glTexCoord2fv + glVertex3fv\n" );
}
}
- ri->Printf( PRINT_ALL, "texturemode: %s\n", r_textureMode->string );
- ri->Printf( PRINT_ALL, "picmip: %d\n", r_picmip->integer );
- ri->Printf( PRINT_ALL, "texture bits: %d\n", r_texturebits->integer );
+ ri.Printf( PRINT_ALL, "texturemode: %s\n", r_textureMode->string );
+ ri.Printf( PRINT_ALL, "picmip: %d\n", r_picmip->integer );
+ ri.Printf( PRINT_ALL, "texture bits: %d\n", r_texturebits->integer );
if ( r_texturebitslm->integer > 0 )
- ri->Printf( PRINT_ALL, "lightmap texture bits: %d\n", r_texturebitslm->integer );
- ri->Printf( PRINT_ALL, "multitexture: %s\n", enablestrings[qglActiveTextureARB != 0] );
- ri->Printf( PRINT_ALL, "compiled vertex arrays: %s\n", enablestrings[qglLockArraysEXT != 0 ] );
- ri->Printf( PRINT_ALL, "texenv add: %s\n", enablestrings[glConfig.textureEnvAddAvailable != 0] );
- ri->Printf( PRINT_ALL, "compressed textures: %s\n", enablestrings[glConfig.textureCompression != TC_NONE] );
- ri->Printf( PRINT_ALL, "compressed lightmaps: %s\n", enablestrings[(r_ext_compressed_lightmaps->integer != 0 && glConfig.textureCompression != TC_NONE)] );
- ri->Printf( PRINT_ALL, "texture compression method: %s\n", tc_table[glConfig.textureCompression] );
- ri->Printf( PRINT_ALL, "anisotropic filtering: %s ", enablestrings[(r_ext_texture_filter_anisotropic->integer != 0) && glConfig.maxTextureFilterAnisotropy] );
+ ri.Printf( PRINT_ALL, "lightmap texture bits: %d\n", r_texturebitslm->integer );
+ ri.Printf( PRINT_ALL, "multitexture: %s\n", enablestrings[qglActiveTextureARB != 0] );
+ ri.Printf( PRINT_ALL, "compiled vertex arrays: %s\n", enablestrings[qglLockArraysEXT != 0 ] );
+ ri.Printf( PRINT_ALL, "texenv add: %s\n", enablestrings[glConfig.textureEnvAddAvailable != 0] );
+ ri.Printf( PRINT_ALL, "compressed textures: %s\n", enablestrings[glConfig.textureCompression != TC_NONE] );
+ ri.Printf( PRINT_ALL, "compressed lightmaps: %s\n", enablestrings[(r_ext_compressed_lightmaps->integer != 0 && glConfig.textureCompression != TC_NONE)] );
+ ri.Printf( PRINT_ALL, "texture compression method: %s\n", tc_table[glConfig.textureCompression] );
+ ri.Printf( PRINT_ALL, "anisotropic filtering: %s ", enablestrings[(r_ext_texture_filter_anisotropic->integer != 0) && glConfig.maxTextureFilterAnisotropy] );
if (r_ext_texture_filter_anisotropic->integer != 0 && glConfig.maxTextureFilterAnisotropy)
{
if (Q_isintegral(r_ext_texture_filter_anisotropic->value))
- ri->Printf( PRINT_ALL, "(%i of ", (int)r_ext_texture_filter_anisotropic->value);
+ ri.Printf( PRINT_ALL, "(%i of ", (int)r_ext_texture_filter_anisotropic->value);
else
- ri->Printf( PRINT_ALL, "(%f of ", r_ext_texture_filter_anisotropic->value);
+ ri.Printf( PRINT_ALL, "(%f of ", r_ext_texture_filter_anisotropic->value);
if (Q_isintegral(glConfig.maxTextureFilterAnisotropy))
- ri->Printf( PRINT_ALL, "%i)\n", (int)glConfig.maxTextureFilterAnisotropy);
+ ri.Printf( PRINT_ALL, "%i)\n", (int)glConfig.maxTextureFilterAnisotropy);
else
- ri->Printf( PRINT_ALL, "%f)\n", glConfig.maxTextureFilterAnisotropy);
+ ri.Printf( PRINT_ALL, "%f)\n", glConfig.maxTextureFilterAnisotropy);
}
- ri->Printf( PRINT_ALL, "Dynamic Glow: %s\n", enablestrings[r_DynamicGlow->integer ? 1 : 0] );
- if (g_bTextureRectangleHack) ri->Printf( PRINT_ALL, "Dynamic Glow ATI BAD DRIVER HACK %s\n", enablestrings[g_bTextureRectangleHack] );
+ ri.Printf( PRINT_ALL, "Dynamic Glow: %s\n", enablestrings[r_DynamicGlow->integer ? 1 : 0] );
+ if (g_bTextureRectangleHack) ri.Printf( PRINT_ALL, "Dynamic Glow ATI BAD DRIVER HACK %s\n", enablestrings[g_bTextureRectangleHack] );
if ( r_finish->integer ) {
- ri->Printf( PRINT_ALL, "Forcing glFinish\n" );
+ ri.Printf( PRINT_ALL, "Forcing glFinish\n" );
}
- int displayRefresh = ri->Cvar_VariableIntegerValue("r_displayRefresh");
+ int displayRefresh = ri.Cvar_VariableIntegerValue("r_displayRefresh");
if ( displayRefresh ) {
- ri->Printf( PRINT_ALL, "Display refresh set to %d\n", displayRefresh);
+ ri.Printf( PRINT_ALL, "Display refresh set to %d\n", displayRefresh);
}
if (tr.world)
{
- ri->Printf( PRINT_ALL, "Light Grid size set to (%.2f %.2f %.2f)\n", tr.world->lightGridSize[0], tr.world->lightGridSize[1], tr.world->lightGridSize[2] );
+ ri.Printf( PRINT_ALL, "Light Grid size set to (%.2f %.2f %.2f)\n", tr.world->lightGridSize[0], tr.world->lightGridSize[1], tr.world->lightGridSize[2] );
}
}
@@ -1543,156 +1543,156 @@ R_Register
void R_Register( void )
{
//FIXME: lol badness
- se_language = ri->Cvar_Get("se_language", "english", CVAR_ARCHIVE | CVAR_NORESTART, "");
+ se_language = ri.Cvar_Get("se_language", "english", CVAR_ARCHIVE | CVAR_NORESTART, "");
//
// latched and archived variables
//
- r_allowExtensions = ri->Cvar_Get( "r_allowExtensions", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ext_compressed_textures = ri->Cvar_Get( "r_ext_compress_textures", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ext_compressed_lightmaps = ri->Cvar_Get( "r_ext_compress_lightmaps", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ext_preferred_tc_method = ri->Cvar_Get( "r_ext_preferred_tc_method", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ext_gamma_control = ri->Cvar_Get( "r_ext_gamma_control", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ext_multitexture = ri->Cvar_Get( "r_ext_multitexture", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ext_compiled_vertex_array = ri->Cvar_Get( "r_ext_compiled_vertex_array", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ext_texture_env_add = ri->Cvar_Get( "r_ext_texture_env_add", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_ext_texture_filter_anisotropic = ri->Cvar_Get( "r_ext_texture_filter_anisotropic", "16", CVAR_ARCHIVE_ND, "" );
- r_gammaShaders = ri->Cvar_Get( "r_gammaShaders", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_environmentMapping = ri->Cvar_Get( "r_environmentMapping", "1", CVAR_ARCHIVE_ND, "" );
- r_DynamicGlow = ri->Cvar_Get( "r_DynamicGlow", "0", CVAR_ARCHIVE_ND, "" );
- r_DynamicGlowPasses = ri->Cvar_Get( "r_DynamicGlowPasses", "5", CVAR_ARCHIVE_ND, "" );
- r_DynamicGlowDelta = ri->Cvar_Get( "r_DynamicGlowDelta", "0.8f", CVAR_ARCHIVE_ND, "" );
- r_DynamicGlowIntensity = ri->Cvar_Get( "r_DynamicGlowIntensity", "1.13f", CVAR_ARCHIVE_ND, "" );
- r_DynamicGlowSoft = ri->Cvar_Get( "r_DynamicGlowSoft", "1", CVAR_ARCHIVE_ND, "" );
- r_DynamicGlowWidth = ri->Cvar_Get( "r_DynamicGlowWidth", "320", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_DynamicGlowHeight = ri->Cvar_Get( "r_DynamicGlowHeight", "240", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_picmip = ri->Cvar_Get( "r_picmip", "0", CVAR_ARCHIVE|CVAR_LATCH, "" );
- ri->Cvar_CheckRange( r_picmip, 0, 16, qtrue );
- r_colorMipLevels = ri->Cvar_Get( "r_colorMipLevels", "0", CVAR_LATCH, "" );
- r_detailTextures = ri->Cvar_Get( "r_detailtextures", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_texturebits = ri->Cvar_Get( "r_texturebits", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_texturebitslm = ri->Cvar_Get( "r_texturebitslm", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_overBrightBits = ri->Cvar_Get( "r_overBrightBits", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_mapOverBrightBits = ri->Cvar_Get( "r_mapOverBrightBits", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_simpleMipMaps = ri->Cvar_Get( "r_simpleMipMaps", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- r_vertexLight = ri->Cvar_Get( "r_vertexLight", "0", CVAR_ARCHIVE|CVAR_LATCH, "" );
- r_uiFullScreen = ri->Cvar_Get( "r_uifullscreen", "0", CVAR_NONE, "" );
- r_subdivisions = ri->Cvar_Get( "r_subdivisions", "4", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
- ri->Cvar_CheckRange( r_subdivisions, 0, 80, qfalse );
-
- r_fullbright = ri->Cvar_Get( "r_fullbright", "0", CVAR_CHEAT, "" );
- r_intensity = ri->Cvar_Get( "r_intensity", "1", CVAR_LATCH, "" );
- r_singleShader = ri->Cvar_Get( "r_singleShader", "0", CVAR_CHEAT|CVAR_LATCH, "" );
- r_lodCurveError = ri->Cvar_Get( "r_lodCurveError", "250", CVAR_ARCHIVE_ND, "" );
- r_lodbias = ri->Cvar_Get( "r_lodbias", "0", CVAR_ARCHIVE_ND, "" );
- r_autolodscalevalue = ri->Cvar_Get( "r_autolodscalevalue", "0", CVAR_ROM, "" );
- r_flares = ri->Cvar_Get( "r_flares", "1", CVAR_ARCHIVE_ND, "" );
-
- r_znear = ri->Cvar_Get( "r_znear", "4", CVAR_ARCHIVE_ND, "" );
- ri->Cvar_CheckRange( r_znear, 0.001f, 10, qfalse );
- r_ignoreGLErrors = ri->Cvar_Get( "r_ignoreGLErrors", "1", CVAR_ARCHIVE_ND, "" );
- r_fastsky = ri->Cvar_Get( "r_fastsky", "0", CVAR_ARCHIVE_ND, "" );
- r_inGameVideo = ri->Cvar_Get( "r_inGameVideo", "1", CVAR_ARCHIVE_ND, "" );
- r_drawSun = ri->Cvar_Get( "r_drawSun", "0", CVAR_ARCHIVE_ND, "" );
- r_dynamiclight = ri->Cvar_Get( "r_dynamiclight", "1", CVAR_ARCHIVE, "" );
+ r_allowExtensions = ri.Cvar_Get( "r_allowExtensions", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ext_compressed_textures = ri.Cvar_Get( "r_ext_compress_textures", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ext_compressed_lightmaps = ri.Cvar_Get( "r_ext_compress_lightmaps", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ext_preferred_tc_method = ri.Cvar_Get( "r_ext_preferred_tc_method", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ext_gamma_control = ri.Cvar_Get( "r_ext_gamma_control", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ext_multitexture = ri.Cvar_Get( "r_ext_multitexture", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ext_compiled_vertex_array = ri.Cvar_Get( "r_ext_compiled_vertex_array", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ext_texture_env_add = ri.Cvar_Get( "r_ext_texture_env_add", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_ext_texture_filter_anisotropic = ri.Cvar_Get( "r_ext_texture_filter_anisotropic", "16", CVAR_ARCHIVE_ND, "" );
+ r_gammaShaders = ri.Cvar_Get( "r_gammaShaders", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_environmentMapping = ri.Cvar_Get( "r_environmentMapping", "1", CVAR_ARCHIVE_ND, "" );
+ r_DynamicGlow = ri.Cvar_Get( "r_DynamicGlow", "0", CVAR_ARCHIVE_ND, "" );
+ r_DynamicGlowPasses = ri.Cvar_Get( "r_DynamicGlowPasses", "5", CVAR_ARCHIVE_ND, "" );
+ r_DynamicGlowDelta = ri.Cvar_Get( "r_DynamicGlowDelta", "0.8f", CVAR_ARCHIVE_ND, "" );
+ r_DynamicGlowIntensity = ri.Cvar_Get( "r_DynamicGlowIntensity", "1.13f", CVAR_ARCHIVE_ND, "" );
+ r_DynamicGlowSoft = ri.Cvar_Get( "r_DynamicGlowSoft", "1", CVAR_ARCHIVE_ND, "" );
+ r_DynamicGlowWidth = ri.Cvar_Get( "r_DynamicGlowWidth", "320", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_DynamicGlowHeight = ri.Cvar_Get( "r_DynamicGlowHeight", "240", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_picmip = ri.Cvar_Get( "r_picmip", "0", CVAR_ARCHIVE|CVAR_LATCH, "" );
+ ri.Cvar_CheckRange( r_picmip, 0, 16, qtrue );
+ r_colorMipLevels = ri.Cvar_Get( "r_colorMipLevels", "0", CVAR_LATCH, "" );
+ r_detailTextures = ri.Cvar_Get( "r_detailtextures", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_texturebits = ri.Cvar_Get( "r_texturebits", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_texturebitslm = ri.Cvar_Get( "r_texturebitslm", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_overBrightBits = ri.Cvar_Get( "r_overBrightBits", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_mapOverBrightBits = ri.Cvar_Get( "r_mapOverBrightBits", "0", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_simpleMipMaps = ri.Cvar_Get( "r_simpleMipMaps", "1", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ r_vertexLight = ri.Cvar_Get( "r_vertexLight", "0", CVAR_ARCHIVE|CVAR_LATCH, "" );
+ r_uiFullScreen = ri.Cvar_Get( "r_uifullscreen", "0", CVAR_NONE, "" );
+ r_subdivisions = ri.Cvar_Get( "r_subdivisions", "4", CVAR_ARCHIVE_ND|CVAR_LATCH, "" );
+ ri.Cvar_CheckRange( r_subdivisions, 0, 80, qfalse );
+
+ r_fullbright = ri.Cvar_Get( "r_fullbright", "0", CVAR_CHEAT, "" );
+ r_intensity = ri.Cvar_Get( "r_intensity", "1", CVAR_LATCH, "" );
+ r_singleShader = ri.Cvar_Get( "r_singleShader", "0", CVAR_CHEAT|CVAR_LATCH, "" );
+ r_lodCurveError = ri.Cvar_Get( "r_lodCurveError", "250", CVAR_ARCHIVE_ND, "" );
+ r_lodbias = ri.Cvar_Get( "r_lodbias", "0", CVAR_ARCHIVE_ND, "" );
+ r_autolodscalevalue = ri.Cvar_Get( "r_autolodscalevalue", "0", CVAR_ROM, "" );
+ r_flares = ri.Cvar_Get( "r_flares", "1", CVAR_ARCHIVE_ND, "" );
+
+ r_znear = ri.Cvar_Get( "r_znear", "4", CVAR_ARCHIVE_ND, "" );
+ ri.Cvar_CheckRange( r_znear, 0.001f, 10, qfalse );
+ r_ignoreGLErrors = ri.Cvar_Get( "r_ignoreGLErrors", "1", CVAR_ARCHIVE_ND, "" );
+ r_fastsky = ri.Cvar_Get( "r_fastsky", "0", CVAR_ARCHIVE_ND, "" );
+ r_inGameVideo = ri.Cvar_Get( "r_inGameVideo", "1", CVAR_ARCHIVE_ND, "" );
+ r_drawSun = ri.Cvar_Get( "r_drawSun", "0", CVAR_ARCHIVE_ND, "" );
+ r_dynamiclight = ri.Cvar_Get( "r_dynamiclight", "1", CVAR_ARCHIVE, "" );
// rjr - removed for hacking
-// r_dlightBacks = ri->Cvar_Get( "r_dlightBacks", "1", CVAR_CHEAT, "" );
- r_finish = ri->Cvar_Get( "r_finish", "0", CVAR_ARCHIVE_ND, "" );
- r_textureMode = ri->Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE, "" );
- r_markcount = ri->Cvar_Get( "r_markcount", "100", CVAR_ARCHIVE_ND, "" );
- r_gamma = ri->Cvar_Get( "r_gamma", "1", CVAR_ARCHIVE_ND, "" );
- r_facePlaneCull = ri->Cvar_Get( "r_facePlaneCull", "1", CVAR_ARCHIVE_ND, "" );
- r_cullRoofFaces = ri->Cvar_Get( "r_cullRoofFaces", "0", CVAR_CHEAT, "" ); //attempted smart method of culling out upwards facing surfaces on roofs for automap shots -rww
- r_roofCullCeilDist = ri->Cvar_Get( "r_roofCullCeilDist", "256", CVAR_CHEAT, "" ); //attempted smart method of culling out upwards facing surfaces on roofs for automap shots -rww
- r_roofCullFloorDist = ri->Cvar_Get( "r_roofCeilFloorDist", "128", CVAR_CHEAT, "" ); //attempted smart method of culling out upwards facing surfaces on roofs for automap shots -rww
- r_primitives = ri->Cvar_Get( "r_primitives", "0", CVAR_ARCHIVE_ND, "" );
- ri->Cvar_CheckRange( r_primitives, MIN_PRIMITIVES, MAX_PRIMITIVES, qtrue );
- r_ambientScale = ri->Cvar_Get( "r_ambientScale", "0.6", CVAR_CHEAT, "" );
- r_directedScale = ri->Cvar_Get( "r_directedScale", "1", CVAR_CHEAT, "" );
- r_autoMap = ri->Cvar_Get( "r_autoMap", "0", CVAR_ARCHIVE_ND, "" ); //automap renderside toggle for debugging -rww
- r_autoMapBackAlpha = ri->Cvar_Get( "r_autoMapBackAlpha", "0", CVAR_NONE, "" ); //alpha of automap bg -rww
- r_autoMapDisable = ri->Cvar_Get( "r_autoMapDisable", "1", CVAR_NONE, "" );
- r_showImages = ri->Cvar_Get( "r_showImages", "0", CVAR_CHEAT, "" );
- r_debugLight = ri->Cvar_Get( "r_debuglight", "0", CVAR_TEMP, "" );
- r_debugSort = ri->Cvar_Get( "r_debugSort", "0", CVAR_CHEAT, "" );
- r_dlightStyle = ri->Cvar_Get( "r_dlightStyle", "1", CVAR_TEMP, "" );
- r_surfaceSprites = ri->Cvar_Get( "r_surfaceSprites", "1", CVAR_ARCHIVE_ND, "" );
- r_surfaceWeather = ri->Cvar_Get( "r_surfaceWeather", "0", CVAR_TEMP, "" );
- r_windSpeed = ri->Cvar_Get( "r_windSpeed", "0", CVAR_NONE, "" );
- r_windAngle = ri->Cvar_Get( "r_windAngle", "0", CVAR_NONE, "" );
- r_windGust = ri->Cvar_Get( "r_windGust", "0", CVAR_NONE, "" );
- r_windDampFactor = ri->Cvar_Get( "r_windDampFactor", "0.1", CVAR_NONE, "" );
- r_windPointForce = ri->Cvar_Get( "r_windPointForce", "0", CVAR_NONE, "" );
- r_windPointX = ri->Cvar_Get( "r_windPointX", "0", CVAR_NONE, "" );
- r_windPointY = ri->Cvar_Get( "r_windPointY", "0", CVAR_NONE, "" );
- r_nocurves = ri->Cvar_Get( "r_nocurves", "0", CVAR_CHEAT, "" );
- r_drawworld = ri->Cvar_Get( "r_drawworld", "1", CVAR_CHEAT, "" );
- r_drawfog = ri->Cvar_Get( "r_drawfog", "2", CVAR_CHEAT, "" );
- r_lightmap = ri->Cvar_Get( "r_lightmap", "0", CVAR_CHEAT, "" );
- r_portalOnly = ri->Cvar_Get( "r_portalOnly", "0", CVAR_CHEAT, "" );
- r_skipBackEnd = ri->Cvar_Get( "r_skipBackEnd", "0", CVAR_CHEAT, "" );
- r_measureOverdraw = ri->Cvar_Get( "r_measureOverdraw", "0", CVAR_CHEAT, "" );
- r_lodscale = ri->Cvar_Get( "r_lodscale", "5", CVAR_NONE, "" );
- r_norefresh = ri->Cvar_Get( "r_norefresh", "0", CVAR_CHEAT, "" );
- r_drawentities = ri->Cvar_Get( "r_drawentities", "1", CVAR_CHEAT, "" );
- r_ignore = ri->Cvar_Get( "r_ignore", "1", CVAR_CHEAT, "" );
- r_nocull = ri->Cvar_Get( "r_nocull", "0", CVAR_CHEAT, "" );
- r_novis = ri->Cvar_Get( "r_novis", "0", CVAR_CHEAT, "" );
- r_showcluster = ri->Cvar_Get( "r_showcluster", "0", CVAR_CHEAT, "" );
- r_speeds = ri->Cvar_Get( "r_speeds", "0", CVAR_CHEAT, "" );
- r_verbose = ri->Cvar_Get( "r_verbose", "0", CVAR_CHEAT, "" );
- r_logFile = ri->Cvar_Get( "r_logFile", "0", CVAR_CHEAT, "" );
- r_debugSurface = ri->Cvar_Get( "r_debugSurface", "0", CVAR_CHEAT, "" );
- r_nobind = ri->Cvar_Get( "r_nobind", "0", CVAR_CHEAT, "" );
- r_showtris = ri->Cvar_Get( "r_showtris", "0", CVAR_CHEAT, "" );
- r_showsky = ri->Cvar_Get( "r_showsky", "0", CVAR_CHEAT, "" );
- r_shownormals = ri->Cvar_Get( "r_shownormals", "0", CVAR_CHEAT, "" );
- r_clear = ri->Cvar_Get( "r_clear", "0", CVAR_CHEAT, "" );
- r_offsetFactor = ri->Cvar_Get( "r_offsetfactor", "-1", CVAR_CHEAT, "" );
- r_offsetUnits = ri->Cvar_Get( "r_offsetunits", "-2", CVAR_CHEAT, "" );
- r_lockpvs = ri->Cvar_Get( "r_lockpvs", "0", CVAR_CHEAT, "" );
- r_noportals = ri->Cvar_Get( "r_noportals", "0", CVAR_CHEAT, "" );
- r_shadows = ri->Cvar_Get( "cg_shadows", "1", CVAR_NONE, "" );
- r_shadowRange = ri->Cvar_Get( "r_shadowRange", "1000", CVAR_NONE, "" );
- r_marksOnTriangleMeshes = ri->Cvar_Get( "r_marksOnTriangleMeshes", "0", CVAR_ARCHIVE_ND, "" );
- r_aspectCorrectFonts = ri->Cvar_Get( "r_aspectCorrectFonts", "0", CVAR_ARCHIVE, "" );
- r_maxpolys = ri->Cvar_Get( "r_maxpolys", XSTRING( DEFAULT_MAX_POLYS ), CVAR_NONE, "" );
- r_maxpolyverts = ri->Cvar_Get( "r_maxpolyverts", XSTRING( DEFAULT_MAX_POLYVERTS ), CVAR_NONE, "" );
+// r_dlightBacks = ri.Cvar_Get( "r_dlightBacks", "1", CVAR_CHEAT, "" );
+ r_finish = ri.Cvar_Get( "r_finish", "0", CVAR_ARCHIVE_ND, "" );
+ r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE, "" );
+ r_markcount = ri.Cvar_Get( "r_markcount", "100", CVAR_ARCHIVE_ND, "" );
+ r_gamma = ri.Cvar_Get( "r_gamma", "1", CVAR_ARCHIVE_ND, "" );
+ r_facePlaneCull = ri.Cvar_Get( "r_facePlaneCull", "1", CVAR_ARCHIVE_ND, "" );
+ r_cullRoofFaces = ri.Cvar_Get( "r_cullRoofFaces", "0", CVAR_CHEAT, "" ); //attempted smart method of culling out upwards facing surfaces on roofs for automap shots -rww
+ r_roofCullCeilDist = ri.Cvar_Get( "r_roofCullCeilDist", "256", CVAR_CHEAT, "" ); //attempted smart method of culling out upwards facing surfaces on roofs for automap shots -rww
+ r_roofCullFloorDist = ri.Cvar_Get( "r_roofCeilFloorDist", "128", CVAR_CHEAT, "" ); //attempted smart method of culling out upwards facing surfaces on roofs for automap shots -rww
+ r_primitives = ri.Cvar_Get( "r_primitives", "0", CVAR_ARCHIVE_ND, "" );
+ ri.Cvar_CheckRange( r_primitives, MIN_PRIMITIVES, MAX_PRIMITIVES, qtrue );
+ r_ambientScale = ri.Cvar_Get( "r_ambientScale", "0.6", CVAR_CHEAT, "" );
+ r_directedScale = ri.Cvar_Get( "r_directedScale", "1", CVAR_CHEAT, "" );
+ r_autoMap = ri.Cvar_Get( "r_autoMap", "0", CVAR_ARCHIVE_ND, "" ); //automap renderside toggle for debugging -rww
+ r_autoMapBackAlpha = ri.Cvar_Get( "r_autoMapBackAlpha", "0", CVAR_NONE, "" ); //alpha of automap bg -rww
+ r_autoMapDisable = ri.Cvar_Get( "r_autoMapDisable", "1", CVAR_NONE, "" );
+ r_showImages = ri.Cvar_Get( "r_showImages", "0", CVAR_CHEAT, "" );
+ r_debugLight = ri.Cvar_Get( "r_debuglight", "0", CVAR_TEMP, "" );
+ r_debugSort = ri.Cvar_Get( "r_debugSort", "0", CVAR_CHEAT, "" );
+ r_dlightStyle = ri.Cvar_Get( "r_dlightStyle", "1", CVAR_TEMP, "" );
+ r_surfaceSprites = ri.Cvar_Get( "r_surfaceSprites", "1", CVAR_ARCHIVE_ND, "" );
+ r_surfaceWeather = ri.Cvar_Get( "r_surfaceWeather", "0", CVAR_TEMP, "" );
+ r_windSpeed = ri.Cvar_Get( "r_windSpeed", "0", CVAR_NONE, "" );
+ r_windAngle = ri.Cvar_Get( "r_windAngle", "0", CVAR_NONE, "" );
+ r_windGust = ri.Cvar_Get( "r_windGust", "0", CVAR_NONE, "" );
+ r_windDampFactor = ri.Cvar_Get( "r_windDampFactor", "0.1", CVAR_NONE, "" );
+ r_windPointForce = ri.Cvar_Get( "r_windPointForce", "0", CVAR_NONE, "" );
+ r_windPointX = ri.Cvar_Get( "r_windPointX", "0", CVAR_NONE, "" );
+ r_windPointY = ri.Cvar_Get( "r_windPointY", "0", CVAR_NONE, "" );
+ r_nocurves = ri.Cvar_Get( "r_nocurves", "0", CVAR_CHEAT, "" );
+ r_drawworld = ri.Cvar_Get( "r_drawworld", "1", CVAR_CHEAT, "" );
+ r_drawfog = ri.Cvar_Get( "r_drawfog", "2", CVAR_CHEAT, "" );
+ r_lightmap = ri.Cvar_Get( "r_lightmap", "0", CVAR_CHEAT, "" );
+ r_portalOnly = ri.Cvar_Get( "r_portalOnly", "0", CVAR_CHEAT, "" );
+ r_skipBackEnd = ri.Cvar_Get( "r_skipBackEnd", "0", CVAR_CHEAT, "" );
+ r_measureOverdraw = ri.Cvar_Get( "r_measureOverdraw", "0", CVAR_CHEAT, "" );
+ r_lodscale = ri.Cvar_Get( "r_lodscale", "5", CVAR_NONE, "" );
+ r_norefresh = ri.Cvar_Get( "r_norefresh", "0", CVAR_CHEAT, "" );
+ r_drawentities = ri.Cvar_Get( "r_drawentities", "1", CVAR_CHEAT, "" );
+ r_ignore = ri.Cvar_Get( "r_ignore", "1", CVAR_CHEAT, "" );
+ r_nocull = ri.Cvar_Get( "r_nocull", "0", CVAR_CHEAT, "" );
+ r_novis = ri.Cvar_Get( "r_novis", "0", CVAR_CHEAT, "" );
+ r_showcluster = ri.Cvar_Get( "r_showcluster", "0", CVAR_CHEAT, "" );
+ r_speeds = ri.Cvar_Get( "r_speeds", "0", CVAR_CHEAT, "" );
+ r_verbose = ri.Cvar_Get( "r_verbose", "0", CVAR_CHEAT, "" );
+ r_logFile = ri.Cvar_Get( "r_logFile", "0", CVAR_CHEAT, "" );
+ r_debugSurface = ri.Cvar_Get( "r_debugSurface", "0", CVAR_CHEAT, "" );
+ r_nobind = ri.Cvar_Get( "r_nobind", "0", CVAR_CHEAT, "" );
+ r_showtris = ri.Cvar_Get( "r_showtris", "0", CVAR_CHEAT, "" );
+ r_showsky = ri.Cvar_Get( "r_showsky", "0", CVAR_CHEAT, "" );
+ r_shownormals = ri.Cvar_Get( "r_shownormals", "0", CVAR_CHEAT, "" );
+ r_clear = ri.Cvar_Get( "r_clear", "0", CVAR_CHEAT, "" );
+ r_offsetFactor = ri.Cvar_Get( "r_offsetfactor", "-1", CVAR_CHEAT, "" );
+ r_offsetUnits = ri.Cvar_Get( "r_offsetunits", "-2", CVAR_CHEAT, "" );
+ r_lockpvs = ri.Cvar_Get( "r_lockpvs", "0", CVAR_CHEAT, "" );
+ r_noportals = ri.Cvar_Get( "r_noportals", "0", CVAR_CHEAT, "" );
+ r_shadows = ri.Cvar_Get( "cg_shadows", "1", CVAR_NONE, "" );
+ r_shadowRange = ri.Cvar_Get( "r_shadowRange", "1000", CVAR_NONE, "" );
+ r_marksOnTriangleMeshes = ri.Cvar_Get( "r_marksOnTriangleMeshes", "0", CVAR_ARCHIVE_ND, "" );
+ r_aspectCorrectFonts = ri.Cvar_Get( "r_aspectCorrectFonts", "0", CVAR_ARCHIVE, "" );
+ r_maxpolys = ri.Cvar_Get( "r_maxpolys", XSTRING( DEFAULT_MAX_POLYS ), CVAR_NONE, "" );
+ r_maxpolyverts = ri.Cvar_Get( "r_maxpolyverts", XSTRING( DEFAULT_MAX_POLYVERTS ), CVAR_NONE, "" );
/*
Ghoul2 Insert Start
*/
#ifdef _DEBUG
- r_noPrecacheGLA = ri->Cvar_Get( "r_noPrecacheGLA", "0", CVAR_CHEAT, "" );
+ r_noPrecacheGLA = ri.Cvar_Get( "r_noPrecacheGLA", "0", CVAR_CHEAT, "" );
#endif
- r_noServerGhoul2 = ri->Cvar_Get( "r_noserverghoul2", "0", CVAR_CHEAT, "" );
- r_Ghoul2AnimSmooth = ri->Cvar_Get( "r_ghoul2animsmooth", "0.3", CVAR_NONE, "" );
- r_Ghoul2UnSqashAfterSmooth = ri->Cvar_Get( "r_ghoul2unsqashaftersmooth", "1", CVAR_NONE, "" );
- broadsword = ri->Cvar_Get( "broadsword", "0", CVAR_ARCHIVE_ND, "" );
- broadsword_kickbones = ri->Cvar_Get( "broadsword_kickbones", "1", CVAR_NONE, "" );
- broadsword_kickorigin = ri->Cvar_Get( "broadsword_kickorigin", "1", CVAR_NONE, "" );
- broadsword_dontstopanim = ri->Cvar_Get( "broadsword_dontstopanim", "0", CVAR_NONE, "" );
- broadsword_waitforshot = ri->Cvar_Get( "broadsword_waitforshot", "0", CVAR_NONE, "" );
- broadsword_playflop = ri->Cvar_Get( "broadsword_playflop", "1", CVAR_NONE, "" );
- broadsword_smallbbox = ri->Cvar_Get( "broadsword_smallbbox", "0", CVAR_NONE, "" );
- broadsword_extra1 = ri->Cvar_Get( "broadsword_extra1", "0", CVAR_NONE, "" );
- broadsword_extra2 = ri->Cvar_Get( "broadsword_extra2", "0", CVAR_NONE, "" );
- broadsword_effcorr = ri->Cvar_Get( "broadsword_effcorr", "1", CVAR_NONE, "" );
- broadsword_ragtobase = ri->Cvar_Get( "broadsword_ragtobase", "2", CVAR_NONE, "" );
- broadsword_dircap = ri->Cvar_Get( "broadsword_dircap", "64", CVAR_NONE, "" );
+ r_noServerGhoul2 = ri.Cvar_Get( "r_noserverghoul2", "0", CVAR_CHEAT, "" );
+ r_Ghoul2AnimSmooth = ri.Cvar_Get( "r_ghoul2animsmooth", "0.3", CVAR_NONE, "" );
+ r_Ghoul2UnSqashAfterSmooth = ri.Cvar_Get( "r_ghoul2unsqashaftersmooth", "1", CVAR_NONE, "" );
+ broadsword = ri.Cvar_Get( "broadsword", "0", CVAR_ARCHIVE_ND, "" );
+ broadsword_kickbones = ri.Cvar_Get( "broadsword_kickbones", "1", CVAR_NONE, "" );
+ broadsword_kickorigin = ri.Cvar_Get( "broadsword_kickorigin", "1", CVAR_NONE, "" );
+ broadsword_dontstopanim = ri.Cvar_Get( "broadsword_dontstopanim", "0", CVAR_NONE, "" );
+ broadsword_waitforshot = ri.Cvar_Get( "broadsword_waitforshot", "0", CVAR_NONE, "" );
+ broadsword_playflop = ri.Cvar_Get( "broadsword_playflop", "1", CVAR_NONE, "" );
+ broadsword_smallbbox = ri.Cvar_Get( "broadsword_smallbbox", "0", CVAR_NONE, "" );
+ broadsword_extra1 = ri.Cvar_Get( "broadsword_extra1", "0", CVAR_NONE, "" );
+ broadsword_extra2 = ri.Cvar_Get( "broadsword_extra2", "0", CVAR_NONE, "" );
+ broadsword_effcorr = ri.Cvar_Get( "broadsword_effcorr", "1", CVAR_NONE, "" );
+ broadsword_ragtobase = ri.Cvar_Get( "broadsword_ragtobase", "2", CVAR_NONE, "" );
+ broadsword_dircap = ri.Cvar_Get( "broadsword_dircap", "64", CVAR_NONE, "" );
/*
Ghoul2 Insert End
*/
- r_modelpoolmegs = ri->Cvar_Get("r_modelpoolmegs", "20", CVAR_ARCHIVE, "" );
- if (ri->Sys_LowPhysicalMemory() )
- ri->Cvar_Set("r_modelpoolmegs", "0");
+ r_modelpoolmegs = ri.Cvar_Get("r_modelpoolmegs", "20", CVAR_ARCHIVE, "" );
+ if (ri.Sys_LowPhysicalMemory() )
+ ri.Cvar_Set("r_modelpoolmegs", "0");
- r_aviMotionJpegQuality = ri->Cvar_Get( "r_aviMotionJpegQuality", "90", CVAR_ARCHIVE_ND, "" );
- r_screenshotJpegQuality = ri->Cvar_Get( "r_screenshotJpegQuality", "95", CVAR_ARCHIVE_ND, "" );
+ r_aviMotionJpegQuality = ri.Cvar_Get( "r_aviMotionJpegQuality", "90", CVAR_ARCHIVE_ND, "" );
+ r_screenshotJpegQuality = ri.Cvar_Get( "r_screenshotJpegQuality", "95", CVAR_ARCHIVE_ND, "" );
- ri->Cvar_CheckRange( r_aviMotionJpegQuality, 10, 100, qtrue );
- ri->Cvar_CheckRange( r_screenshotJpegQuality, 10, 100, qtrue );
+ ri.Cvar_CheckRange( r_aviMotionJpegQuality, 10, 100, qtrue );
+ ri.Cvar_CheckRange( r_screenshotJpegQuality, 10, 100, qtrue );
for ( size_t i = 0; i < numCommands; i++ )
- ri->Cmd_AddCommand( commands[i].cmd, commands[i].func, "" );
+ ri.Cmd_AddCommand( commands[i].cmd, commands[i].func, "" );
}
@@ -1706,7 +1706,7 @@ void R_Init( void ) {
int i;
byte *ptr;
-// ri->Printf( PRINT_ALL, "----- R_Init -----\n" );
+// ri.Printf( PRINT_ALL, "----- R_Init -----\n" );
// clear all our internal state
memset( &tr, 0, sizeof( tr ) );
memset( &backEnd, 0, sizeof( backEnd ) );
@@ -1716,7 +1716,7 @@ void R_Init( void ) {
#ifndef FINAL_BUILD
if ( (intptr_t)tess.xyz & 15 ) {
- ri->Printf( PRINT_ALL, "WARNING: tess.xyz not 16 byte aligned\n" );
+ ri.Printf( PRINT_ALL, "WARNING: tess.xyz not 16 byte aligned\n" );
}
#endif
//
@@ -1782,14 +1782,14 @@ void R_Init( void ) {
#if defined(_DEBUG)
int err = qglGetError();
if ( err != GL_NO_ERROR )
- ri->Printf( PRINT_ALL, "glGetError() = 0x%x\n", err);
+ ri.Printf( PRINT_ALL, "glGetError() = 0x%x\n", err);
#endif
RestoreGhoul2InfoArray();
// print info
GfxInfo_f();
-// ri->Printf( PRINT_ALL, "----- finished R_Init -----\n" );
+// ri.Printf( PRINT_ALL, "----- finished R_Init -----\n" );
}
/*
@@ -1799,10 +1799,10 @@ RE_Shutdown
*/
void RE_Shutdown( qboolean destroyWindow, qboolean restarting ) {
-// ri->Printf( PRINT_ALL, "RE_Shutdown( %i )\n", destroyWindow );
+// ri.Printf( PRINT_ALL, "RE_Shutdown( %i )\n", destroyWindow );
for ( size_t i = 0; i < numCommands; i++ )
- ri->Cmd_RemoveCommand( commands[i].cmd );
+ ri.Cmd_RemoveCommand( commands[i].cmd );
if ( r_DynamicGlow && r_DynamicGlow->integer )
{
@@ -1866,7 +1866,7 @@ void RE_Shutdown( qboolean destroyWindow, qboolean restarting ) {
// shut down platform specific OpenGL stuff
if ( destroyWindow ) {
- ri->WIN_Shutdown();
+ ri.WIN_Shutdown();
}
tr.registered = qfalse;
@@ -1881,7 +1881,7 @@ Touch all images to make sure they are resident
*/
void RE_EndRegistration( void ) {
R_IssuePendingRenderCommands();
- if (!ri->Sys_LowPhysicalMemory()) {
+ if (!ri.Sys_LowPhysicalMemory()) {
RB_ShowImages();
}
}
@@ -1954,12 +1954,12 @@ Q_EXPORT refexport_t* QDECL GetRefAPI( int apiVersion, refimport_t *rimp ) {
static refexport_t re;
assert( rimp );
- ri = rimp;
+ ri = *rimp;
memset( &re, 0, sizeof( re ) );
if ( apiVersion != REF_API_VERSION ) {
- ri->Printf( PRINT_ALL, "Mismatched REF_API_VERSION: expected %i, got %i\n", REF_API_VERSION, apiVersion );
+ ri.Printf( PRINT_ALL, "Mismatched REF_API_VERSION: expected %i, got %i\n", REF_API_VERSION, apiVersion );
return NULL;
}
diff --git a/codemp/rd-vanilla/tr_light.cpp b/codemp/rd-vanilla/tr_light.cpp
index 7b5f1cc..baa71e8 100644
--- a/codemp/rd-vanilla/tr_light.cpp
+++ b/codemp/rd-vanilla/tr_light.cpp
@@ -290,7 +290,7 @@ static void LogLight( trRefEntity_t *ent ) {
max2 = ent->directedLight[2];
}
- ri->Printf( PRINT_ALL, "amb:%i dir:%i\n", max1, max2 );
+ ri.Printf( PRINT_ALL, "amb:%i dir:%i\n", max1, max2 );
}
/*
diff --git a/codemp/rd-vanilla/tr_local.h b/codemp/rd-vanilla/tr_local.h
index da275d2..5c7930e 100644
--- a/codemp/rd-vanilla/tr_local.h
+++ b/codemp/rd-vanilla/tr_local.h
@@ -1870,6 +1870,4 @@ void R_AddDecals( void );
// tr_surfacesprites
void RB_DrawSurfaceSprites( shaderStage_t *stage, shaderCommands_t *input);
-extern refimport_t *ri;
-
qboolean ShaderHashTableExists(void);
diff --git a/codemp/rd-vanilla/tr_main.cpp b/codemp/rd-vanilla/tr_main.cpp
index 8de44f0..d649836 100644
--- a/codemp/rd-vanilla/tr_main.cpp
+++ b/codemp/rd-vanilla/tr_main.cpp
@@ -36,7 +36,7 @@ static float s_flipMatrix[16] = {
0, 0, 0, 1
};
-refimport_t *ri = NULL;
+refimport_t ri;
// entities that will have procedurally generated surfaces will just
// point at this for their sorting surface
@@ -773,7 +773,7 @@ qboolean R_GetPortalOrientations( drawSurf_t *drawSurf, int entityNum,
// to see a surface before the server has communicated the matching
// portal surface entity, so we don't want to print anything here...
- //ri->Printf( PRINT_ALL, "Portal surface without a portal entity\n" );
+ //ri.Printf( PRINT_ALL, "Portal surface without a portal entity\n" );
return qfalse;
}
@@ -950,7 +950,7 @@ qboolean R_MirrorViewBySurface (drawSurf_t *drawSurf, int entityNum) {
// don't recursively mirror
if (tr.viewParms.isPortal) {
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "WARNING: recursive mirror/portal found\n" );
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "WARNING: recursive mirror/portal found\n" );
return qfalse;
}
@@ -1374,7 +1374,7 @@ void R_DebugGraphics( void ) {
GL_Bind( tr.whiteImage);
GL_Cull( CT_FRONT_SIDED );
- ri->CM_DrawDebugSurface( R_DebugPolygon );
+ ri.CM_DrawDebugSurface( R_DebugPolygon );
}
diff --git a/codemp/rd-vanilla/tr_mesh.cpp b/codemp/rd-vanilla/tr_mesh.cpp
index f05b539..938a060 100644
--- a/codemp/rd-vanilla/tr_mesh.cpp
+++ b/codemp/rd-vanilla/tr_mesh.cpp
@@ -319,7 +319,7 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) {
|| (ent->e.frame < 0)
|| (ent->e.oldframe >= tr.currentModel->md3[0]->numFrames)
|| (ent->e.oldframe < 0) ) {
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "R_AddMD3Surfaces: no such frame %d to %d for '%s'\n",
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "R_AddMD3Surfaces: no such frame %d to %d for '%s'\n",
ent->e.oldframe, ent->e.frame,
tr.currentModel->name );
ent->e.frame = 0;
@@ -378,10 +378,10 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) {
}
}
if (shader == tr.defaultShader) {
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "WARNING: no shader for surface %s in skin %s\n", surface->name, skin->name);
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "WARNING: no shader for surface %s in skin %s\n", surface->name, skin->name);
}
else if (shader->defaultShader) {
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "WARNING: shader %s in skin %s not found\n", shader->name, skin->name);
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "WARNING: shader %s in skin %s not found\n", shader->name, skin->name);
}
} else if ( surface->numShaders <= 0 ) {
shader = tr.defaultShader;
diff --git a/codemp/rd-vanilla/tr_model.cpp b/codemp/rd-vanilla/tr_model.cpp
index fe8218b..171be42 100644
--- a/codemp/rd-vanilla/tr_model.cpp
+++ b/codemp/rd-vanilla/tr_model.cpp
@@ -166,13 +166,13 @@ qboolean RE_RegisterModels_GetDiskFile( const char *psModelFileName, void **ppvB
return qtrue;
}
- ri->FS_ReadFile( sModelName, ppvBuffer );
+ ri.FS_ReadFile( sModelName, ppvBuffer );
*pqbAlreadyCached = qfalse;
qboolean bSuccess = !!(*ppvBuffer)?qtrue:qfalse;
if (bSuccess)
{
- ri->Printf( PRINT_DEVELOPER, "RE_RegisterModels_GetDiskFile(): Disk-loading \"%s\"\n",psModelFileName);
+ ri.Printf( PRINT_DEVELOPER, "RE_RegisterModels_GetDiskFile(): Disk-loading \"%s\"\n",psModelFileName);
}
return bSuccess;
@@ -223,7 +223,7 @@ void *RE_RegisterModels_Malloc(int iSize, void *pvDiskBufferIfJustLoaded, const
ModelBin.iAllocSize = iSize;
int iCheckSum;
- if (ri->FS_FileIsInPAK(sModelName, &iCheckSum) == 1)
+ if (ri.FS_FileIsInPAK(sModelName, &iCheckSum) == 1)
{
ModelBin.iPAKFileCheckSum = iCheckSum; // else ModelBin's constructor will leave it as -1
}
@@ -293,7 +293,7 @@ void *RE_RegisterServerModels_Malloc(int iSize, void *pvDiskBufferIfJustLoaded,
ModelBin.iAllocSize = iSize;
int iCheckSum;
- if (ri->FS_FileIsInPAK(sModelName, &iCheckSum) == 1)
+ if (ri.FS_FileIsInPAK(sModelName, &iCheckSum) == 1)
{
ModelBin.iPAKFileCheckSum = iCheckSum; // else ModelBin's constructor will leave it as -1
}
@@ -352,11 +352,11 @@ qboolean RE_RegisterModels_LevelLoadEnd(qboolean bDeleteEverythingNotUsedThisLev
assert(CachedModels);
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "RE_RegisterModels_LevelLoadEnd():\n");
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "RE_RegisterModels_LevelLoadEnd():\n");
if (gbInsideRegisterModel)
{
- ri->Printf( PRINT_DEVELOPER, "(Inside RE_RegisterModel (z_malloc recovery?), exiting...\n");
+ ri.Printf( PRINT_DEVELOPER, "(Inside RE_RegisterModel (z_malloc recovery?), exiting...\n");
}
else
{
@@ -383,10 +383,10 @@ qboolean RE_RegisterModels_LevelLoadEnd(qboolean bDeleteEverythingNotUsedThisLev
if (bDeleteThis)
{
const char *psModelName = (*itModel).first.c_str();
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "Dumping \"%s\"", psModelName);
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "Dumping \"%s\"", psModelName);
#ifdef _DEBUG
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED ", used on lvl %d\n",CachedModel.iLastLevelUsedOn);
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED ", used on lvl %d\n",CachedModel.iLastLevelUsedOn);
#endif
if (CachedModel.pModelDiskImage) {
@@ -405,7 +405,7 @@ qboolean RE_RegisterModels_LevelLoadEnd(qboolean bDeleteEverythingNotUsedThisLev
}
}
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "RE_RegisterModels_LevelLoadEnd(): Ok\n");
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "RE_RegisterModels_LevelLoadEnd(): Ok\n");
return bAtLeastoneModelFreed;
}
@@ -419,7 +419,7 @@ qboolean RE_RegisterModels_LevelLoadEnd(qboolean bDeleteEverythingNotUsedThisLev
//
static void RE_RegisterModels_DumpNonPure(void)
{
- ri->Printf( PRINT_DEVELOPER, "RE_RegisterModels_DumpNonPure():\n");
+ ri.Printf( PRINT_DEVELOPER, "RE_RegisterModels_DumpNonPure():\n");
if(!CachedModels) {
return;
@@ -433,7 +433,7 @@ static void RE_RegisterModels_DumpNonPure(void)
CachedEndianedModelBinary_t &CachedModel = (*itModel).second;
int iCheckSum = -1;
- int iInPak = ri->FS_FileIsInPAK(psModelName, &iCheckSum);
+ int iInPak = ri.FS_FileIsInPAK(psModelName, &iCheckSum);
if (iInPak == -1 || iCheckSum != CachedModel.iPAKFileCheckSum)
{
@@ -441,7 +441,7 @@ static void RE_RegisterModels_DumpNonPure(void)
{
// either this is not from a PAK, or it's from a non-pure one, so ditch it...
//
- ri->Printf( PRINT_DEVELOPER, "Dumping none pure model \"%s\"", psModelName);
+ ri.Printf( PRINT_DEVELOPER, "Dumping none pure model \"%s\"", psModelName);
if (CachedModel.pModelDiskImage) {
Z_Free(CachedModel.pModelDiskImage);
@@ -458,14 +458,14 @@ static void RE_RegisterModels_DumpNonPure(void)
}
}
- ri->Printf( PRINT_DEVELOPER, "RE_RegisterModels_DumpNonPure(): Ok\n");
+ ri.Printf( PRINT_DEVELOPER, "RE_RegisterModels_DumpNonPure(): Ok\n");
}
void RE_RegisterModels_Info_f( void )
{
int iTotalBytes = 0;
if(!CachedModels) {
- ri->Printf( PRINT_ALL, "%d bytes total (%.2fMB)\n",iTotalBytes, (float)iTotalBytes / 1024.0f / 1024.0f);
+ ri.Printf( PRINT_ALL, "%d bytes total (%.2fMB)\n",iTotalBytes, (float)iTotalBytes / 1024.0f / 1024.0f);
return;
}
@@ -476,15 +476,15 @@ void RE_RegisterModels_Info_f( void )
{
CachedEndianedModelBinary_t &CachedModel = (*itModel).second;
- ri->Printf( PRINT_ALL, "%d/%d: \"%s\" (%d bytes)",iModel,iModels,(*itModel).first.c_str(),CachedModel.iAllocSize );
+ ri.Printf( PRINT_ALL, "%d/%d: \"%s\" (%d bytes)",iModel,iModels,(*itModel).first.c_str(),CachedModel.iAllocSize );
#ifdef _DEBUG
- ri->Printf( PRINT_ALL, ", lvl %d\n",CachedModel.iLastLevelUsedOn);
+ ri.Printf( PRINT_ALL, ", lvl %d\n",CachedModel.iLastLevelUsedOn);
#endif
iTotalBytes += CachedModel.iAllocSize;
}
- ri->Printf( PRINT_ALL, "%d bytes total (%.2fMB)\n",iTotalBytes, (float)iTotalBytes / 1024.0f / 1024.0f);
+ ri.Printf( PRINT_ALL, "%d bytes total (%.2fMB)\n",iTotalBytes, (float)iTotalBytes / 1024.0f / 1024.0f);
}
@@ -525,7 +525,7 @@ void RE_RegisterMedia_LevelLoadBegin(const char *psMapName, ForceReload_e eForce
}
else
{
- if ( ri->Cvar_VariableIntegerValue( "sv_pure" ) )
+ if ( ri.Cvar_VariableIntegerValue( "sv_pure" ) )
{
RE_RegisterModels_DumpNonPure();
}
@@ -568,9 +568,9 @@ void RE_RegisterMedia_LevelLoadEnd(void)
RE_RegisterModels_LevelLoadEnd(qfalse);
RE_RegisterImages_LevelLoadEnd();
- ri->SND_RegisterAudio_LevelLoadEnd(qfalse);
+ ri.SND_RegisterAudio_LevelLoadEnd(qfalse);
// RE_InitDissolve();
- ri->S_RestartMusic();
+ ri.S_RestartMusic();
}
@@ -713,7 +713,7 @@ qboolean ServerLoadMDXA( model_t *mod, void *buffer, const char *mod_name, qbool
if (!bAlreadyFound)
{
// horrible new hackery, if !bAlreadyFound then we've just done a tag-morph, so we need to set the
- // bool reference passed into this function to true, to tell the caller NOT to do an ri->FS_Freefile since
+ // bool reference passed into this function to true, to tell the caller NOT to do an ri.FS_Freefile since
// we've hijacked that memory block...
//
// Aaaargh. Kill me now...
@@ -852,7 +852,7 @@ qboolean ServerLoadMDXM( model_t *mod, void *buffer, const char *mod_name, qbool
if (!bAlreadyFound)
{
// horrible new hackery, if !bAlreadyFound then we've just done a tag-morph, so we need to set the
- // bool reference passed into this function to true, to tell the caller NOT to do an ri->FS_Freefile since
+ // bool reference passed into this function to true, to tell the caller NOT to do an ri.FS_Freefile since
// we've hijacked that memory block...
//
// Aaaargh. Kill me now...
@@ -1034,7 +1034,7 @@ Ghoul2 Insert End
if (!r_noServerGhoul2)
{ //keep it from choking when it gets to these checks in the g2 code. Registering all r_ cvars for the server would be a Bad Thing though.
- r_noServerGhoul2 = ri->Cvar_Get( "r_noserverghoul2", "0", 0, "");
+ r_noServerGhoul2 = ri.Cvar_Get( "r_noserverghoul2", "0", 0, "");
}
if ( !name || !name[0] ) {
@@ -1124,7 +1124,7 @@ Ghoul2 Insert End
}
if (!bAlreadyCached){ // important to check!!
- ri->FS_FreeFile (buf);
+ ri.FS_FreeFile (buf);
}
if ( !loaded ) {
@@ -1197,12 +1197,12 @@ Ghoul2 Insert End
*/
if ( !name || !name[0] ) {
- ri->Printf( PRINT_ALL, "RE_RegisterModel: NULL name\n" );
+ ri.Printf( PRINT_ALL, "RE_RegisterModel: NULL name\n" );
return 0;
}
if ( strlen( name ) >= MAX_QPATH ) {
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "Model name exceeds MAX_QPATH\n" );
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "Model name exceeds MAX_QPATH\n" );
return 0;
}
@@ -1210,7 +1210,7 @@ Ghoul2 Insert End
Ghoul2 Insert Start
*/
// if (!tr.registered) {
-// ri->Printf( PRINT_ALL, S_COLOR_YELLOW "RE_RegisterModel (%s) called before ready!\n",name );
+// ri.Printf( PRINT_ALL, S_COLOR_YELLOW "RE_RegisterModel (%s) called before ready!\n",name );
// return 0;
// }
//
@@ -1271,7 +1271,7 @@ Ghoul2 Insert End
// allocate a new model_t
if ( ( mod = R_AllocModel() ) == NULL ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "RE_RegisterModel: R_AllocModel() failed for '%s'\n", name);
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "RE_RegisterModel: R_AllocModel() failed for '%s'\n", name);
return 0;
}
@@ -1343,12 +1343,12 @@ Ghoul2 Insert End
break;
default:
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW"RE_RegisterModel: unknown fileid for %s\n", filename);
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW"RE_RegisterModel: unknown fileid for %s\n", filename);
goto fail;
}
if (!bAlreadyCached){ // important to check!!
- ri->FS_FreeFile (buf);
+ ri.FS_FreeFile (buf);
}
if ( !loaded ) {
@@ -1396,7 +1396,7 @@ Ghoul2 Insert End
}
#ifdef _DEBUG
else {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW"RE_RegisterModel: couldn't load %s\n", name);
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW"RE_RegisterModel: couldn't load %s\n", name);
}
#endif
@@ -1463,7 +1463,7 @@ static qboolean R_LoadMD3 (model_t *mod, int lod, void *buffer, const char *mod_
}
if (version != MD3_VERSION) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "R_LoadMD3: %s has wrong version (%i should be %i)\n",
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "R_LoadMD3: %s has wrong version (%i should be %i)\n",
mod_name, version, MD3_VERSION);
return qfalse;
}
@@ -1480,7 +1480,7 @@ static qboolean R_LoadMD3 (model_t *mod, int lod, void *buffer, const char *mod_
if (!bAlreadyFound)
{
// horrible new hackery, if !bAlreadyFound then we've just done a tag-morph, so we need to set the
- // bool reference passed into this function to true, to tell the caller NOT to do an ri->FS_Freefile since
+ // bool reference passed into this function to true, to tell the caller NOT to do an ri.FS_Freefile since
// we've hijacked that memory block...
//
// Aaaargh. Kill me now...
@@ -1501,7 +1501,7 @@ static qboolean R_LoadMD3 (model_t *mod, int lod, void *buffer, const char *mod_
}
if ( mod->md3[lod]->numFrames < 1 ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "R_LoadMD3: %s has no frames\n", mod_name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "R_LoadMD3: %s has no frames\n", mod_name );
return qfalse;
}
@@ -1717,14 +1717,14 @@ void R_Modellist_f( void ) {
lods++;
}
}
- ri->Printf( PRINT_ALL, "%8i : (%i) %s\n",mod->dataSize, lods, mod->name );
+ ri.Printf( PRINT_ALL, "%8i : (%i) %s\n",mod->dataSize, lods, mod->name );
total += mod->dataSize;
}
- ri->Printf( PRINT_ALL, "%8i : Total models\n", total );
+ ri.Printf( PRINT_ALL, "%8i : Total models\n", total );
#if 0 // not working right with new hunk
if ( tr.world ) {
- ri->Printf( PRINT_ALL, "\n%8i : %s\n", tr.world->dataSize, tr.world->name );
+ ri.Printf( PRINT_ALL, "\n%8i : %s\n", tr.world->dataSize, tr.world->name );
}
#endif
}
diff --git a/codemp/rd-vanilla/tr_scene.cpp b/codemp/rd-vanilla/tr_scene.cpp
index d54163d..9c00254 100644
--- a/codemp/rd-vanilla/tr_scene.cpp
+++ b/codemp/rd-vanilla/tr_scene.cpp
@@ -135,7 +135,7 @@ void RE_AddPolyToScene( qhandle_t hShader, int numVerts, const polyVert_t *verts
}
if ( !hShader ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: RE_AddPolyToScene: NULL poly shader\n");
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: RE_AddPolyToScene: NULL poly shader\n");
return;
}
@@ -147,7 +147,7 @@ void RE_AddPolyToScene( qhandle_t hShader, int numVerts, const polyVert_t *verts
since we don't plan on changing the const and making for room for those effects
simply cut this message to developer only
*/
- ri->Printf( PRINT_DEVELOPER, S_COLOR_YELLOW "WARNING: RE_AddPolyToScene: r_max_polys or r_max_polyverts reached\n");
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_YELLOW "WARNING: RE_AddPolyToScene: r_max_polys or r_max_polyverts reached\n");
return;
}
@@ -212,7 +212,7 @@ void RE_AddRefEntityToScene( const refEntity_t *ent ) {
}
if ( r_numentities >= MAX_REFENTITIES ) {
- ri->Printf(PRINT_DEVELOPER, "RE_AddRefEntityToScene: Dropping refEntity, reached MAX_REFENTITIES\n");
+ ri.Printf(PRINT_DEVELOPER, "RE_AddRefEntityToScene: Dropping refEntity, reached MAX_REFENTITIES\n");
return;
}
@@ -220,7 +220,7 @@ void RE_AddRefEntityToScene( const refEntity_t *ent ) {
static qboolean firstTime = qtrue;
if (firstTime) {
firstTime = qfalse;
- ri->Printf( PRINT_WARNING, "RE_AddRefEntityToScene passed a refEntity which has an origin with a NaN component\n");
+ ri.Printf( PRINT_WARNING, "RE_AddRefEntityToScene passed a refEntity which has an origin with a NaN component\n");
}
return;
}*/
@@ -252,7 +252,7 @@ void RE_AddRefEntityToScene( const refEntity_t *ent ) {
if (!ghoul2[0].mModel)
{
- ri->Printf( PRINT_ALL, "Your ghoul2 instance has no model!\n");
+ ri.Printf( PRINT_ALL, "Your ghoul2 instance has no model!\n");
}
}
@@ -408,7 +408,7 @@ void RE_RenderScene( const refdef_t *fd ) {
return;
}
- startTime = ri->Milliseconds()*ri->Cvar_VariableValue( "timescale" );
+ startTime = ri.Milliseconds()*ri.Cvar_VariableValue( "timescale" );
if (!tr.world && !( fd->rdflags & RDF_NOWORLDMODEL ) ) {
Com_Error (ERR_DROP, "R_RenderScene: NULL worldmodel");
@@ -555,7 +555,7 @@ void RE_RenderScene( const refdef_t *fd ) {
refEntParent = -1;
- tr.frontEndMsec += ri->Milliseconds()*ri->Cvar_VariableValue( "timescale" ) - startTime;
+ tr.frontEndMsec += ri.Milliseconds()*ri.Cvar_VariableValue( "timescale" ) - startTime;
RE_RenderWorldEffects();
diff --git a/codemp/rd-vanilla/tr_shade.cpp b/codemp/rd-vanilla/tr_shade.cpp
index 50c90cd..1172804 100644
--- a/codemp/rd-vanilla/tr_shade.cpp
+++ b/codemp/rd-vanilla/tr_shade.cpp
@@ -229,8 +229,8 @@ void R_BindAnimatedImage( textureBundle_t *bundle ) {
int index;
if ( bundle->isVideoMap ) {
- ri->CIN_RunCinematic(bundle->videoMapHandle);
- ri->CIN_UploadCinematic(bundle->videoMapHandle);
+ ri.CIN_RunCinematic(bundle->videoMapHandle);
+ ri.CIN_UploadCinematic(bundle->videoMapHandle);
return;
}
diff --git a/codemp/rd-vanilla/tr_shade_calc.cpp b/codemp/rd-vanilla/tr_shade_calc.cpp
index feedcc3..254bddd 100644
--- a/codemp/rd-vanilla/tr_shade_calc.cpp
+++ b/codemp/rd-vanilla/tr_shade_calc.cpp
@@ -409,10 +409,10 @@ static void AutospriteDeform( void ) {
vec3_t leftDir, upDir;
if ( tess.numVertexes & 3 ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "Autosprite shader %s had odd vertex count", tess.shader->name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "Autosprite shader %s had odd vertex count", tess.shader->name );
}
if ( tess.numIndexes != ( tess.numVertexes >> 2 ) * 6 ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "Autosprite shader %s had odd index count", tess.shader->name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "Autosprite shader %s had odd index count", tess.shader->name );
}
oldVerts = tess.numVertexes;
@@ -486,10 +486,10 @@ static void Autosprite2Deform( void ) {
vec3_t forward;
if ( tess.numVertexes & 3 ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "Autosprite2 shader %s had odd vertex count", tess.shader->name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "Autosprite2 shader %s had odd vertex count", tess.shader->name );
}
if ( tess.numIndexes != ( tess.numVertexes >> 2 ) * 6 ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "Autosprite2 shader %s had odd index count", tess.shader->name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "Autosprite2 shader %s had odd index count", tess.shader->name );
}
if ( backEnd.currentEntity != &tr.worldEntity ) {
diff --git a/codemp/rd-vanilla/tr_shader.cpp b/codemp/rd-vanilla/tr_shader.cpp
index 6f44ae1..5fdc4ea 100644
--- a/codemp/rd-vanilla/tr_shader.cpp
+++ b/codemp/rd-vanilla/tr_shader.cpp
@@ -166,7 +166,7 @@ void R_RemapShader(const char *shaderName, const char *newShaderName, const char
sh = R_GetShaderByHandle(h);
}
if (sh == NULL || sh == tr.defaultShader) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: R_RemapShader: shader %s not found\n", shaderName );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: R_RemapShader: shader %s not found\n", shaderName );
return;
}
@@ -177,7 +177,7 @@ void R_RemapShader(const char *shaderName, const char *newShaderName, const char
}
if (sh2 == NULL || sh2 == tr.defaultShader) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: R_RemapShader: new shader %s not found\n", newShaderName );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: R_RemapShader: new shader %s not found\n", newShaderName );
return;
}
@@ -211,14 +211,14 @@ qboolean ParseVector( const char **text, int count, float *v ) {
// FIXME: spaces are currently required after parens, should change parseext...
token = COM_ParseExt( text, qfalse );
if ( strcmp( token, "(" ) ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parenthesis in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parenthesis in shader '%s'\n", shader.name );
return qfalse;
}
for ( i = 0 ; i < count ; i++ ) {
token = COM_ParseExt( text, qfalse );
if ( !token[0] ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing vector element in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing vector element in shader '%s'\n", shader.name );
return qfalse;
}
v[i] = atof( token );
@@ -226,7 +226,7 @@ qboolean ParseVector( const char **text, int count, float *v ) {
token = COM_ParseExt( text, qfalse );
if ( strcmp( token, ")" ) ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parenthesis in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parenthesis in shader '%s'\n", shader.name );
return qfalse;
}
@@ -258,7 +258,7 @@ static unsigned NameToAFunc( const char *funcname )
return GLS_ATEST_GE_C0;
}
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid alphaFunc name '%s' in shader '%s'\n", funcname, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid alphaFunc name '%s' in shader '%s'\n", funcname, shader.name );
return 0;
}
@@ -307,7 +307,7 @@ static int NameToSrcBlendMode( const char *name )
return GLS_SRCBLEND_ALPHA_SATURATE;
}
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown blend mode '%s' in shader '%s', substituting GL_ONE\n", name, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown blend mode '%s' in shader '%s', substituting GL_ONE\n", name, shader.name );
return GLS_SRCBLEND_ONE;
}
@@ -351,7 +351,7 @@ static int NameToDstBlendMode( const char *name )
return GLS_DSTBLEND_ONE_MINUS_SRC_COLOR;
}
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown blend mode '%s' in shader '%s', substituting GL_ONE\n", name, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown blend mode '%s' in shader '%s', substituting GL_ONE\n", name, shader.name );
return GLS_DSTBLEND_ONE;
}
@@ -391,7 +391,7 @@ static genFunc_t NameToGenFunc( const char *funcname )
return GF_RAND;
}
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid genfunc name '%s' in shader '%s'\n", funcname, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid genfunc name '%s' in shader '%s'\n", funcname, shader.name );
return GF_SIN;
}
@@ -408,7 +408,7 @@ static void ParseWaveForm( const char **text, waveForm_t *wave )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing waveform parm in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing waveform parm in shader '%s'\n", shader.name );
return;
}
wave->func = NameToGenFunc( token );
@@ -417,7 +417,7 @@ static void ParseWaveForm( const char **text, waveForm_t *wave )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing waveform parm in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing waveform parm in shader '%s'\n", shader.name );
return;
}
wave->base = atof( token );
@@ -425,7 +425,7 @@ static void ParseWaveForm( const char **text, waveForm_t *wave )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing waveform parm in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing waveform parm in shader '%s'\n", shader.name );
return;
}
wave->amplitude = atof( token );
@@ -433,7 +433,7 @@ static void ParseWaveForm( const char **text, waveForm_t *wave )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing waveform parm in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing waveform parm in shader '%s'\n", shader.name );
return;
}
wave->phase = atof( token );
@@ -441,7 +441,7 @@ static void ParseWaveForm( const char **text, waveForm_t *wave )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing waveform parm in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing waveform parm in shader '%s'\n", shader.name );
return;
}
wave->frequency = atof( token );
@@ -477,28 +477,28 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing tcMod turb parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing tcMod turb parms in shader '%s'\n", shader.name );
return;
}
tmi->wave.base = atof( token );
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing tcMod turb in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing tcMod turb in shader '%s'\n", shader.name );
return;
}
tmi->wave.amplitude = atof( token );
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing tcMod turb in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing tcMod turb in shader '%s'\n", shader.name );
return;
}
tmi->wave.phase = atof( token );
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing tcMod turb in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing tcMod turb in shader '%s'\n", shader.name );
return;
}
tmi->wave.frequency = atof( token );
@@ -513,7 +513,7 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing scale parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing scale parms in shader '%s'\n", shader.name );
return;
}
tmi->translate[0] = atof( token ); //scale unioned
@@ -521,7 +521,7 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing scale parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing scale parms in shader '%s'\n", shader.name );
return;
}
tmi->translate[1] = atof( token ); //scale unioned
@@ -535,14 +535,14 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing scale scroll parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing scale scroll parms in shader '%s'\n", shader.name );
return;
}
tmi->translate[0] = atof( token ); //scroll unioned
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing scale scroll parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing scale scroll parms in shader '%s'\n", shader.name );
return;
}
tmi->translate[1] = atof( token ); //scroll unioned
@@ -556,7 +556,7 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing stretch parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing stretch parms in shader '%s'\n", shader.name );
return;
}
tmi->wave.func = NameToGenFunc( token );
@@ -564,7 +564,7 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing stretch parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing stretch parms in shader '%s'\n", shader.name );
return;
}
tmi->wave.base = atof( token );
@@ -572,7 +572,7 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing stretch parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing stretch parms in shader '%s'\n", shader.name );
return;
}
tmi->wave.amplitude = atof( token );
@@ -580,7 +580,7 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing stretch parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing stretch parms in shader '%s'\n", shader.name );
return;
}
tmi->wave.phase = atof( token );
@@ -588,7 +588,7 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing stretch parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing stretch parms in shader '%s'\n", shader.name );
return;
}
tmi->wave.frequency = atof( token );
@@ -603,7 +603,7 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing transform parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing transform parms in shader '%s'\n", shader.name );
return;
}
tmi->matrix[0][0] = atof( token );
@@ -611,7 +611,7 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing transform parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing transform parms in shader '%s'\n", shader.name );
return;
}
tmi->matrix[0][1] = atof( token );
@@ -619,7 +619,7 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing transform parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing transform parms in shader '%s'\n", shader.name );
return;
}
tmi->matrix[1][0] = atof( token );
@@ -627,7 +627,7 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing transform parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing transform parms in shader '%s'\n", shader.name );
return;
}
tmi->matrix[1][1] = atof( token );
@@ -635,7 +635,7 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing transform parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing transform parms in shader '%s'\n", shader.name );
return;
}
tmi->translate[0] = atof( token );
@@ -643,7 +643,7 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing transform parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing transform parms in shader '%s'\n", shader.name );
return;
}
tmi->translate[1] = atof( token );
@@ -658,7 +658,7 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing tcMod rotate parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing tcMod rotate parms in shader '%s'\n", shader.name );
return;
}
tmi->translate[0]= atof( token ); //rotateSpeed unioned
@@ -673,7 +673,7 @@ static void ParseTexMod( const char *_text, shaderStage_t *stage )
}
else
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown tcMod '%s' in shader '%s'\n", token, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown tcMod '%s' in shader '%s'\n", token, shader.name );
}
}
@@ -703,7 +703,7 @@ static void ParseSurfaceSprites( const char *_text, shaderStage_t *stage )
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfaceSprites params in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfaceSprites params in shader '%s'\n", shader.name );
return;
}
@@ -725,7 +725,7 @@ static void ParseSurfaceSprites( const char *_text, shaderStage_t *stage )
}
else
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid type in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid type in shader '%s'\n", shader.name );
return;
}
@@ -735,13 +735,13 @@ static void ParseSurfaceSprites( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfaceSprites params in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfaceSprites params in shader '%s'\n", shader.name );
return;
}
width=atof(token);
if (width <= 0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid width in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid width in shader '%s'\n", shader.name );
return;
}
@@ -751,13 +751,13 @@ static void ParseSurfaceSprites( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfaceSprites params in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfaceSprites params in shader '%s'\n", shader.name );
return;
}
height=atof(token);
if (height <= 0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid height in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid height in shader '%s'\n", shader.name );
return;
}
@@ -767,13 +767,13 @@ static void ParseSurfaceSprites( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfaceSprites params in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfaceSprites params in shader '%s'\n", shader.name );
return;
}
density=atof(token);
if (density <= 0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid density in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid density in shader '%s'\n", shader.name );
return;
}
@@ -783,13 +783,13 @@ static void ParseSurfaceSprites( const char *_text, shaderStage_t *stage )
token = COM_ParseExt( text, qfalse );
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfaceSprites params in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfaceSprites params in shader '%s'\n", shader.name );
return;
}
fadedist=atof(token);
if (fadedist < 32)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid fadedist (%f < 32) in shader '%s'\n", fadedist, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid fadedist (%f < 32) in shader '%s'\n", fadedist, shader.name );
return;
}
@@ -869,13 +869,13 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
token = COM_ParseExt( text, qfalse);
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite fademax in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite fademax in shader '%s'\n", shader.name );
return;
}
value = atof(token);
if (value <= stage->ss->fadeDist)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite fademax (%.2f <= fadeDist(%.2f)) in shader '%s'\n", value, stage->ss->fadeDist, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite fademax (%.2f <= fadeDist(%.2f)) in shader '%s'\n", value, stage->ss->fadeDist, shader.name );
return;
}
stage->ss->fadeMax=value;
@@ -890,7 +890,7 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
token = COM_ParseExt( text, qfalse);
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite fadescale in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite fadescale in shader '%s'\n", shader.name );
return;
}
value = atof(token);
@@ -906,13 +906,13 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
token = COM_ParseExt( text, qfalse);
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite variance width in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite variance width in shader '%s'\n", shader.name );
return;
}
value = atof(token);
if (value < 0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite variance width in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite variance width in shader '%s'\n", shader.name );
return;
}
stage->ss->variance[0]=value;
@@ -920,13 +920,13 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
token = COM_ParseExt( text, qfalse);
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite variance height in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite variance height in shader '%s'\n", shader.name );
return;
}
value = atof(token);
if (value < 0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite variance height in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite variance height in shader '%s'\n", shader.name );
return;
}
stage->ss->variance[1]=value;
@@ -940,7 +940,7 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
{
if (stage->ss->facing != SURFSPRITE_FACING_NORMAL)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: Hangdown facing overrides previous facing in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: Hangdown facing overrides previous facing in shader '%s'\n", shader.name );
return;
}
stage->ss->facing=SURFSPRITE_FACING_DOWN;
@@ -954,7 +954,7 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
{
if (stage->ss->facing != SURFSPRITE_FACING_NORMAL)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: Anyangle facing overrides previous facing in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: Anyangle facing overrides previous facing in shader '%s'\n", shader.name );
return;
}
stage->ss->facing=SURFSPRITE_FACING_ANY;
@@ -968,7 +968,7 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
{
if (stage->ss->facing != SURFSPRITE_FACING_NORMAL)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: Faceup facing overrides previous facing in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: Faceup facing overrides previous facing in shader '%s'\n", shader.name );
return;
}
stage->ss->facing=SURFSPRITE_FACING_UP;
@@ -983,13 +983,13 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
token = COM_ParseExt( text, qfalse);
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite wind in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite wind in shader '%s'\n", shader.name );
return;
}
value = atof(token);
if (value < 0.0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite wind in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite wind in shader '%s'\n", shader.name );
return;
}
stage->ss->wind=value;
@@ -1008,13 +1008,13 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
token = COM_ParseExt( text, qfalse);
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite windidle in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite windidle in shader '%s'\n", shader.name );
return;
}
value = atof(token);
if (value < 0.0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite windidle in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite windidle in shader '%s'\n", shader.name );
return;
}
stage->ss->windIdle=value;
@@ -1029,13 +1029,13 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
token = COM_ParseExt( text, qfalse);
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite vertskew in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite vertskew in shader '%s'\n", shader.name );
return;
}
value = atof(token);
if (value < 0.0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite vertskew in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite vertskew in shader '%s'\n", shader.name );
return;
}
stage->ss->vertSkew=value;
@@ -1050,13 +1050,13 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
token = COM_ParseExt( text, qfalse);
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite duration in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite duration in shader '%s'\n", shader.name );
return;
}
value = atof(token);
if (value <= 0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite duration in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite duration in shader '%s'\n", shader.name );
return;
}
stage->ss->fxDuration=value;
@@ -1071,13 +1071,13 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
token = COM_ParseExt( text, qfalse);
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite grow width in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite grow width in shader '%s'\n", shader.name );
return;
}
value = atof(token);
if (value < 0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite grow width in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite grow width in shader '%s'\n", shader.name );
return;
}
stage->ss->fxGrow[0]=value;
@@ -1085,13 +1085,13 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
token = COM_ParseExt( text, qfalse);
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite grow height in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite grow height in shader '%s'\n", shader.name );
return;
}
value = atof(token);
if (value < 0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite grow height in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite grow height in shader '%s'\n", shader.name );
return;
}
stage->ss->fxGrow[1]=value;
@@ -1106,13 +1106,13 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
token = COM_ParseExt( text, qfalse);
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite fxalpha start in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite fxalpha start in shader '%s'\n", shader.name );
return;
}
value = atof(token);
if (value < 0 || value > 1.0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite fxalpha start in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite fxalpha start in shader '%s'\n", shader.name );
return;
}
stage->ss->fxAlphaStart=value;
@@ -1120,13 +1120,13 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
token = COM_ParseExt( text, qfalse);
if (token[0]==0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite fxalpha end in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing surfacesprite fxalpha end in shader '%s'\n", shader.name );
return;
}
value = atof(token);
if (value < 0 || value > 1.0)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite fxalpha end in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid surfacesprite fxalpha end in shader '%s'\n", shader.name );
return;
}
stage->ss->fxAlphaEnd=value;
@@ -1140,7 +1140,7 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
{
if (stage->ss->surfaceSpriteType != SURFSPRITE_EFFECT)
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: weather applied to non-effect surfacesprite in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: weather applied to non-effect surfacesprite in shader '%s'\n", shader.name );
return;
}
stage->ss->surfaceSpriteType = SURFSPRITE_WEATHERFX;
@@ -1150,7 +1150,7 @@ static void ParseSurfaceSpritesOptional( const char *param, const char *_text, s
//
// invalid ss command.
//
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid optional surfacesprite param '%s' in shader '%s'\n", param, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid optional surfacesprite param '%s' in shader '%s'\n", param, shader.name );
return;
}
@@ -1173,7 +1173,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
token = COM_ParseExt( text, qtrue );
if ( !token[0] )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: no matching '}' found\n" );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: no matching '}' found\n" );
return qfalse;
}
@@ -1189,7 +1189,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
token = COM_ParseExt( text, qfalse );
if ( !token[0] )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parameter for 'map' keyword in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parameter for 'map' keyword in shader '%s'\n", shader.name );
return qfalse;
}
@@ -1204,7 +1204,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
if ( shader.lightmapIndex[0] < 0 || shader.lightmapIndex[0] >= tr.numLightmaps )
{
#ifndef FINAL_BUILD
- ri->Printf( PRINT_ALL, S_COLOR_RED"Lightmap requested but none available for shader %s\n", shader.name);
+ ri.Printf( PRINT_ALL, S_COLOR_RED"Lightmap requested but none available for shader %s\n", shader.name);
#endif
stage->bundle[0].image = tr.whiteImage;
}
@@ -1219,7 +1219,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
stage->bundle[0].image = R_FindImageFile( token, (qboolean)!shader.noMipMaps, (qboolean)!shader.noPicMip, (qboolean)!shader.noTC, GL_REPEAT );
if ( !stage->bundle[0].image )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
return qfalse;
}
}
@@ -1232,13 +1232,13 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
token = COM_ParseExt( text, qfalse );
if ( !token[0] )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parameter for 'clampmap' keyword in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parameter for 'clampmap' keyword in shader '%s'\n", shader.name );
return qfalse;
}
stage->bundle[0].image = R_FindImageFile( token, (qboolean)!shader.noMipMaps, (qboolean)!shader.noPicMip, (qboolean)!shader.noTC, GL_CLAMP );
if ( !stage->bundle[0].image )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
return qfalse;
}
}
@@ -1255,7 +1255,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
token = COM_ParseExt( text, qfalse );
if ( !token[0] )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parameter for '%s' keyword in shader '%s'\n", (bClamp ? "animMap":"clampanimMap"), shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parameter for '%s' keyword in shader '%s'\n", (bClamp ? "animMap":"clampanimMap"), shader.name );
return qfalse;
}
stage->bundle[0].imageAnimationSpeed = atof( token );
@@ -1274,7 +1274,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
images[num] = R_FindImageFile( token, (qboolean)!shader.noMipMaps, (qboolean)!shader.noPicMip, (qboolean)!shader.noTC, bClamp?GL_CLAMP:GL_REPEAT );
if ( !images[num] )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
return qfalse;
}
stage->bundle[0].numImageAnimations++;
@@ -1289,10 +1289,10 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
token = COM_ParseExt( text, qfalse );
if ( !token[0] )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parameter for 'videoMap' keyword in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parameter for 'videoMap' keyword in shader '%s'\n", shader.name );
return qfalse;
}
- stage->bundle[0].videoMapHandle = ri->CIN_PlayCinematic( token, 0, 0, 256, 256, (CIN_loop | CIN_silent | CIN_shader));
+ stage->bundle[0].videoMapHandle = ri.CIN_PlayCinematic( token, 0, 0, 256, 256, (CIN_loop | CIN_silent | CIN_shader));
if (stage->bundle[0].videoMapHandle != -1) {
stage->bundle[0].isVideoMap = qtrue;
assert (stage->bundle[0].videoMapHandle<NUM_SCRATCH_IMAGES);
@@ -1308,7 +1308,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
token = COM_ParseExt( text, qfalse );
if ( !token[0] )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parameter for 'alphaFunc' keyword in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parameter for 'alphaFunc' keyword in shader '%s'\n", shader.name );
return qfalse;
}
@@ -1323,7 +1323,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
if ( !token[0] )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parameter for 'depthfunc' keyword in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parameter for 'depthfunc' keyword in shader '%s'\n", shader.name );
return qfalse;
}
@@ -1341,7 +1341,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
}
else
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown depthfunc '%s' in shader '%s'\n", token, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown depthfunc '%s' in shader '%s'\n", token, shader.name );
continue;
}
}
@@ -1361,7 +1361,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parm for blendFunc in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parm for blendFunc in shader '%s'\n", shader.name );
continue;
}
// check for "simple" blends first
@@ -1381,7 +1381,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parm for blendFunc in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parm for blendFunc in shader '%s'\n", shader.name );
continue;
}
blendDstBits = NameToDstBlendMode( token );
@@ -1401,7 +1401,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parameters for rgbGen in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parameters for rgbGen in shader '%s'\n", shader.name );
continue;
}
@@ -1459,7 +1459,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
{
if (shader.lightmapIndex[0] != LIGHTMAP_NONE)
{
- ri->Printf( PRINT_ALL, S_COLOR_RED "ERROR: rgbGen lightingDiffuseEntity used on a misc_model! in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_RED "ERROR: rgbGen lightingDiffuseEntity used on a misc_model! in shader '%s'\n", shader.name );
}
stage->rgbGen = CGEN_LIGHTING_DIFFUSE_ENTITY;
@@ -1470,7 +1470,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
}
else
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown rgbGen parameter '%s' in shader '%s'\n", token, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown rgbGen parameter '%s' in shader '%s'\n", token, shader.name );
continue;
}
}
@@ -1482,7 +1482,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parameters for alphaGen in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parameters for alphaGen in shader '%s'\n", shader.name );
continue;
}
@@ -1536,7 +1536,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
if ( token[0] == 0 )
{
shader.portalRange = 256;
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing range parameter for alphaGen portal in shader '%s', defaulting to 256\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing range parameter for alphaGen portal in shader '%s', defaulting to 256\n", shader.name );
}
else
{
@@ -1545,7 +1545,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
}
else
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown alphaGen parameter '%s' in shader '%s'\n", token, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown alphaGen parameter '%s' in shader '%s'\n", token, shader.name );
continue;
}
}
@@ -1557,7 +1557,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing texgen parm in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing texgen parm in shader '%s'\n", shader.name );
continue;
}
@@ -1583,7 +1583,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
}
else
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown texgen parm in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown texgen parm in shader '%s'\n", shader.name );
}
}
//
@@ -1677,7 +1677,7 @@ static qboolean ParseStage( shaderStage_t *stage, const char **text )
}
else
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown parameter '%s' in shader '%s'\n", token, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown parameter '%s' in shader '%s'\n", token, shader.name );
return qfalse;
}
}
@@ -1746,12 +1746,12 @@ static void ParseDeform( const char **text ) {
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing deform parm in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing deform parm in shader '%s'\n", shader.name );
return;
}
if ( shader.numDeforms == MAX_SHADER_DEFORMS ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: MAX_SHADER_DEFORMS in '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: MAX_SHADER_DEFORMS in '%s'\n", shader.name );
return;
}
@@ -1790,7 +1790,7 @@ static void ParseDeform( const char **text ) {
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing deformVertexes bulge parm in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing deformVertexes bulge parm in shader '%s'\n", shader.name );
return;
}
ds->bulgeWidth = atof( token );
@@ -1798,7 +1798,7 @@ static void ParseDeform( const char **text ) {
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing deformVertexes bulge parm in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing deformVertexes bulge parm in shader '%s'\n", shader.name );
return;
}
ds->bulgeHeight = atof( token );
@@ -1806,7 +1806,7 @@ static void ParseDeform( const char **text ) {
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing deformVertexes bulge parm in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing deformVertexes bulge parm in shader '%s'\n", shader.name );
return;
}
ds->bulgeSpeed = atof( token );
@@ -1820,7 +1820,7 @@ static void ParseDeform( const char **text ) {
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing deformVertexes parm in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing deformVertexes parm in shader '%s'\n", shader.name );
return;
}
@@ -1831,7 +1831,7 @@ static void ParseDeform( const char **text ) {
else
{
ds->deformationSpread = 100.0f;
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: illegal div value of 0 in deformVertexes command for shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: illegal div value of 0 in deformVertexes command for shader '%s'\n", shader.name );
}
ParseWaveForm( text, &ds->deformationWave );
@@ -1844,7 +1844,7 @@ static void ParseDeform( const char **text ) {
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing deformVertexes parm in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing deformVertexes parm in shader '%s'\n", shader.name );
return;
}
ds->deformationWave.amplitude = atof( token );
@@ -1852,7 +1852,7 @@ static void ParseDeform( const char **text ) {
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing deformVertexes parm in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing deformVertexes parm in shader '%s'\n", shader.name );
return;
}
ds->deformationWave.frequency = atof( token );
@@ -1867,7 +1867,7 @@ static void ParseDeform( const char **text ) {
for ( i = 0 ; i < 3 ; i++ ) {
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing deformVertexes parm in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing deformVertexes parm in shader '%s'\n", shader.name );
return;
}
ds->moveVector[i] = atof( token );
@@ -1878,7 +1878,7 @@ static void ParseDeform( const char **text ) {
return;
}
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown deformVertexes subtype '%s' found in shader '%s'\n", token, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown deformVertexes subtype '%s' found in shader '%s'\n", token, shader.name );
}
@@ -1900,7 +1900,7 @@ static void ParseSkyParms( const char **text ) {
// outerbox
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: 'skyParms' missing parameter in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: 'skyParms' missing parameter in shader '%s'\n", shader.name );
return;
}
if ( strcmp( token, "-" ) ) {
@@ -1920,7 +1920,7 @@ static void ParseSkyParms( const char **text ) {
// cloudheight
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: 'skyParms' missing cloudheight in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: 'skyParms' missing cloudheight in shader '%s'\n", shader.name );
return;
}
shader.sky->cloudHeight = atof( token );
@@ -1932,7 +1932,7 @@ static void ParseSkyParms( const char **text ) {
// innerbox
token = COM_ParseExt( text, qfalse );
if ( strcmp( token, "-" ) ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: in shader '%s' 'skyParms', innerbox is not supported!", shader.name);
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: in shader '%s' 'skyParms', innerbox is not supported!", shader.name);
}
}
@@ -1947,7 +1947,7 @@ static void ParseSort( const char **text ) {
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing sort parameter in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing sort parameter in shader '%s'\n", shader.name );
return;
}
@@ -2003,7 +2003,7 @@ void ParseMaterial( const char **text )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing material in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing material in shader '%s'\n", shader.name );
return;
}
for(i = 0; i < MATERIAL_LAST; i++)
@@ -2107,7 +2107,7 @@ static qboolean ParseShader( const char **text )
token = COM_ParseExt( text, qtrue );
if ( token[0] != '{' )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: expecting '{', found '%s' instead in shader '%s'\n", token, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: expecting '{', found '%s' instead in shader '%s'\n", token, shader.name );
return qfalse;
}
@@ -2116,7 +2116,7 @@ static qboolean ParseShader( const char **text )
token = COM_ParseExt( text, qtrue );
if ( !token[0] )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: no concluding '}' in shader %s\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: no concluding '}' in shader %s\n", shader.name );
return qfalse;
}
@@ -2129,7 +2129,7 @@ static qboolean ParseShader( const char **text )
else if ( token[0] == '{' )
{
if ( s >= MAX_SHADER_STAGES ) {
- ri->Printf( PRINT_WARNING, "WARNING: too many stages in shader %s (max is %i)\n", shader.name, MAX_SHADER_STAGES );
+ ri.Printf( PRINT_WARNING, "WARNING: too many stages in shader %s (max is %i)\n", shader.name, MAX_SHADER_STAGES );
return qfalse;
}
@@ -2278,7 +2278,7 @@ static qboolean ParseShader( const char **text )
token = COM_ParseExt( text, qfalse );
if ( !token[0] )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parm for 'fogParms' keyword in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing parm for 'fogParms' keyword in shader '%s'\n", shader.name );
continue;
}
shader.fogParms->depthForOpaque = atof( token );
@@ -2311,7 +2311,7 @@ static qboolean ParseShader( const char **text )
token = COM_ParseExt( text, qfalse );
if ( token[0] == 0 )
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing cull parms in shader '%s'\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: missing cull parms in shader '%s'\n", shader.name );
continue;
}
@@ -2325,7 +2325,7 @@ static qboolean ParseShader( const char **text )
}
else
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid cull parm '%s' in shader '%s'\n", token, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: invalid cull parm '%s' in shader '%s'\n", token, shader.name );
}
continue;
}
@@ -2337,7 +2337,7 @@ static qboolean ParseShader( const char **text )
}
else
{
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown general shader parameter '%s' in '%s'\n", token, shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: unknown general shader parameter '%s' in '%s'\n", token, shader.name );
return qfalse;
}
}
@@ -2677,12 +2677,12 @@ static shader_t *GeneratePermanentShader( void ) {
int size;
if ( tr.numShaders == MAX_SHADERS ) {
- //ri->Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: GeneratePermanentShader - MAX_SHADERS hit\n");
- ri->Printf( PRINT_ALL, "WARNING: GeneratePermanentShader - MAX_SHADERS hit\n");
+ //ri.Printf( PRINT_ALL, S_COLOR_YELLOW "WARNING: GeneratePermanentShader - MAX_SHADERS hit\n");
+ ri.Printf( PRINT_ALL, "WARNING: GeneratePermanentShader - MAX_SHADERS hit\n");
return tr.defaultShader;
}
- newShader = (struct shader_s *)ri->Hunk_Alloc( sizeof( shader_t ), h_low );
+ newShader = (struct shader_s *)ri.Hunk_Alloc( sizeof( shader_t ), h_low );
*newShader = shader;
@@ -2966,7 +2966,7 @@ static shader_t *FinishShader( void ) {
// check for a missing texture
if ( !pStage->bundle[0].image ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "Shader %s has a stage with no image\n", shader.name );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "Shader %s has a stage with no image\n", shader.name );
pStage->active = qfalse;
stage++;
continue;
@@ -3165,11 +3165,11 @@ static shader_t *FinishShader( void ) {
{
if (vertexLightmap)
{
-// ri->DPrintf( "WARNING: shader '%s' has VERTEX forced lightmap!\n", shader.name );
+// ri.DPrintf( "WARNING: shader '%s' has VERTEX forced lightmap!\n", shader.name );
}
else
{
- ri->Printf( PRINT_DEVELOPER, "WARNING: shader '%s' has lightmap but no lightmap stage!\n", shader.name );
+ ri.Printf( PRINT_DEVELOPER, "WARNING: shader '%s' has lightmap but no lightmap stage!\n", shader.name );
memcpy(shader.lightmapIndex, lightmapsNone, sizeof(shader.lightmapIndex));
memcpy(shader.styles, stylesDefault, sizeof(shader.styles));
}
@@ -3424,7 +3424,7 @@ shader_t *R_FindShader( const char *name, const int *lightmapIndex, const byte *
if ( lightmapIndex[0] < LIGHTMAP_2D )
{
// negative lightmap indexes cause stray pointers (think tr.lightmaps[lightmapIndex])
- ri->Printf( PRINT_WARNING, "WARNING: shader '%s' has invalid lightmap index of %d\n", name, lightmapIndex[0] );
+ ri.Printf( PRINT_WARNING, "WARNING: shader '%s' has invalid lightmap index of %d\n", name, lightmapIndex[0] );
lightmapIndex = lightmapsVertex;
}
@@ -3473,7 +3473,7 @@ shader_t *R_FindShader( const char *name, const int *lightmapIndex, const byte *
COM_StripExtension( name, fileName, sizeof( fileName ) );
image = R_FindImageFile( fileName, mipRawImage, mipRawImage, qtrue, mipRawImage ? GL_REPEAT : GL_CLAMP );
if ( !image ) {
- ri->Printf( PRINT_DEVELOPER, S_COLOR_RED "Couldn't find image for shader %s\n", name );
+ ri.Printf( PRINT_DEVELOPER, S_COLOR_RED "Couldn't find image for shader %s\n", name );
shader.defaultShader = true;
return FinishShader();
}
@@ -3680,7 +3680,7 @@ qhandle_t RE_RegisterShaderLightMap( const char *name, const int *lightmapIndex,
shader_t *sh;
if ( strlen( name ) >= MAX_QPATH ) {
- ri->Printf( PRINT_ALL, "Shader name exceeds MAX_QPATH\n" );
+ ri.Printf( PRINT_ALL, "Shader name exceeds MAX_QPATH\n" );
return 0;
}
@@ -3714,7 +3714,7 @@ qhandle_t RE_RegisterShader( const char *name ) {
shader_t *sh;
if ( strlen( name ) >= MAX_QPATH ) {
- ri->Printf( PRINT_ALL, "Shader name exceeds MAX_QPATH\n" );
+ ri.Printf( PRINT_ALL, "Shader name exceeds MAX_QPATH\n" );
return 0;
}
@@ -3744,7 +3744,7 @@ qhandle_t RE_RegisterShaderNoMip( const char *name ) {
shader_t *sh;
if ( strlen( name ) >= MAX_QPATH ) {
- ri->Printf( PRINT_ALL, "Shader name exceeds MAX_QPATH\n" );
+ ri.Printf( PRINT_ALL, "Shader name exceeds MAX_QPATH\n" );
return 0;
}
@@ -3781,11 +3781,11 @@ it and returns a valid (possibly default) shader_t to be used internally.
*/
shader_t *R_GetShaderByHandle( qhandle_t hShader ) {
if ( hShader < 0 ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "R_GetShaderByHandle: out of range hShader '%d'\n", hShader );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "R_GetShaderByHandle: out of range hShader '%d'\n", hShader );
return tr.defaultShader;
}
if ( hShader >= tr.numShaders ) {
- ri->Printf( PRINT_ALL, S_COLOR_YELLOW "R_GetShaderByHandle: out of range hShader '%d'\n", hShader );
+ ri.Printf( PRINT_ALL, S_COLOR_YELLOW "R_GetShaderByHandle: out of range hShader '%d'\n", hShader );
return tr.defaultShader;
}
return tr.shaders[hShader];
@@ -3804,53 +3804,53 @@ void R_ShaderList_f (void) {
int count;
shader_t *shader;
- ri->Printf( PRINT_ALL, "-----------------------\n");
+ ri.Printf( PRINT_ALL, "-----------------------\n");
count = 0;
for ( i = 0 ; i < tr.numShaders ; i++ ) {
- if ( ri->Cmd_Argc() > 1 ) {
+ if ( ri.Cmd_Argc() > 1 ) {
shader = tr.sortedShaders[i];
} else {
shader = tr.shaders[i];
}
- ri->Printf( PRINT_ALL, "%i ", shader->numUnfoggedPasses );
+ ri.Printf( PRINT_ALL, "%i ", shader->numUnfoggedPasses );
if (shader->lightmapIndex[0] >= 0 ) {
- ri->Printf( PRINT_ALL, "L ");
+ ri.Printf( PRINT_ALL, "L ");
} else {
- ri->Printf( PRINT_ALL, " ");
+ ri.Printf( PRINT_ALL, " ");
}
if ( shader->multitextureEnv == GL_ADD ) {
- ri->Printf( PRINT_ALL, "MT(a) " );
+ ri.Printf( PRINT_ALL, "MT(a) " );
} else if ( shader->multitextureEnv == GL_MODULATE ) {
- ri->Printf( PRINT_ALL, "MT(m) " );
+ ri.Printf( PRINT_ALL, "MT(m) " );
} else if ( shader->multitextureEnv == GL_DECAL ) {
- ri->Printf( PRINT_ALL, "MT(d) " );
+ ri.Printf( PRINT_ALL, "MT(d) " );
} else {
- ri->Printf( PRINT_ALL, " " );
+ ri.Printf( PRINT_ALL, " " );
}
if ( shader->explicitlyDefined ) {
- ri->Printf( PRINT_ALL, "E " );
+ ri.Printf( PRINT_ALL, "E " );
} else {
- ri->Printf( PRINT_ALL, " " );
+ ri.Printf( PRINT_ALL, " " );
}
if ( shader->sky )
{
- ri->Printf( PRINT_ALL, "sky " );
+ ri.Printf( PRINT_ALL, "sky " );
} else {
- ri->Printf( PRINT_ALL, "gen " );
+ ri.Printf( PRINT_ALL, "gen " );
}
if ( shader->defaultShader ) {
- ri->Printf( PRINT_ALL, ": %s (DEFAULTED)\n", shader->name);
+ ri.Printf( PRINT_ALL, ": %s (DEFAULTED)\n", shader->name);
} else {
- ri->Printf( PRINT_ALL, ": %s\n", shader->name);
+ ri.Printf( PRINT_ALL, ": %s\n", shader->name);
}
count++;
}
- ri->Printf( PRINT_ALL, "%i total shaders\n", count);
- ri->Printf( PRINT_ALL, "------------------\n");
+ ri.Printf( PRINT_ALL, "%i total shaders\n", count);
+ ri.Printf( PRINT_ALL, "------------------\n");
}
int COM_CompressShader( char *data_p )
@@ -3976,11 +3976,11 @@ static void ScanAndLoadShaderFiles( void )
long sum = 0, summand;
// scan for shader files
- shaderFiles = ri->FS_ListFiles( "shaders", ".shader", &numShaderFiles );
+ shaderFiles = ri.FS_ListFiles( "shaders", ".shader", &numShaderFiles );
if ( !shaderFiles || !numShaderFiles )
{
- ri->Error( ERR_FATAL, "ERROR: no shader files found" );
+ ri.Error( ERR_FATAL, "ERROR: no shader files found" );
return;
}
@@ -3994,11 +3994,11 @@ static void ScanAndLoadShaderFiles( void )
char filename[MAX_QPATH];
Com_sprintf( filename, sizeof( filename ), "shaders/%s", shaderFiles[i] );
- ri->Printf( PRINT_DEVELOPER, "...loading '%s'\n", filename );
- summand = ri->FS_ReadFile( filename, (void **)&buffers[i] );
+ ri.Printf( PRINT_DEVELOPER, "...loading '%s'\n", filename );
+ summand = ri.FS_ReadFile( filename, (void **)&buffers[i] );
if ( !buffers[i] ) {
- ri->Error( ERR_DROP, "Couldn't load %s", filename );
+ ri.Error( ERR_DROP, "Couldn't load %s", filename );
}
// Do a simple check on the shader structure in that file to make sure one bad shader file cannot fuck up all other shaders.
@@ -4016,7 +4016,7 @@ static void ScanAndLoadShaderFiles( void )
if ( token[0] == '#' )
{
- ri->Printf( PRINT_WARNING, "WARNING: Deprecated shader comment \"%s\" on line %d in file %s. Ignoring line.\n",
+ ri.Printf( PRINT_WARNING, "WARNING: Deprecated shader comment \"%s\" on line %d in file %s. Ignoring line.\n",
shaderName, shaderLine, filename );
SkipRestOfLine( &p );
continue;
@@ -4025,23 +4025,23 @@ static void ScanAndLoadShaderFiles( void )
token = COM_ParseExt(&p, qtrue);
if(token[0] != '{' || token[1] != '\0')
{
- ri->Printf(PRINT_WARNING, "WARNING: Ignoring shader file %s. Shader \"%s\" on line %d missing opening brace",
+ ri.Printf(PRINT_WARNING, "WARNING: Ignoring shader file %s. Shader \"%s\" on line %d missing opening brace",
filename, shaderName, shaderLine);
if (token[0])
{
- ri->Printf(PRINT_WARNING, " (found \"%s\" on line %d)", token, COM_GetCurrentParseLine());
+ ri.Printf(PRINT_WARNING, " (found \"%s\" on line %d)", token, COM_GetCurrentParseLine());
}
- ri->Printf(PRINT_WARNING, ".\n");
- ri->FS_FreeFile(buffers[i]);
+ ri.Printf(PRINT_WARNING, ".\n");
+ ri.FS_FreeFile(buffers[i]);
buffers[i] = NULL;
break;
}
if(!SkipBracedSection(&p, 1))
{
- ri->Printf(PRINT_WARNING, "WARNING: Ignoring shader file %s. Shader \"%s\" on line %d missing closing brace.\n",
+ ri.Printf(PRINT_WARNING, "WARNING: Ignoring shader file %s. Shader \"%s\" on line %d missing closing brace.\n",
filename, shaderName, shaderLine);
- ri->FS_FreeFile(buffers[i]);
+ ri.FS_FreeFile(buffers[i]);
buffers[i] = NULL;
break;
}
@@ -4053,7 +4053,7 @@ static void ScanAndLoadShaderFiles( void )
}
// build single large buffer
- s_shaderText = (char *)ri->Hunk_Alloc( sum + numShaderFiles*2, h_low );
+ s_shaderText = (char *)ri.Hunk_Alloc( sum + numShaderFiles*2, h_low );
s_shaderText[ 0 ] = '\0';
textEnd = s_shaderText;
@@ -4066,13 +4066,13 @@ static void ScanAndLoadShaderFiles( void )
strcat( textEnd, buffers[i] );
strcat( textEnd, "\n" );
textEnd += strlen( textEnd );
- ri->FS_FreeFile( buffers[i] );
+ ri.FS_FreeFile( buffers[i] );
}
COM_CompressShader( s_shaderText );
// free up memory
- ri->FS_FreeFileList( shaderFiles );
+ ri.FS_FreeFileList( shaderFiles );
memset(shaderTextHashTableSizes, 0, sizeof(shaderTextHashTableSizes));
size = 0;
@@ -4099,7 +4099,7 @@ static void ScanAndLoadShaderFiles( void )
size += MAX_SHADERTEXT_HASH;
- hashMem = (char *)ri->Hunk_Alloc( size * sizeof(char *), h_low );
+ hashMem = (char *)ri.Hunk_Alloc( size * sizeof(char *), h_low );
for (i = 0; i < MAX_SHADERTEXT_HASH; i++) {
shaderTextHashTable[i] = (char **) hashMem;
@@ -4185,7 +4185,7 @@ R_InitShaders
*/
void R_InitShaders(qboolean server)
{
- //ri->Printf( PRINT_ALL, "Initializing Shaders\n" );
+ //ri.Printf( PRINT_ALL, "Initializing Shaders\n" );
memset(hashTable, 0, sizeof(hashTable));
diff --git a/codemp/rd-vanilla/tr_skin.cpp b/codemp/rd-vanilla/tr_skin.cpp
index b2d0e44..57ff066 100644
--- a/codemp/rd-vanilla/tr_skin.cpp
+++ b/codemp/rd-vanilla/tr_skin.cpp
@@ -110,10 +110,10 @@ qhandle_t RE_RegisterIndividualSkin( const char *name , qhandle_t hSkin)
char surfName[MAX_QPATH];
// load and parse the skin file
- ri->FS_ReadFile( name, (void **)&text );
+ ri.FS_ReadFile( name, (void **)&text );
if ( !text ) {
#ifndef FINAL_BUILD
- ri->Printf( PRINT_ALL, "WARNING: RE_RegisterSkin( '%s' ) failed to load!\n", name );
+ ri.Printf( PRINT_ALL, "WARNING: RE_RegisterSkin( '%s' ) failed to load!\n", name );
#endif
return 0;
}
@@ -156,7 +156,7 @@ qhandle_t RE_RegisterIndividualSkin( const char *name , qhandle_t hSkin)
if ( (unsigned)skin->numSurfaces >= ARRAY_LEN( skin->surfaces ) )
{
assert( ARRAY_LEN( skin->surfaces ) > (unsigned)skin->numSurfaces );
- ri->Printf( PRINT_ALL, "WARNING: RE_RegisterSkin( '%s' ) more than %u surfaces!\n", name, (unsigned int )ARRAY_LEN( skin->surfaces ) );
+ ri.Printf( PRINT_ALL, "WARNING: RE_RegisterSkin( '%s' ) more than %u surfaces!\n", name, (unsigned int )ARRAY_LEN( skin->surfaces ) );
break;
}
surf = (skinSurface_t *) Hunk_Alloc( sizeof( *skin->surfaces[0] ), h_low );
@@ -169,7 +169,7 @@ qhandle_t RE_RegisterIndividualSkin( const char *name , qhandle_t hSkin)
skin->numSurfaces++;
}
- ri->FS_FreeFile( text );
+ ri.FS_FreeFile( text );
// never let a skin have 0 shaders
@@ -185,12 +185,12 @@ qhandle_t RE_RegisterSkin( const char *name ) {
skin_t *skin;
if ( !name || !name[0] ) {
- ri->Printf( PRINT_ALL, "Empty name passed to RE_RegisterSkin\n" );
+ ri.Printf( PRINT_ALL, "Empty name passed to RE_RegisterSkin\n" );
return 0;
}
if ( strlen( name ) >= MAX_QPATH ) {
- ri->Printf( PRINT_ALL, "Skin name exceeds MAX_QPATH\n" );
+ ri.Printf( PRINT_ALL, "Skin name exceeds MAX_QPATH\n" );
return 0;
}
@@ -207,7 +207,7 @@ qhandle_t RE_RegisterSkin( const char *name ) {
// allocate a new skin
if ( tr.numSkins == MAX_SKINS ) {
- ri->Printf( PRINT_ALL, "WARNING: RE_RegisterSkin( '%s' ) MAX_SKINS hit\n", name );
+ ri.Printf( PRINT_ALL, "WARNING: RE_RegisterSkin( '%s' ) MAX_SKINS hit\n", name );
return 0;
}
tr.numSkins++;
@@ -365,8 +365,8 @@ Mangled version of the above function to load .skin files on the server.
qhandle_t RE_RegisterServerSkin( const char *name ) {
qhandle_t r;
- if (ri->Cvar_VariableIntegerValue( "cl_running" ) &&
- ri->Com_TheHunkMarkHasBeenMade() &&
+ if (ri.Cvar_VariableIntegerValue( "cl_running" ) &&
+ ri.Com_TheHunkMarkHasBeenMade() &&
ShaderHashTableExists())
{ //If the client is running then we can go straight into the normal registerskin func
return RE_RegisterSkin(name);
@@ -390,10 +390,10 @@ void R_InitSkins( void ) {
tr.numSkins = 1;
// make the default skin have all default shaders
- skin = tr.skins[0] = (struct skin_s *)ri->Hunk_Alloc( sizeof( skin_t ), h_low );
+ skin = tr.skins[0] = (struct skin_s *)ri.Hunk_Alloc( sizeof( skin_t ), h_low );
Q_strncpyz( skin->name, "<default skin>", sizeof( skin->name ) );
skin->numSurfaces = 1;
- skin->surfaces[0] = (_skinSurface_t *)ri->Hunk_Alloc( sizeof( skinSurface_t ), h_low );
+ skin->surfaces[0] = (_skinSurface_t *)ri.Hunk_Alloc( sizeof( skinSurface_t ), h_low );
skin->surfaces[0]->shader = tr.defaultShader;
}
@@ -418,16 +418,16 @@ void R_SkinList_f( void ) {
int i, j;
skin_t *skin;
- ri->Printf( PRINT_ALL, "------------------\n");
+ ri.Printf( PRINT_ALL, "------------------\n");
for ( i = 0 ; i < tr.numSkins ; i++ ) {
skin = tr.skins[i];
- ri->Printf( PRINT_ALL, "%3i:%s\n", i, skin->name );
+ ri.Printf( PRINT_ALL, "%3i:%s\n", i, skin->name );
for ( j = 0 ; j < skin->numSurfaces ; j++ ) {
- ri->Printf( PRINT_ALL, " %s = %s\n",
+ ri.Printf( PRINT_ALL, " %s = %s\n",
skin->surfaces[j]->name, ((shader_t* )skin->surfaces[j]->shader)->name );
}
}
- ri->Printf( PRINT_ALL, "------------------\n");
+ ri.Printf( PRINT_ALL, "------------------\n");
}
diff --git a/codemp/rd-vanilla/tr_subs.cpp b/codemp/rd-vanilla/tr_subs.cpp
index 503ac06..1f6d1db 100644
--- a/codemp/rd-vanilla/tr_subs.cpp
+++ b/codemp/rd-vanilla/tr_subs.cpp
@@ -33,7 +33,7 @@ void QDECL Com_Printf( const char *msg, ... )
Q_vsnprintf(text, sizeof(text), msg, argptr);
va_end(argptr);
- ri->Printf(PRINT_ALL, "%s", text);
+ ri.Printf(PRINT_ALL, "%s", text);
}
void QDECL Com_OPrintf( const char *msg, ... )
@@ -45,7 +45,7 @@ void QDECL Com_OPrintf( const char *msg, ... )
Q_vsnprintf(text, sizeof(text), msg, argptr);
va_end(argptr);
- ri->OPrintf("%s", text);
+ ri.OPrintf("%s", text);
}
void QDECL Com_Error( int level, const char *error, ... )
@@ -57,39 +57,39 @@ void QDECL Com_Error( int level, const char *error, ... )
Q_vsnprintf(text, sizeof(text), error, argptr);
va_end(argptr);
- ri->Error(level, "%s", text);
+ ri.Error(level, "%s", text);
}
// HUNK
void *Hunk_AllocateTempMemory( int size ) {
- return ri->Hunk_AllocateTempMemory( size );
+ return ri.Hunk_AllocateTempMemory( size );
}
void Hunk_FreeTempMemory( void *buf ) {
- ri->Hunk_FreeTempMemory( buf );
+ ri.Hunk_FreeTempMemory( buf );
}
void *Hunk_Alloc( int size, ha_pref preference ) {
- return ri->Hunk_Alloc( size, preference );
+ return ri.Hunk_Alloc( size, preference );
}
int Hunk_MemoryRemaining( void ) {
- return ri->Hunk_MemoryRemaining();
+ return ri.Hunk_MemoryRemaining();
}
// ZONE
void *Z_Malloc( int iSize, memtag_t eTag, qboolean bZeroit, int iAlign ) {
- return ri->Z_Malloc( iSize, eTag, bZeroit, iAlign );
+ return ri.Z_Malloc( iSize, eTag, bZeroit, iAlign );
}
void Z_Free( void *ptr ) {
- ri->Z_Free( ptr );
+ ri.Z_Free( ptr );
}
int Z_MemSize( memtag_t eTag ) {
- return ri->Z_MemSize( eTag );
+ return ri.Z_MemSize( eTag );
}
void Z_MorphMallocTag( void *pvBuffer, memtag_t eDesiredTag ) {
- ri->Z_MorphMallocTag( pvBuffer, eDesiredTag );
+ ri.Z_MorphMallocTag( pvBuffer, eDesiredTag );
}
diff --git a/codemp/rd-vanilla/tr_surface.cpp b/codemp/rd-vanilla/tr_surface.cpp
index 2910b82..3be021d 100644
--- a/codemp/rd-vanilla/tr_surface.cpp
+++ b/codemp/rd-vanilla/tr_surface.cpp
@@ -1653,7 +1653,7 @@ void RB_SurfaceEntity( surfaceType_t *surfType ) {
}
void RB_SurfaceBad( surfaceType_t *surfType ) {
- ri->Printf( PRINT_ALL, "Bad surface tesselated.\n" );
+ ri.Printf( PRINT_ALL, "Bad surface tesselated.\n" );
}
/*
diff --git a/codemp/rd-vanilla/tr_surfacesprites.cpp b/codemp/rd-vanilla/tr_surfacesprites.cpp
index a1de1fb..0a02f21 100644
--- a/codemp/rd-vanilla/tr_surfacesprites.cpp
+++ b/codemp/rd-vanilla/tr_surfacesprites.cpp
@@ -303,7 +303,7 @@ static void R_SurfaceSpriteFrameUpdate(void)
if (r_surfaceSprites->integer >= 2)
{
- ri->Printf( PRINT_ALL, "Surfacesprites Drawn: %d, on %d surfaces\n", totalsurfsprites, sssurfaces);
+ ri.Printf( PRINT_ALL, "Surfacesprites Drawn: %d, on %d surfaces\n", totalsurfsprites, sssurfaces);
}
totalsurfsprites=0;
diff --git a/codemp/rd-vanilla/tr_terrain.cpp b/codemp/rd-vanilla/tr_terrain.cpp
index 3f00307..ce1a0b3 100644
--- a/codemp/rd-vanilla/tr_terrain.cpp
+++ b/codemp/rd-vanilla/tr_terrain.cpp
@@ -214,7 +214,7 @@ void CTRPatch::SetVisibility(bool visCheck)
else
{
// Set the visibility of the patch
- misVisible = !ri->CM_CullWorldBox(backEnd.viewParms.frustum, GetBounds());
+ misVisible = !ri.CM_CullWorldBox(backEnd.viewParms.frustum, GetBounds());
}
}
else
@@ -505,7 +505,7 @@ void CTRLandScape::LoadTerrainDef(const char *td)
CGPGroup *basegroup, *classes, *items;
Com_sprintf(terrainDef, MAX_QPATH, "ext_data/RMG/%s.terrain", td);
- ri->Printf( PRINT_ALL, "R_Terrain: Loading and parsing terrainDef %s.....\n", td);
+ ri.Printf( PRINT_ALL, "R_Terrain: Loading and parsing terrainDef %s.....\n", td);
mWaterShader = NULL;
mFlatShader = NULL_HANDLE;
@@ -515,7 +515,7 @@ void CTRLandScape::LoadTerrainDef(const char *td)
Com_sprintf(terrainDef, MAX_QPATH, "ext_data/arioche/%s.terrain", td);
if(!Com_ParseTextFile(terrainDef, parse))
{
- ri->Printf( PRINT_ALL, "Could not open %s\n", terrainDef);
+ ri.Printf( PRINT_ALL, "Could not open %s\n", terrainDef);
return;
}
}
@@ -867,7 +867,7 @@ CTRLandScape::CTRLandScape(const char *configstring)
memset(this, 0, sizeof(*this));
// Sets up the common aspects of the terrain
- common = ri->CM_RegisterTerrain(configstring, false);
+ common = ri.CM_RegisterTerrain(configstring, false);
SetCommon(common);
tr.landScape.landscape = this;
@@ -899,14 +899,14 @@ CTRLandScape::CTRLandScape(const char *configstring)
// Calculate texture coords (not projected - real)
CalculateTextureCoords();
- ri->Printf( PRINT_ALL, "R_Terrain: Creating renderer patches.....\n");
+ ri.Printf( PRINT_ALL, "R_Terrain: Creating renderer patches.....\n");
// Initialise all terrain patches
mTRPatches = (CTRPatch *)Z_Malloc(sizeof(CTRPatch) * common->GetBlockCount(), TAG_R_TERRAIN);
mSortedCount = 2 * common->GetBlockCount();
mSortedPatches = (TPatchInfo *)Z_Malloc(sizeof(TPatchInfo) * mSortedCount, TAG_R_TERRAIN);
- ri->CM_TerrainPatchIterate(common, InitRendererPatches, this);
+ ri.CM_TerrainPatchIterate(common, InitRendererPatches, this);
// Calculate shaders dependent on the .terrain file
CalculateShaders();
@@ -998,11 +998,11 @@ void RE_InitRendererTerrain( const char *info )
if ( !info || !info[0] )
{
- ri->Printf( PRINT_ALL, "RE_RegisterTerrain: NULL name\n" );
+ ri.Printf( PRINT_ALL, "RE_RegisterTerrain: NULL name\n" );
return;
}
- ri->Printf( PRINT_ALL, "R_Terrain: Creating RENDERER data.....\n");
+ ri.Printf( PRINT_ALL, "R_Terrain: Creating RENDERER data.....\n");
// Create and register a new landscape structure
/*ls = */new CTRLandScape(info);
@@ -1013,10 +1013,10 @@ void R_TerrainInit(void)
tr.landScape.surfaceType = SF_TERRAIN;
tr.landScape.landscape = NULL;
- r_terrainTessellate = ri->Cvar_Get("r_terrainTessellate", "3", CVAR_CHEAT);
- r_drawTerrain = ri->Cvar_Get("r_drawTerrain", "1", CVAR_CHEAT);
- r_showFrameVariance = ri->Cvar_Get("r_showFrameVariance", "0", 0);
- r_terrainWaterOffset = ri->Cvar_Get("r_terrainWaterOffset", "0", 0);
+ r_terrainTessellate = ri.Cvar_Get("r_terrainTessellate", "3", CVAR_CHEAT);
+ r_drawTerrain = ri.Cvar_Get("r_drawTerrain", "1", CVAR_CHEAT);
+ r_showFrameVariance = ri.Cvar_Get("r_showFrameVariance", "0", 0);
+ r_terrainWaterOffset = ri.Cvar_Get("r_terrainWaterOffset", "0", 0);
tr.distanceCull = 6000;
tr.distanceCullSquared = tr.distanceCull * tr.distanceCull;
@@ -1026,11 +1026,11 @@ void R_TerrainShutdown(void)
{
CTRLandScape *ls;
-// ri->Printf( PRINT_ALL, "R_Terrain: Shutting down RENDERER terrain.....\n");
+// ri.Printf( PRINT_ALL, "R_Terrain: Shutting down RENDERER terrain.....\n");
ls = tr.landScape.landscape;
if(ls)
{
- ri->CM_ShutdownTerrain(0);
+ ri.CM_ShutdownTerrain(0);
delete ls;
tr.landScape.landscape = NULL;
}
diff --git a/codemp/rd-vanilla/tr_world.cpp b/codemp/rd-vanilla/tr_world.cpp
index 9a7a6ba..5216830 100644
--- a/codemp/rd-vanilla/tr_world.cpp
+++ b/codemp/rd-vanilla/tr_world.cpp
@@ -174,7 +174,7 @@ static qboolean R_CullSurface( surfaceType_t *surface, shader_t *shader ) {
VectorSet(nNormal, 0.0f, 0.0f, 1.0f);
VectorMA(basePoint, 8192.0f, nNormal, endPoint);
- ri->CM_BoxTrace(&tr, basePoint, endPoint, NULL, NULL, 0, (CONTENTS_SOLID|CONTENTS_TERRAIN), qfalse);
+ ri.CM_BoxTrace(&tr, basePoint, endPoint, NULL, NULL, 0, (CONTENTS_SOLID|CONTENTS_TERRAIN), qfalse);
if (!tr.startsolid &&
!tr.allsolid &&
@@ -192,7 +192,7 @@ static qboolean R_CullSurface( surfaceType_t *surface, shader_t *shader ) {
while (i < 4096)
{
VectorMA(basePoint, i, nNormal, endPoint);
- ri->CM_BoxTrace(&tr, endPoint, endPoint, NULL, NULL, 0, (CONTENTS_SOLID|CONTENTS_TERRAIN), qfalse);
+ ri.CM_BoxTrace(&tr, endPoint, endPoint, NULL, NULL, 0, (CONTENTS_SOLID|CONTENTS_TERRAIN), qfalse);
if (!tr.startsolid &&
!tr.allsolid &&
tr.fraction == 1.0f)
@@ -214,7 +214,7 @@ static qboolean R_CullSurface( surfaceType_t *surface, shader_t *shader ) {
//If we hit something within a set amount of units, we will assume it's a bridge type object
//and leave it to be drawn. Otherwise we will assume it is a roof or other obstruction and
//cull it out.
- ri->CM_BoxTrace(&tr, basePoint, endPoint, NULL, NULL, 0, (CONTENTS_SOLID|CONTENTS_TERRAIN), qfalse);
+ ri.CM_BoxTrace(&tr, basePoint, endPoint, NULL, NULL, 0, (CONTENTS_SOLID|CONTENTS_TERRAIN), qfalse);
if (!tr.startsolid &&
!tr.allsolid &&
@@ -554,7 +554,7 @@ void R_AddBrushModelSurfaces ( trRefEntity_t *ent ) {
}
//rww - Take this into account later?
-// if ( !ri->Cvar_VariableIntegerValue( "com_RMG" ) )
+// if ( !ri.Cvar_VariableIntegerValue( "com_RMG" ) )
// { // don't dlight bmodels on rmg, as multiple copies of the same instance will light up
R_DlightBmodel( bmodel, false );
// }
@@ -976,7 +976,7 @@ qboolean R_WriteWireframeMapToFile(void)
}
- f = ri->FS_FOpenFileWrite("blahblah.bla", qtrue);
+ f = ri.FS_FOpenFileWrite("blahblah.bla", qtrue);
if (!f)
{ //can't create?
return qfalse;
@@ -1002,9 +1002,9 @@ qboolean R_WriteWireframeMapToFile(void)
}
//now write the buffer, and close
- ri->FS_Write(rOut, requiredSize, f);
+ ri.FS_Write(rOut, requiredSize, f);
Z_Free(rOut);
- ri->FS_FCloseFile(f);
+ ri.FS_FCloseFile(f);
return qtrue;
}
@@ -1019,7 +1019,7 @@ qboolean R_GetWireframeMapFromFile(void)
int len;
int stepBytes;
- len = ri->FS_FOpenFileRead("blahblah.bla", &f, qfalse);
+ len = ri.FS_FOpenFileRead("blahblah.bla", &f, qfalse);
if (!f || len <= 0)
{ //it doesn't exist
return qfalse;
@@ -1027,7 +1027,7 @@ qboolean R_GetWireframeMapFromFile(void)
surfs = (wireframeMapSurf_t *)Z_Malloc(len, TAG_ALL, qtrue);
rSurfs = surfs;
- ri->FS_Read(surfs, len, f);
+ ri.FS_Read(surfs, len, f);
while (i < len)
{
@@ -1051,7 +1051,7 @@ qboolean R_GetWireframeMapFromFile(void)
//it should end up being equal, if not something was wrong with this file.
assert(i == len);
- ri->FS_FCloseFile(f);
+ ri.FS_FCloseFile(f);
Z_Free(rSurfs);
return qtrue;
}
@@ -1569,14 +1569,14 @@ qboolean R_inPVS( const vec3_t p1, const vec3_t p2, byte *mask ) {
int leafnum;
int cluster;
- leafnum = ri->CM_PointLeafnum (p1);
- cluster = ri->CM_LeafCluster (leafnum);
+ leafnum = ri.CM_PointLeafnum (p1);
+ cluster = ri.CM_LeafCluster (leafnum);
//agh, the damn snapshot mask doesn't work for this
- mask = (byte *) ri->CM_ClusterPVS (cluster);
+ mask = (byte *) ri.CM_ClusterPVS (cluster);
- leafnum = ri->CM_PointLeafnum (p2);
- cluster = ri->CM_LeafCluster (leafnum);
+ leafnum = ri.CM_PointLeafnum (p2);
+ cluster = ri.CM_LeafCluster (leafnum);
if ( mask && (!(mask[cluster>>3] & (1<<(cluster&7)) ) ) )
return qfalse;
@@ -1619,7 +1619,7 @@ static void R_MarkLeaves (void) {
if ( r_showcluster->modified || r_showcluster->integer ) {
r_showcluster->modified = qfalse;
if ( r_showcluster->integer ) {
- ri->Printf( PRINT_ALL, "cluster:%i area:%i\n", cluster, leaf->area );
+ ri.Printf( PRINT_ALL, "cluster:%i area:%i\n", cluster, leaf->area );
}
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git
More information about the Pkg-games-commits
mailing list