diff options
Diffstat (limited to 'games/doomlegacy/files/patch-src_d__main.c')
| -rw-r--r-- | games/doomlegacy/files/patch-src_d__main.c | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/games/doomlegacy/files/patch-src_d__main.c b/games/doomlegacy/files/patch-src_d__main.c index f7184d3238a3..43247157ff16 100644 --- a/games/doomlegacy/files/patch-src_d__main.c +++ b/games/doomlegacy/files/patch-src_d__main.c @@ -1,27 +1,26 @@ ---- src/d_main.c.orig 2017-03-03 19:49:10 UTC +--- src/d_main.c.orig 2018-07-25 10:14:34 UTC +++ src/d_main.c -@@ -439,11 +439,13 @@ extern char mac_user_home[FILENAME_SIZE] - void owner_wad_search_order( void ) - { - // Wad search order. -+#if 0 - if( defdir_stat ) - { - // Search current dir near first, for other wad searches. - doomwaddir[1] = defdir; +@@ -454,18 +454,20 @@ void owner_wad_search_order( void ) + } + else + if( (strcmp( defdir, cv_home.string ) != 0) // not home directory +- && (strcmp( defdir, progdir ) != 0) // not program directory +- && (strcmp( defdir, progdir_wads ) != 0) ) // not wads directory +- { ++ ) { if( verbose ) ++ GenPrintf( EMSG_ver, "User's home is default dir, not searched.\n"); ++ } else { + defdir_search = 1; + // Search current dir near first, for other wad searches. + doomwaddir[1] = defdir; + } } -+#endif ++#if 0 // only useful for developers, missing NULL checks // Search progdir/wads early, for other wad searches. doomwaddir[2] = progdir_wads; // Search last, for other wad searches. -@@ -1160,8 +1162,10 @@ void Print_search_directories( byte emf - // Verbose only. For IWAD or legacy.wad they are in doomwaddir entries. - if( (enables==0x0F) && progdir_wads ) - GenPrintf(emf, " : %s\n", progdir_wads ); -+#if 0 - if( (enables==0x0F) && defdir ) - GenPrintf(emf, " defdir: %s\n", defdir ); + doomwaddir[MAX_NUM_DOOMWADDIR-1] = progdir; +#endif - #ifdef LEGACYWADDIR - GenPrintf(emf, " LEGACYWADDIR: %s\n", LEGACYWADDIR ); - #endif + } + + |