From 3bfa09ec11c18be28c22d5fc31c9541a7c3b68c3 Mon Sep 17 00:00:00 2001 From: Meep-Eep Date: Sun, 9 Sep 2007 00:03:03 +0000 Subject: [PATCH] Content is looked for in the current dir now as intended. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2852 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 2 ++ sc2/src/options.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index e45d8c2f0..60e812bcc 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,6 @@ Changes towards version 0.7: +- The current directory is now among the locations searched for the content + when no explicit location has been specified. (bug fix) - from Nic - Non-3DO Shipspin anims now use Presentations - Michael - Added presentaion commands TEXT, TE (text effect), MOVIE - Alex - Increased the size of display queue (elements were sometimes missing diff --git a/sc2/src/options.c b/sc2/src/options.c index 3435c1eff..e5703b5d7 100644 --- a/sc2/src/options.c +++ b/sc2/src/options.c @@ -125,7 +125,7 @@ prepareContentDir (const char *contentDirName, const char **addons) // Try the default content locations. const char *locs[] = { CONTENTDIR, /* defined in config.h */ - "" + "", "content", "../../content" /* For running from MSVC */ };