diff --git a/engine/client/api_menu.h b/engine/client/api_menu.h index 1c55d6c5f..eb1ea2909 100644 --- a/engine/client/api_menu.h +++ b/engine/client/api_menu.h @@ -139,6 +139,7 @@ typedef struct { char *(*fgets) (struct vfsfile_s *fhandle, char *out, size_t outsize); //returns output buffer, or NULL void (*fprintf) (struct vfsfile_s *fhandle, const char *s, ...); void (*enumeratefiles) (const char *match, int (QDECL *callback)(const char *fname, qofs_t fsize, time_t mtime, void *ctx, struct searchpathfuncs_s *package), void *ctx); + char *(*path_get) (void); // Drawing stuff void (*drawsetcliparea) (float x, float y, float width, float height); diff --git a/engine/client/m_native.c b/engine/client/m_native.c index 4c954a1f5..bc85f0313 100644 --- a/engine/client/m_native.c +++ b/engine/client/m_native.c @@ -72,6 +72,10 @@ static void MN_fclose(vfsfile_t *f) { VFS_CLOSE(f); } +static const char *MN_path_get(void) +{ + return host_parms.binarydir; +} static shader_t *MN_CachePic(const char *picname) { return R2D_SafeCachePic(picname); @@ -341,6 +345,7 @@ qboolean MN_Init(void) VFS_GETS, VFS_PRINTF, COM_EnumerateFiles, + MN_path_get, // Drawing stuff MN_DrawSetClipArea, @@ -401,7 +406,7 @@ qboolean MN_Init(void) break; if (host_parms.binarydir && !strchr(gamepath, '/') && !strchr(gamepath, '\\')) - libmenu = Sys_LoadLibrary(va("%smenu_%s_"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, host_parms.binarydir, gamepath), funcs); + libmenu = Sys_LoadLibrary(va("%smenu_"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, host_parms.binarydir), funcs); if (libmenu) break; diff --git a/engine/client/pr_menu.c b/engine/client/pr_menu.c index 2bcac1ee2..347884b3c 100644 --- a/engine/client/pr_menu.c +++ b/engine/client/pr_menu.c @@ -427,6 +427,9 @@ void QCBUILTIN PF_CL_DrawTextField (pubprogfuncs_t *prinst, struct globalvars_s } font = PR_CL_ChooseFont(world->g.drawfont, scale[0], scale[1]); + // Oversight ~eukara + R2D_ImageColours(1.0f, 1.0f, 1.0f, 1.0f); + R_DrawTextField(pos[0], pos[1], size[0], size[1], text, CON_WHITEMASK, flags, font, scale); } diff --git a/engine/common/config_wastes.h b/engine/common/config_wastes.h index 21c774882..c18053f93 100644 --- a/engine/common/config_wastes.h +++ b/engine/common/config_wastes.h @@ -21,7 +21,7 @@ // All my fault -eukara #define ENGINE_ROUTING -#define USE_INTERNAL_BULLET +#undef USE_INTERNAL_BULLET #define MENU_NATIVECODE // Will make a debut eventually, hopefully // What do we use