From 0828ca02eba1e10ad4cf910f93c204eee08c5745 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Thu, 8 Nov 2001 10:30:28 +0000 Subject: [PATCH] Enabled shareware build, endlevel flythrough sequence --- acconfig.h | 4 ++++ configure.in | 8 +++++++ main/collide.c | 9 ++++++-- main/endlevel.c | 60 +++++++++++++++++++++++++++---------------------- main/endlevel.h | 10 ++++----- main/gameseq.c | 8 ++++++- main/gauges.c | 11 +++++++-- main/inferno.c | 48 ++++++++++++++++++++++++++++++++++++--- main/laser.c | 8 +++++-- main/menu.c | 2 +- main/menu.h | 3 ++- main/newmenu.c | 6 ++++- main/piggy.c | 9 +++++++- main/sounds.h | 2 +- main/switch.c | 4 +++- main/titles.c | 14 +++++++----- main/weapon.h | 6 +++++ 17 files changed, 158 insertions(+), 54 deletions(-) diff --git a/acconfig.h b/acconfig.h index ec26e9fd..40f37e9b 100644 --- a/acconfig.h +++ b/acconfig.h @@ -7,6 +7,9 @@ /* Define if you want to build the editor */ #undef EDITOR +/* Define if you want to build the demo version */ +#undef SHAREWARE + /* Define if you want an OpenGL build */ #undef OGL @@ -28,6 +31,7 @@ #define NMONO 1 #define PIGGY_USE_PAGING 1 #define NEWDEMO 1 +#define NMOVIES 1 #ifdef __linux__ # define __SDL__ 1 diff --git a/configure.in b/configure.in index aae1acd6..c7460a63 100644 --- a/configure.in +++ b/configure.in @@ -51,6 +51,14 @@ if test x$enable_editor = xyes; then fi AM_CONDITIONAL(EDITOR, test x$enable_editor = xyes) +dnl Enable shareware build? +AC_ARG_ENABLE(shareware, + [ --enable-shareware Build for demo datafile (not functional)],,) +if test x$enable_shareware = xyes; then + AC_DEFINE(SHAREWARE) +fi +AM_CONDITIONAL(SHAREWARE, test x$enable_shareware = xyes) + dnl Enable cross-platform bitmap/palette loader? AC_ARG_ENABLE(xploader, [ --enable-xploader Enable cross-platform bitmap/palette loader ],,) diff --git a/main/collide.c b/main/collide.c index 13bce909..5de0153b 100644 --- a/main/collide.c +++ b/main/collide.c @@ -13,13 +13,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. /* * $Source: /cvs/cvsroot/d2x/main/collide.c,v $ - * $Revision: 1.8 $ + * $Revision: 1.9 $ * $Author: bradleyb $ - * $Date: 2001-10-25 02:15:55 $ + * $Date: 2001-11-08 10:30:27 $ * * FIXME: put description here * * $Log: not supported by cvs2svn $ + * Revision 1.8 2001/10/25 02:15:55 bradleyb + * conditionalize including multi.h and network.h, fix backslashes + * * Revision 1.7 2001/10/18 00:01:00 bradleyb * RCS headers added/changed * @@ -2200,8 +2203,10 @@ void collide_player_and_weapon( object * playerobj, object * weapon, vms_vector smega_rock_stuff(); damage = fixmul(damage, weapon->ctype.laser_info.multiplier); +#ifndef SHAREWARE if (Game_mode & GM_MULTI) damage = fixmul(damage, Weapon_info[weapon->id].multi_damage_scale); +#endif if (weapon->mtype.phys_info.flags & PF_PERSISTENT) { diff --git a/main/endlevel.c b/main/endlevel.c index aa0daf06..4dbc8699 100644 --- a/main/endlevel.c +++ b/main/endlevel.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: endlevel.c,v 1.3 2001-10-25 02:15:56 bradleyb Exp $"; +static char rcsid[] = "$Id: endlevel.c,v 1.4 2001-11-08 10:30:27 bradleyb Exp $"; #endif //#define SLEW_ON 1 @@ -28,6 +28,7 @@ static char rcsid[] = "$Id: endlevel.c,v 1.3 2001-10-25 02:15:56 bradleyb Exp $" #include #include +#include // for isspace #include "fix.h" #include "vecmat.h" @@ -103,7 +104,12 @@ object *endlevel_camera; #define FLY_SPEED i2f(50) +void do_endlevel_flythrough(int n); +void draw_stars(); +int find_exit_side(object *obj); +void generate_starfield(); void start_endlevel_flythrough(int n,object *obj,fix speed); +void start_rendered_endlevel_sequence(); #ifdef D2_OEM char movie_table[] = { 'a','a','a','a','d','d','d','d' }; @@ -160,8 +166,6 @@ vms_matrix mine_exit_orient; int outside_mine; -void start_endlevel_flythrough(int n,object *obj,fix speed); - grs_bitmap terrain_bm_instance; grs_bitmap satellite_bm_instance; @@ -222,7 +226,7 @@ int start_endlevel_movie() memcpy(save_pal,gr_palette,768); - #ifndef SHAREWARE + #if !defined(SHAREWARE) && !defined (NMOVIES) r=PlayMovie(movie_name,(Game_mode & GM_MULTI)?0:MOVIE_REQUIRED); #else return 0; // movie not played for shareware @@ -255,7 +259,7 @@ free_endlevel_data() d_free(satellite_bm_instance.bm_data); } -init_endlevel() +void init_endlevel() { //##satellite_bitmap = bm_load("earth.bbm"); //##terrain_bitmap = bm_load("moon.bbm"); @@ -348,7 +352,7 @@ void start_endlevel_sequence() if (!(Game_mode & GM_MULTI)) movie_played = start_endlevel_movie(); - #ifdef SHAREWARE + #if defined(SHAREWARE) || defined(NMOVIES) if (movie_played == MOVIE_NOT_PLAYED) { //don't have movie. Do rendered sequence #ifndef WINDOWS start_rendered_endlevel_sequence(); @@ -364,7 +368,7 @@ void start_endlevel_sequence() PlayerFinishedLevel(0); //done with level } -#ifndef SHAREWARE +#if !defined(SHAREWARE) && !defined(NMOVIES) void do_endlevel_frame() {Int3();} void stop_endlevel_sequence() {Int3();} @@ -374,7 +378,7 @@ void render_endlevel_frame(fix eye_offset) {Int3();} static int cockpit_mode_save; -start_rendered_endlevel_sequence() +void start_rendered_endlevel_sequence() { int last_segnum,exit_side,tunnel_length; @@ -538,7 +542,7 @@ int chase_angles(vms_angvec *cur_angles,vms_angvec *desired_angles) return mask; } -stop_endlevel_sequence() +void stop_endlevel_sequence() { Interpolation_method = 0; @@ -557,7 +561,7 @@ stop_endlevel_sequence() //--unused-- vms_vector upvec = {0,f1_0,0}; //find the angle between the player's heading & the station -get_angs_to_object(vms_angvec *av,vms_vector *targ_pos,vms_vector *cur_pos) +void get_angs_to_object(vms_angvec *av,vms_vector *targ_pos,vms_vector *cur_pos) { vms_vector tv; @@ -566,9 +570,9 @@ get_angs_to_object(vms_angvec *av,vms_vector *targ_pos,vms_vector *cur_pos) vm_extract_angles_vector(av,&tv); } -do_endlevel_frame() +void do_endlevel_frame() { - #ifdef SHAREWARE + #if defined(SHAREWARE) || defined(NMOVIES) static fix timer; static fix bank_rate; #endif @@ -709,7 +713,7 @@ do_endlevel_frame() if (ConsoleObject->segnum == transition_segnum) { - #ifndef SHAREWARE + #if !defined(SHAREWARE) && !defined(NMOVIES) start_endlevel_movie(); stop_endlevel_sequence(); #else @@ -750,7 +754,7 @@ do_endlevel_frame() } -#ifdef SHAREWARE +#if defined(SHAREWARE) || defined(NMOVIES) case EL_LOOKBACK: { do_endlevel_flythrough(0); @@ -944,7 +948,7 @@ do_endlevel_frame() #define MIN_D 0x100 //find which side to fly out of -find_exit_side(object *obj) +int find_exit_side(object *obj) { int i; vms_vector prefvec,segcenter,sidevec; @@ -984,7 +988,7 @@ extern fix Render_zoom; //the player's zoom factor extern vms_vector Viewer_eye; //valid during render -draw_exit_model() +void draw_exit_model() { vms_vector model_pos; int f=15,u=0; //21; @@ -1004,7 +1008,7 @@ fix satellite_size = i2f(400); #define SATELLITE_WIDTH satellite_size #define SATELLITE_HEIGHT ((satellite_size*9)/4) //((satellite_size*5)/2) -render_external_scene(fix eye_offset) +void render_external_scene(fix eye_offset) { Viewer_eye = Viewer->pos; @@ -1063,7 +1067,7 @@ render_external_scene(fix eye_offset) vms_vector stars[MAX_STARS]; -generate_starfield() +void generate_starfield() { int i; @@ -1076,7 +1080,7 @@ generate_starfield() } } -draw_stars() +void draw_stars() { int i; int intensity=31; @@ -1126,7 +1130,7 @@ draw_stars() } -endlevel_render_mine(fix eye_offset) +void endlevel_render_mine(fix eye_offset) { int start_seg_num; @@ -1206,7 +1210,7 @@ fixang interp_angle(fixang dest,fixang src,fixang step); #define MIN_D 0x100 //if speed is zero, use default speed -start_endlevel_flythrough(int n,object *obj,fix speed) +void start_endlevel_flythrough(int n,object *obj,fix speed) { flydata = &fly_objects[n]; @@ -1232,7 +1236,7 @@ static vms_angvec *angvec_add2_scale(vms_angvec *dest,vms_vector *src,fix s) #define MAX_SLIDE_PER_SEGMENT 0x10000 -do_endlevel_flythrough(int n) +void do_endlevel_flythrough(int n) { object *obj; segment *pseg; @@ -1308,11 +1312,12 @@ do_endlevel_flythrough(int n) fix dist; for (i=0;i<6;i++) - if (i!=entry_side && i!=exit_side && i!=up_side && i!=Side_opposite[up_side]) + if (i!=entry_side && i!=exit_side && i!=up_side && i!=Side_opposite[up_side]) { if (s0==-1) s0 = i; else s1 = i; + } compute_center_point_on_side(&s0p,pseg,s0); compute_center_point_on_side(&s1p,pseg,s1); @@ -1466,7 +1471,7 @@ int convert_ext( char *dest, char *ext ) } //called for each level to load & setup the exit sequence -load_endlevel_data(int level_num) +void load_endlevel_data(int level_num) { char filename[13]; char line[LINE_LEN],*p; @@ -1492,11 +1497,11 @@ try_again: if (!ifile) { - convert_ext(filename,"TXB"); + convert_ext(filename,"txb"); ifile = cfopen(filename,"rb"); - if (!ifile) + if (!ifile) { if (level_num==1) { Error("Cannot load file text of binary version of <%s>",filename); } @@ -1504,6 +1509,7 @@ try_again: level_num = 1; goto try_again; } + } have_binary = 1; } @@ -1536,7 +1542,7 @@ try_again: switch (var) { case 0: { //ground terrain - int iff_error, i; + int iff_error; ubyte pal[768]; if (terrain_bm_instance.bm_data) diff --git a/main/endlevel.h b/main/endlevel.h index 08d44dbc..1baf0423 100644 --- a/main/endlevel.h +++ b/main/endlevel.h @@ -24,11 +24,11 @@ void stop_endlevel_sequence(); void start_endlevel_sequence(); void render_endlevel_frame(fix eye_offset); -#ifdef SHAREWARE +#if defined(SHAREWARE) || defined(NMOVIES) -render_external_scene(); -draw_exit_model(); -init_endlevel(); +void render_external_scene(); +void draw_exit_model(); +void init_endlevel(); extern grs_bitmap *terrain_bitmap; //*satellite_bitmap,*station_bitmap, extern int exit_segnum; @@ -38,7 +38,7 @@ extern int exit_segnum; //@@extern int ext_expl_playing; //called for each level to load & setup the exit sequence -load_endlevel_data(int level_num); +void load_endlevel_data(int level_num); extern int exit_modelnum,destroyed_exit_modelnum; diff --git a/main/gameseq.c b/main/gameseq.c index 47ff4872..e5dd8101 100644 --- a/main/gameseq.c +++ b/main/gameseq.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -char gameseq_rcsid[] = "$Id: gameseq.c,v 1.5 2001-10-25 02:15:56 bradleyb Exp $"; +char gameseq_rcsid[] = "$Id: gameseq.c,v 1.6 2001-11-08 10:30:27 bradleyb Exp $"; #endif #ifdef WINDOWS @@ -1558,7 +1558,9 @@ void DoEndGame(void) if (Current_mission_num == 0 && !(Game_mode & GM_MULTI)) //only built-in mission, & not multi { +#ifndef SHAREWARE int played=MOVIE_NOT_PLAYED; //default is not played +#endif #ifdef SHAREWARE songs_play_song( SONG_ENDGAME, 0 ); @@ -2145,7 +2147,9 @@ void ShowLevelIntro(int level_num) //if shareware, show a briefing? if (!(Game_mode & GM_MULTI)) { +#ifndef SHAREWARE int i; +#endif ubyte save_pal[sizeof(gr_palette)]; memcpy(save_pal,gr_palette,sizeof(gr_palette)); @@ -2157,7 +2161,9 @@ void ShowLevelIntro(int level_num) if (Current_mission_num==0) { +#ifndef SHAREWARE int movie=0; +#endif #ifdef SHAREWARE if (level_num==1) { diff --git a/main/gauges.c b/main/gauges.c index f5a8ae9f..78d9fc2e 100644 --- a/main/gauges.c +++ b/main/gauges.c @@ -13,13 +13,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. /* * $Source: /cvs/cvsroot/d2x/main/gauges.c,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * $Author: bradleyb $ - * $Date: 2001-11-04 09:00:25 $ + * $Date: 2001-11-08 10:30:27 $ * * Inferno gauge drivers * * $Log: not supported by cvs2svn $ + * Revision 1.5 2001/11/04 09:00:25 bradleyb + * Enable d1x-style hud_message + * * */ @@ -2369,13 +2372,17 @@ void draw_weapon_info_sub(int info_index,gauge_box *box,int pic_x,int pic_y,char PA_DFX (pa_set_backbuffer_current()); gr_rect(box->left,box->top,box->right,box->bot); +#ifndef SHAREWARE if (Current_display_mode) { bm=&GameBitmaps[Weapon_info[info_index].hires_picture.index]; PIGGY_PAGE_IN( Weapon_info[info_index].hires_picture ); } else { +#endif bm=&GameBitmaps[Weapon_info[info_index].picture.index]; PIGGY_PAGE_IN( Weapon_info[info_index].picture ); +#ifndef SHAREWARE } +#endif Assert(bm != NULL); diff --git a/main/inferno.c b/main/inferno.c index d51d37a2..b28c8e9e 100644 --- a/main/inferno.c +++ b/main/inferno.c @@ -13,13 +13,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. /* * $Source: /cvs/cvsroot/d2x/main/inferno.c,v $ - * $Revision: 1.15 $ + * $Revision: 1.16 $ * $Author: bradleyb $ - * $Date: 2001-11-05 07:39:08 $ + * $Date: 2001-11-08 10:30:28 $ * * FIXME: put description here * * $Log: not supported by cvs2svn $ + * Revision 1.15 2001/11/05 07:39:08 bradleyb + * Change args_init back to InitArgs + * * Revision 1.14 2001/11/04 09:01:41 bradleyb * SDL applies to more than X11... * @@ -426,7 +429,7 @@ void do_network_init() } #endif -#ifdef SHAREARE +#ifdef SHAREWARE #define PROGNAME "d2demo" #else #define PROGNAME "d2" @@ -614,7 +617,9 @@ int main(int argc,char **argv) else #endif { //NOTE LINK TO ABOVE! +#ifndef SHAREWARE int played=MOVIE_NOT_PLAYED; //default is not played +#endif int song_playing = 0; #ifdef D2_OEM @@ -980,6 +985,43 @@ void check_joystick_calibration() { } +void show_order_form() +{ +#if !defined(EDITOR) && (defined(SHAREWARE) || defined(D2_OEM)) + + int pcx_error; + char title_pal[768]; + char exit_screen[16]; + + gr_set_current_canvas( NULL ); + gr_palette_clear(); + + key_flush(); + + #ifdef D2_OEM + strcpy(exit_screen, MenuHires?"ordrd2ob.pcx":"ordrd2o.pcx"); + #else + #if defined(SHAREWARE) + strcpy(exit_screen, "orderd2.pcx"); + #else + strcpy(exit_screen, MenuHires?"warningb.pcx":"warning.pcx"); + #endif + #endif + + if ((pcx_error=pcx_read_bitmap( exit_screen, &grd_curcanv->cv_bitmap, grd_curcanv->cv_bitmap.bm_type, title_pal ))==PCX_ERROR_NONE) { + //vfx_set_palette_sub( title_pal ); + gr_palette_fade_in( title_pal, 32, 0 ); + key_getch(); + gr_palette_fade_out( title_pal, 32, 0 ); + } + else + Int3(); //can't load order screen + + key_flush(); + +#endif +} + void quit_request() { #ifdef NETWORK diff --git a/main/laser.c b/main/laser.c index 183ffbfe..7effd651 100644 --- a/main/laser.c +++ b/main/laser.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -char laser_rcsid[] = "$Id: laser.c,v 1.4 2001-10-25 02:15:56 bradleyb Exp $"; +char laser_rcsid[] = "$Id: laser.c,v 1.5 2001-11-08 10:30:28 bradleyb Exp $"; #endif #include @@ -2045,11 +2045,13 @@ extern void blast_nearby_glass(object *objp, fix damage); // Create the children of a smart bomb, which is a bunch of homing missiles. void create_smart_children(object *objp, int num_smart_children) { + int parent_type, parent_num; +#ifndef SHAREWARE int make_sound; int numobjs=0; - int parent_type, parent_num; int objlist[MAX_OBJDISTS]; int blob_id; +#endif if (objp->type == OBJ_WEAPON) { parent_type = objp->ctype.laser_info.parent_type; @@ -2066,6 +2068,7 @@ void create_smart_children(object *objp, int num_smart_children) if (objp->id == EARTHSHAKER_ID) blast_nearby_glass(objp, Weapon_info[EARTHSHAKER_ID].strength[Difficulty_level]); +#ifndef SHAREWARE // -- 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); @@ -2176,6 +2179,7 @@ void create_smart_children(object *objp, int num_smart_children) make_sound = 0; } } +#endif } int Missile_gun = 0; diff --git a/main/menu.c b/main/menu.c index 96ec9b71..d9e52ee1 100644 --- a/main/menu.c +++ b/main/menu.c @@ -222,7 +222,7 @@ try_again:; if ((d_rand() % (n_demos+1)) == 0) { - #ifndef SHAREWARE + #if !defined(SHAREWARE) && !defined(NMOVIES) #ifdef WINDOWS mouse_set_mode(1); //re-enable centering mode HideCursorW(); diff --git a/main/menu.h b/main/menu.h index e6818010..61fe0c6a 100644 --- a/main/menu.h +++ b/main/menu.h @@ -29,7 +29,8 @@ extern int MenuHires; #define Menu_pcx_name "\x01menud.pcx" //read only from hog file #endif #else - #define Menu_pcx_name (MenuHires?"menub.pcx":"menud.pcx") //name of background bitmap +// #define Menu_pcx_name (MenuHires?"menub.pcx":"menud.pcx") //name of background bitmap + #define Menu_pcx_name "menud.pcx" #endif #else #ifdef D2_OEM diff --git a/main/newmenu.c b/main/newmenu.c index a0e53d61..81529216 100644 --- a/main/newmenu.c +++ b/main/newmenu.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: newmenu.c,v 1.5 2001-10-31 09:59:34 bradleyb Exp $"; +static char rcsid[] = "$Id: newmenu.c,v 1.6 2001-11-08 10:30:28 bradleyb Exp $"; #endif #ifdef WINDOWS @@ -202,11 +202,15 @@ WIN(DDGRUNLOCK(dd_grd_curcanv)); } +#ifdef SHAREWARE +#define MENU_BACKGROUND_BITMAP "scores.pcx" +#else #ifdef RELEASE #define MENU_BACKGROUND_BITMAP (MenuHires?"\x01scoresb.pcx":"\x01scores.pcx") //read only from hog file #else #define MENU_BACKGROUND_BITMAP (MenuHires?"scoresb.pcx":"scores.pcx") #endif +#endif int Background_hires; int No_darkening=0; diff --git a/main/piggy.c b/main/piggy.c index fe918222..1bcda451 100644 --- a/main/piggy.c +++ b/main/piggy.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: piggy.c,v 1.5 2001-10-25 02:19:31 bradleyb Exp $"; +static char rcsid[] = "$Id: piggy.c,v 1.6 2001-11-08 10:30:28 bradleyb Exp $"; #endif @@ -963,7 +963,11 @@ digi_sound bogus_sound; extern void bm_read_all(CFILE * fp); #define HAMFILE_ID "HAM!" //HAM! +#ifdef SHAREWARE +#define HAMFILE_VERSION 2 +#else #define HAMFILE_VERSION 3 +#endif //version 1 -> 2: save marker_model_num //version 2 -> 3: removed sound files @@ -1000,6 +1004,9 @@ int read_hamfile() return 0; } + if (ham_version < 3) //mystery value + cfseek(ham_fp, 4, SEEK_CUR); + #ifndef EDITOR { bm_read_all( ham_fp ); // Note connection to above if!!! diff --git a/main/sounds.h b/main/sounds.h index 2d748532..f39d58fd 100644 --- a/main/sounds.h +++ b/main/sounds.h @@ -102,7 +102,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #define ROBOT_ATTACK_SOUND_DEFAULT 171 #define ROBOT_CLAW_SOUND_DEFAULT 190 -#ifdef SHAREWARE +#if defined(SHAREWARE) || defined(NMOVIES) #define SOUND_BIG_ENDLEVEL_EXPLOSION SOUND_EXPLODING_WALL #define SOUND_TUNNEL_EXPLOSION SOUND_EXPLODING_WALL #endif diff --git a/main/switch.c b/main/switch.c index 76a9ece9..bfd9e88e 100644 --- a/main/switch.c +++ b/main/switch.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: switch.c,v 1.4 2001-10-25 02:15:57 bradleyb Exp $"; +static char rcsid[] = "$Id: switch.c,v 1.5 2001-11-08 10:30:28 bradleyb Exp $"; #endif #include @@ -437,7 +437,9 @@ int check_trigger_sub(int trigger_num, int pnum,int shot) break; case TT_SECRET_EXIT: { +#ifndef SHAREWARE int truth; +#endif if (pnum!=Player_num) break; diff --git a/main/titles.c b/main/titles.c index 66edeabe..4148b1e8 100644 --- a/main/titles.c +++ b/main/titles.c @@ -771,12 +771,14 @@ int show_briefing_message(int screen_num, char *message) i=0; while (fname[i]!='.') i++; - fname[i]='b'; - fname[i+1]='.'; - fname[i+2]='p'; - fname[i+3]='c'; - fname[i+4]='x'; - fname[i+5]=0; +#ifndef SHAREWARE + fname[i++]='b'; +#endif + fname[i++]='.'; + fname[i++]='p'; + fname[i++]='c'; + fname[i++]='x'; + fname[i++]=0; load_new_briefing_screen (fname); } diff --git a/main/weapon.h b/main/weapon.h index aca1ee3f..0573dc90 100644 --- a/main/weapon.h +++ b/main/weapon.h @@ -52,12 +52,16 @@ typedef struct weapon_info { byte flash; // Flash effect byte afterburner_size; // Size of blobs in F1_0/16 units, specify in bitmaps.tbl as floating point. Player afterburner size = 2.5. +#ifndef SHAREWARE byte children; // ID of weapon to drop if this contains children. -1 means no children. +#endif fix energy_usage; // How much fuel is consumed to fire this weapon. fix fire_wait; // Time until this weapon can be fired again. +#ifndef SHAREWARE fix multi_damage_scale; // Scale damage by this amount when applying to player in multiplayer. F1_0 means no change. +#endif bitmap_index bitmap; // Pointer to bitmap if rendertype==0 or 1. @@ -76,7 +80,9 @@ typedef struct weapon_info { //-- unused-- fix damage_force; // Force of damage caused by weapon, used for missiles (not lasers) to apply to damage to things it did not hit // damage_force was a real mess. Wasn't Difficulty_level based, and was being applied instead of weapon's actual strength. Now use 2*strength instead. --MK, 01/19/95 bitmap_index picture; // a picture of the weapon for the cockpit +#ifndef SHAREWARE bitmap_index hires_picture; // a hires picture of the above +#endif } __pack__ weapon_info; #define REARM_TIME (F1_0) -- 2.39.2