From ece0b9753d6b7fa7d9827f4c80fbee707b80ab28 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Tue, 30 Jul 2002 11:29:04 +0000 Subject: [PATCH] support shareware datafiles\! --- NEWS | 1 + main/menu.c | 8 ++++---- main/titles.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index f45c636d..02c2f755 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ - Lots of portability fixes - OS X support! - Other bigendian linux/unix support? +- Shareware data files support! --- Version 0.1.3 --- - deb and rpm support added diff --git a/main/menu.c b/main/menu.c index 462d3ec1..24f2d0b6 100644 --- a/main/menu.c +++ b/main/menu.c @@ -882,7 +882,7 @@ void do_screen_res_menu() if (i >= 3) i++; -#ifdef SHAREWARE +#if 0 //def SHAREWARE if (i > 1) nm_messagebox(TXT_SORRY, 1, TXT_OK, "High resolution modes are\n" @@ -1017,17 +1017,17 @@ void do_screen_res_menu() } #endif - #ifdef SHAREWARE +#if 0 //def SHAREWARE if (i != 0) nm_messagebox(TXT_SORRY, 1, TXT_OK, "High resolution modes are\n" "only available in the\n" "Commercial version of Descent 2."); return; - #else +#else if (i != Current_display_mode) set_display_mode(i); - #endif +#endif } #endif // end of PC version of do_screen_res_menu() diff --git a/main/titles.c b/main/titles.c index bb9d8faa..b26784ba 100644 --- a/main/titles.c +++ b/main/titles.c @@ -558,7 +558,7 @@ int load_briefing_screen( int screen_num ) int pcx_error; WIN(DDGRLOCK(dd_grd_curcanv)); - if ((pcx_error=pcx_read_bitmap( CurBriefScreenName, &grd_curcanv->cv_bitmap, grd_curcanv->cv_bitmap.bm_type, New_pal ))!=PCX_ERROR_NONE) { + if ((pcx_error=pcx_read_fullscr( CurBriefScreenName, New_pal ))!=PCX_ERROR_NONE) { printf( "File '%s', PCX load error: %s\n (It's a briefing screen. Does this cause you pain?)\n",Briefing_screens[screen_num].bs_name, pcx_errormsg(pcx_error)); printf( "File '%s', PCX load error: %s (%i)\n (It's a briefing screen. Does this cause you pain?)\n",Briefing_screens[screen_num].bs_name, pcx_errormsg(pcx_error), pcx_error); WIN(DDGRUNLOCK(dd_grd_curcanv)); @@ -584,7 +584,7 @@ int load_new_briefing_screen( char *fname ) return 0; WIN(DDGRLOCK(dd_grd_curcanv)); - if ((pcx_error=pcx_read_bitmap( fname, &grd_curcanv->cv_bitmap, grd_curcanv->cv_bitmap.bm_type, New_pal ))!=PCX_ERROR_NONE) { + if ((pcx_error=pcx_read_fullscr( fname, New_pal ))!=PCX_ERROR_NONE) { printf( "File '%s', PCX load error: %s (%i)\n (It's a briefing screen. Does this cause you pain?)\n",fname, pcx_errormsg(pcx_error), pcx_error); WIN(DDGRUNLOCK(dd_grd_curcanv)); Error( "Error loading briefing screen <%s>, PCX load error: %s (%i)\n",fname, pcx_errormsg(pcx_error), pcx_error); -- 2.39.2