From d9b2eb63976377d5e1e838b38506f5acce63bc53 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Tue, 6 Aug 2002 09:30:24 +0000 Subject: [PATCH] shareware stuff --- main/automap.c | 15 ++++-------- main/laser.c | 6 +++-- main/songs.c | 2 +- main/titles.c | 65 +++++++++++++++++++++++++------------------------- 4 files changed, 42 insertions(+), 46 deletions(-) diff --git a/main/automap.c b/main/automap.c index 60268fc9..9e74ffd3 100644 --- a/main/automap.c +++ b/main/automap.c @@ -1,3 +1,4 @@ +/* $Id: automap.c,v 1.6 2002-08-06 09:30:24 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -7,22 +8,14 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* - * $Source: /cvs/cvsroot/d2x/main/automap.c,v $ - * $Revision: 1.5 $ - * $Author: bradleyb $ - * $Date: 2002-02-15 12:24:53 $ * * FIXME: put description here * - * $Log: not supported by cvs2svn $ - * Revision 1.4 2001/10/31 11:16:08 bradleyb - * automap works in opengl - * * */ @@ -897,7 +890,7 @@ int Automap_active = 0; #ifdef RELEASE #define MAP_BACKGROUND_FILENAME (AutomapHires?"\x01MAPB.PCX":"\x01MAP.PCX") //load only from hog file #else -#define MAP_BACKGROUND_FILENAME (AutomapHires?"MAPB.PCX":"MAP.PCX") +#define MAP_BACKGROUND_FILENAME ((AutomapHires && cfexist("mapb.pcx"))?"MAPB.PCX":"MAP.PCX") #endif int Automap_always_hires=0; @@ -981,7 +974,7 @@ void do_automap( int key_code ) { set_screen_mode(SCREEN_GAME); #endif - FontHires = AutomapHires; + FontHires = FontHiresAvailable && AutomapHires; create_name_canv(); diff --git a/main/laser.c b/main/laser.c index df01c2c2..808380d7 100644 --- a/main/laser.c +++ b/main/laser.c @@ -1,4 +1,4 @@ -/* $Id: laser.c,v 1.6 2002-08-02 11:05:26 btb Exp $ */ +/* $Id: laser.c,v 1.7 2002-08-06 09:30:24 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -17,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -char laser_rcsid[] = "$Id: laser.c,v 1.6 2002-08-02 11:05:26 btb Exp $"; +char laser_rcsid[] = "$Id: laser.c,v 1.7 2002-08-06 09:30:24 btb Exp $"; #endif #include @@ -2070,10 +2070,12 @@ void create_smart_children(object *objp, int num_smart_children) blast_nearby_glass(objp, Weapon_info[EARTHSHAKER_ID].strength[Difficulty_level]); #ifndef SHAREWARE +#if 0 // -- DEBUG -- if ((objp->type == OBJ_WEAPON) && ((objp->id == SMART_ID) || (objp->id == SUPERPROX_ID) || (objp->id == ROBOT_SUPERPROX_ID) || (objp->id == EARTHSHAKER_ID))) Assert(Weapon_info[objp->id].children != -1); // -- DEBUG -- +#endif if (((objp->type == OBJ_WEAPON) && (Weapon_info[objp->id].children != -1)) || (objp->type == OBJ_ROBOT)) { int i, objnum; diff --git a/main/songs.c b/main/songs.c index 2e32ca3c..c4dfd7a1 100644 --- a/main/songs.c +++ b/main/songs.c @@ -253,7 +253,7 @@ int songs_haved2_cd() void songs_play_song( int songnum, int repeat ) { #ifndef SHAREWARE - Assert(songnum != SONG_ENDLEVEL && songnum != SONG_ENDGAME); //not in full version + //Assert(songnum != SONG_ENDLEVEL && songnum != SONG_ENDGAME); //not in full version #endif if ( !Songs_initialized ) diff --git a/main/titles.c b/main/titles.c index 5f45d8b4..56f621f7 100644 --- a/main/titles.c +++ b/main/titles.c @@ -1,3 +1,4 @@ +/* $Id: titles.c,v 1.9 2002-08-06 09:30:24 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -7,7 +8,7 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ @@ -558,7 +559,7 @@ int load_briefing_screen( int screen_num ) int pcx_error; WIN(DDGRLOCK(dd_grd_curcanv)); - if ((pcx_error=pcx_read_fullscr( CurBriefScreenName, 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)); @@ -573,31 +574,31 @@ int load_briefing_screen( int screen_num ) int load_new_briefing_screen( char *fname ) { - int pcx_error; + int pcx_error; - mprintf ((0,"Loading new briefing %s!\n",fname)); - strcpy (CurBriefScreenName,fname); + mprintf ((0,"Loading new briefing %s!\n",fname)); + strcpy (CurBriefScreenName,fname); -// WIN(DEFINE_SCREEN(CurBriefScreenName)); + //WIN(DEFINE_SCREEN(CurBriefScreenName)); - if (gr_palette_fade_out( New_pal, 32, 0 )) + if (gr_palette_fade_out( New_pal, 32, 0 )) return 0; -WIN(DDGRLOCK(dd_grd_curcanv)); - 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)); + WIN(DDGRLOCK(dd_grd_curcanv)); + 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); } -WIN(DDGRUNLOCK(dd_grd_curcanv)); + WIN(DDGRUNLOCK(dd_grd_curcanv)); -WIN(DDGRRESTORE); + WIN(DDGRRESTORE); gr_copy_palette(gr_palette, New_pal, sizeof(gr_palette)); - if (gr_palette_fade_in( New_pal, 32, 0 )) + if (gr_palette_fade_in( New_pal, 32, 0 )) return 0; - DoBriefingColorStuff(); + DoBriefingColorStuff(); return 1; } @@ -803,27 +804,27 @@ int show_briefing_message(int screen_num, char *message) message++; } fname[i]=0; - - if (MenuHires) - { - i=0; - while (fname[i]!='.') - i++; + + if (MenuHires) { + char fname2[15]; + + i=0; + while (fname[i]!='.') + fname2[i] = fname[i++]; #ifndef SHAREWARE - fname[i++]='b'; + fname2[i++]='b'; #endif - fname[i++]='.'; - fname[i++]='p'; - fname[i++]='c'; - fname[i++]='x'; - fname[i++]=0; + fname2[i++]='.'; + fname2[i++]='p'; + fname2[i++]='c'; + fname2[i++]='x'; + fname2[i++]=0; - load_new_briefing_screen (fname); - } - else - load_new_briefing_screen (fname); + load_new_briefing_screen (cfexist(fname2)?fname2:fname); + } else + load_new_briefing_screen (fname); - //load_new_briefing_screen (MenuHires?"end01b.pcx":"end01.pcx"); + //load_new_briefing_screen (MenuHires?"end01b.pcx":"end01.pcx"); } else if (ch == 'B') { char bitmap_name[32]; -- 2.39.2