summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/docs/changes.stone_soup1
-rw-r--r--crawl-ref/source/libwt.cc5
2 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index 57bcf164f4..ba7d969304 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -25,6 +25,7 @@ Disclaimer: These are merely the highlights, not an exhaustive list of changes.
* Fixed backwards stealth check.
* Fixed recharged wands not being inscribed with zap counts.
* Fixed bad names for god-gifted unrandarts.
+* Fixed crash related to running on Windows 98.
* Warn player if interlevel travel intends to take detours.
* Make multi-corpse sacrifices take 1 turn only.
* All 't' commands now take a turn.
diff --git a/crawl-ref/source/libwt.cc b/crawl-ref/source/libwt.cc
index eb48c63a12..82e561a8f4 100644
--- a/crawl-ref/source/libwt.cc
+++ b/crawl-ref/source/libwt.cc
@@ -202,11 +202,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
}
// I'll be damned if I have to parse lpCmdLine myself...
- int argc;
+ int argc = 0;
LPWSTR *wargv = CommandLineToArgvW(GetCommandLineW(), &argc);
- // Windows 98 fix.
- if (!wargv)
- argc = 0;
char **argv = new char*[argc];
int args_len = wcslen(GetCommandLineW()) + argc;
char *args = new char[args_len];