static int (*osgk_addref) (OSGK_BaseObject* obj);
static int (*osgk_release) (OSGK_BaseObject* obj);
-static OSGK_INLINE int osgk_addref_real (OSGK_BaseObject* obj)
+/*static OSGK_INLINE int osgk_addref_real (OSGK_BaseObject* obj)
{
return osgk_addref (obj);
-}
+}*/
static OSGK_INLINE int osgk_release_real (OSGK_BaseObject* obj)
{
unsigned int apiVer, OSGK_EmbeddingOptions* options,
OSGK_GeckoResult* geckoResult);
-static OSGK_INLINE OSGK_Embedding* osgk_embedding_create (
+/*static OSGK_INLINE OSGK_Embedding* osgk_embedding_create (
OSGK_GeckoResult* geckoResult)
{
return osgk_embedding_create2 (OSGK_API_VERSION, 0, geckoResult);
-}
+}*/
static OSGK_INLINE OSGK_Embedding* osgk_embedding_create_with_options (
OSGK_EmbeddingOptions* options, OSGK_GeckoResult* geckoResult)
return instance;
}
}
- if( developer.integer > 0 ) {
- Con_Printf( "cl_gecko_findunusedinstance: out of geckos\n" );
- }
+ Con_DPrintf( "cl_gecko_findunusedinstance: out of geckos\n" );
return NULL;
}
int i;
if( !name || !*name || strncmp( name, CLGECKOPREFIX, sizeof( CLGECKOPREFIX ) - 1 ) != 0 ) {
- if( developer.integer > 0 ) {
- Con_Printf( "CL_Gecko_FindBrowser: Bad gecko texture name '%s'!\n", name );
- }
+ Con_DPrintf( "CL_Gecko_FindBrowser: Bad gecko texture name '%s'!\n", name );
return NULL;
}
}
}
- if( developer.integer > 0 ) {
- Con_Printf( "CL_Gecko_FindBrowser: No browser named '%s'!\n", name );
- }
+ Con_DPrintf( "CL_Gecko_FindBrowser: No browser named '%s'!\n", name );
return NULL;
}
static void cl_gecko_linktexture( clgecko_t *instance ) {
// TODO: assert that instance->texture == NULL
instance->texture = R_LoadTexture2D( cl_geckotexturepool, instance->name,
- instance->texWidth, instance->texHeight, NULL, TEXTYPE_BGRA, TEXF_ALWAYSPRECACHE | TEXF_ALPHA | TEXF_PERSISTENT, NULL );
+ instance->texWidth, instance->texHeight, NULL, TEXTYPE_BGRA, TEXF_ALPHA | TEXF_PERSISTENT | TEXF_ALLOWUPDATES, -1, NULL );
R_MakeTextureDynamic( instance->texture, cl_gecko_updatecallback, instance );
CL_LinkDynTexture( instance->name, instance->texture );
}
return result;
}
-#if defined(WIN64)
+#if defined(_WIN64)
# define XULRUNNER_DIR_SUFFIX "win64"
#elif defined(WIN32)
# define XULRUNNER_DIR_SUFFIX "win32"
if( cl_geckoembedding != NULL ) return true;
- if( developer.integer > 0 ) {
- Con_Printf( "CL_Gecko_Embedding_Init: setting up gecko embedding\n" );
- }
+ Con_DPrintf( "CL_Gecko_Embedding_Init: setting up gecko embedding\n" );
options = osgk_embedding_options_create();
#ifdef XULRUNNER_DIR_SUFFIX
return false;
}
- if( developer.integer > 0 ) {
- Con_Printf( "CL_Gecko_Embedding_Init: Embedding set up correctly\n" );
- }
+ Con_DPrintf( "CL_Gecko_Embedding_Init: Embedding set up correctly\n" );
dpGlobalTemplate = osgk_sot_create( cl_geckoembedding, dpGlobal_create, NULL, NULL );
{
const char* dllnames_gecko [] =
{
-#if defined(WIN64)
- "OffscreenGecko64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
"OffscreenGecko.dll",
#elif defined(MACOSX)
"OffscreenGecko.dylib",
Cmd_AddCommand( "gecko_injecttext", cl_gecko_injecttext_f, "Injects text into a browser" );
Cmd_AddCommand( "gecko_movecursor", gl_gecko_movecursor_f, "Move the cursor to a certain position" );
- R_RegisterModule( "CL_Gecko", cl_gecko_start, cl_gecko_shutdown, cl_gecko_newmap );
+ R_RegisterModule( "CL_Gecko", cl_gecko_start, cl_gecko_shutdown, cl_gecko_newmap, NULL, NULL );
}
void CL_Gecko_NavigateToURI( clgecko_t *instance, const char *URI ) {