From c5430a207dade04711afc1d2c68454a6e606294e Mon Sep 17 00:00:00 2001 From: meep-eep Date: Sun, 16 Mar 2003 10:31:48 +0000 Subject: [PATCH] Bug fixed where the users key config was ignored, because the one in the content dir was reloaded when the starcon.pkg/starcon.ndx package was loaded. This 'fix' makes the entry in starcon.ndx invalid. It will be completely removed when the new resource system is there. For now, you'll receive a warning "Can't open 'ignored.key'" on startup, which should be ignored. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@888 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/content/starcon.ndx | Bin 10370 -> 10370 bytes sc2/src/sc2code/setup.c | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sc2/content/starcon.ndx b/sc2/content/starcon.ndx index 403dd57a410bc0e20250b4ff0f3790a9485ee426..102881b52fde1823bf266d007f4a9a993dbd3084 100644 GIT binary patch delta 20 bcmZn)Yzo|vD#)Iho|j*gnzA`ZP)r;EP}Bz* delta 20 bcmZn)Yzo|vD#%`3l30|SpSL+jP)r;EQGN$2 diff --git a/sc2/src/sc2code/setup.c b/sc2/src/sc2code/setup.c index 2843e7fc5..499103a27 100644 --- a/sc2/src/sc2code/setup.c +++ b/sc2/src/sc2code/setup.c @@ -282,7 +282,7 @@ initKeyConfig(void) { cb = snprintf (userFile, PATH_MAX, "%skeys.cfg", configDir); assert (cb != -1); - // strlen (configDir) <= PATH_MAX - 13 + // Verified before: strlen (configDir) <= PATH_MAX - 13 if (fileExists (userFile)) { fp = res_OpenResFile (userFile, "rt");