added back the old method of comparing points to the parent planes,

[xonotic/darkplaces.git] / cl_gecko.c

diff --git a/cl_gecko.c b/cl_gecko.c
index 90d25a04b241a997f496166cae0d2e40bf4c52c6..2aade4b4b874a343ba96bccfed5f6a11a5aceb13 100644 (file)
--- a/cl_gecko.c
+++ b/cl_gecko.c
@@ -325,7 +325,7 @@ OSGK_DERIVEDTYPE(OSGK_ScriptObjectTemplate);
 typedef enum OSGK_ScriptResult
 {
   srSuccess = 0,
-  srFailed = 0x80004005L /* actually NS_ERROR_FAILURE */
+  srFailed = (int)0x80004005L /* actually NS_ERROR_FAILURE */
 } OSGK_ScriptResult;
 
 typedef struct OSGK_ScriptObjectCreateParams_s
@@ -449,7 +449,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, NULL );
+               instance->texWidth, instance->texHeight, NULL, TEXTYPE_BGRA, TEXF_ALPHA | TEXF_PERSISTENT | TEXF_ALLOWUPDATES, NULL );
        R_MakeTextureDynamic( instance->texture, cl_gecko_updatecallback, instance );
        CL_LinkDynTexture( instance->name, instance->texture );
 }
@@ -551,7 +551,7 @@ static OSGK_ScriptResult dpGlobal_query (void* objTag, void* methTag,
   return result;
 }
 
-#if defined(WIN64)
+#if defined(_WIN64)
 # define XULRUNNER_DIR_SUFFIX  "win64"
 #elif defined(WIN32)
 # define XULRUNNER_DIR_SUFFIX  "win32"
@@ -848,9 +848,7 @@ qboolean CL_Gecko_OpenLibrary (void)
 {
        const char* dllnames_gecko [] =
        {
-#if defined(WIN64)
-               "OffscreenGecko64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "OffscreenGecko.dll",
 #elif defined(MACOSX)
                "OffscreenGecko.dylib",