X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=prvm_edict.c;h=e874eaae6602a9377fac137ddcfe98fc7aaa6e4d;hb=81d989f23189cdeb12a5d543eb23121cf36d06f4;hp=18238abb3dd57072645459657269bf5ef1169880;hpb=3667f45be48e9b06ad64c1575bccac81043b1925;p=xonotic%2Fdarkplaces.git diff --git a/prvm_edict.c b/prvm_edict.c index 18238abb..e874eaae 100644 --- a/prvm_edict.c +++ b/prvm_edict.c @@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "progsvm.h" +#include "csprogs.h" prvm_prog_t *prog; @@ -2335,6 +2336,7 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, const char **re // later idea: include a list of authorized .po file checksums with the csprogs { qboolean deftrans = !!strcmp(PRVM_NAME, "client"); + const char *realfilename = (strcmp(PRVM_NAME, "client") ? filename : csqc_progname.string); if(deftrans) // once we have dotranslate_ strings, ALWAYS use the opt-in method! { for (i=0 ; iprogs->numglobaldefs ; i++) @@ -2351,8 +2353,8 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, const char **re } if(!strcmp(prvm_language.string, "dump")) { - qfile_t *f = FS_OpenRealFile(va("%s.pot", filename), "w", false); - Con_Printf("Dumping to %s.pot\n", filename); + qfile_t *f = FS_OpenRealFile(va("%s.pot", realfilename), "w", false); + Con_Printf("Dumping to %s.pot\n", realfilename); if(f) { for (i=0 ; iprogs->numglobaldefs ; i++) @@ -2377,7 +2379,7 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, const char **re } else { - po_t *po = PRVM_PO_Load(va("%s.%s.po", filename, prvm_language.string), prog->progs_mempool); + po_t *po = PRVM_PO_Load(va("%s.%s.po", realfilename, prvm_language.string), prog->progs_mempool); if(po) { for (i=0 ; iprogs->numglobaldefs ; i++)