From 1a95389164e49980a8901873aa4668c010063cfe Mon Sep 17 00:00:00 2001 From: ennewalker Date: Fri, 19 Dec 2008 01:34:31 +0000 Subject: Documenting Win98 fix. (And minor clean up.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7864 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/docs/changes.stone_soup | 1 + crawl-ref/source/libwt.cc | 5 +---- 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]; -- cgit v1.2.3-54-g00ecf