X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_gecko.c;h=ec09b5c33199be82a021f44cce6ae0de7ab97fcf;hb=15ba263dfc057719e51ffd7ba6ecb0fe7efb400c;hp=b4f6542a53b3071cfaaa178c520edd3c330d5ff3;hpb=d39861bfe72a5a9ec8cfbcc83457db58a74b75d9;p=xonotic%2Fdarkplaces.git diff --git a/cl_gecko.c b/cl_gecko.c index b4f6542a..ec09b5c3 100644 --- a/cl_gecko.c +++ b/cl_gecko.c @@ -37,10 +37,10 @@ typedef struct OSGK_BaseObject_s OSGK_BaseObject; 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) { @@ -71,11 +71,11 @@ static OSGK_Embedding* (*osgk_embedding_create2) ( 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) @@ -443,7 +443,7 @@ static void cl_gecko_updatecallback( rtexture_t *texture, void* callbackData ) { 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_ALPHA | TEXF_PERSISTENT | TEXF_ALLOWUPDATES, 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 ); } @@ -869,7 +869,7 @@ void CL_Gecko_Init( void ) 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 ) {