In Endlevel sequence, re-align big explosion to draw in front of exit model, relative to viewer; Re-organized tex files for Briefings and Endings and created more general code to play them; Re-aligned Dravis' head
This commit is contained in:
parent
962a01cc5d
commit
69e3954d20
|
@ -1,5 +1,9 @@
|
|||
D1X-Rebirth Changelog
|
||||
|
||||
20100326
|
||||
--------
|
||||
main/endlevel.c, main/gameseq.c, main/mission.c, main/mission.h, main/titles.c, main/titles.h: In Endlevel sequence, re-align big explosion to draw in front of exit model, relative to viewer; Re-organized tex files for Briefings and Endings and created more general code to play them; Re-aligned Dravis' head
|
||||
|
||||
20100324
|
||||
--------
|
||||
arch/include/event.h, arch/include/mouse.h, arch/sdl/mouse.c, main/kconfig.c, main/movie.c, main/newmenu.c, main/titles.c: Add EVENT_MOUSE_BUTTON_DOWN and EVENT_MOUSE_BUTTON_UP, use for all windows except game and editor. Fixes crash on iMac G5 when pressing keys to progress through briefing
|
||||
|
|
|
@ -452,13 +452,15 @@ void do_endlevel_frame()
|
|||
|
||||
if (vm_vec_dot(&tvec,&mine_exit_orient.fvec) > 0) {
|
||||
object *tobj;
|
||||
vms_vector mov_vec;
|
||||
|
||||
outside_mine = 1;
|
||||
|
||||
tobj = object_create_explosion(exit_segnum,&mine_side_exit_point,i2f(50),VCLIP_BIG_PLAYER_EXPLOSION);
|
||||
|
||||
// Move explosion a bit to draw it in front of mine exit model
|
||||
vm_vec_scale_add(&tobj->pos,&tobj->pos,&tobj->orient.rvec,i2f(20));
|
||||
// Move explosion to Viewer to draw it in front of mine exit model
|
||||
vm_vec_normalized_dir_quick(&mov_vec,&Viewer->pos,&tobj->pos);
|
||||
vm_vec_scale_add2(&tobj->pos,&mov_vec,i2f(30));
|
||||
|
||||
if (tobj) {
|
||||
external_explosion = *tobj;
|
||||
|
|
|
@ -971,6 +971,8 @@ int AdvanceLevel(int secret_flag)
|
|||
}
|
||||
#endif
|
||||
|
||||
key_flush();
|
||||
|
||||
#ifdef NETWORK
|
||||
if (Game_mode & GM_MULTI)
|
||||
{
|
||||
|
@ -986,17 +988,15 @@ int AdvanceLevel(int secret_flag)
|
|||
}
|
||||
#endif
|
||||
|
||||
key_flush();
|
||||
|
||||
if (Current_level_num == Last_level) { //player has finished the game!
|
||||
|
||||
Function_mode = FMODE_MENU;
|
||||
if ((Newdemo_state == ND_STATE_RECORDING) || (Newdemo_state == ND_STATE_PAUSED))
|
||||
newdemo_stop_recording();
|
||||
|
||||
#ifndef SHAREWARE
|
||||
songs_play_song( SONG_ENDGAME, 0 );
|
||||
#endif
|
||||
|
||||
do_end_game();
|
||||
do_end_briefing_screens(Ending_text_filename);
|
||||
return 1;
|
||||
|
||||
} else {
|
||||
|
@ -1026,6 +1026,10 @@ int AdvanceLevel(int secret_flag)
|
|||
|
||||
}
|
||||
|
||||
key_flush();
|
||||
|
||||
Game_mode = GM_GAME_OVER;
|
||||
|
||||
if (Game_wind)
|
||||
window_set_visible(Game_wind, 1);
|
||||
|
||||
|
|
|
@ -39,11 +39,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "u_mem.h"
|
||||
#include "ignorecase.h"
|
||||
|
||||
#define BIM_LAST_LEVEL 27
|
||||
#define BIM_LAST_SECRET_LEVEL -3
|
||||
#define BIM_BRIEFING_FILE "briefing.tex"
|
||||
#define BIM_ENDING_FILE "endreg.tex"
|
||||
|
||||
//mission list entry
|
||||
typedef struct mle {
|
||||
char *filename; // filename without extension
|
||||
|
@ -83,6 +78,9 @@ int load_mission_d1(void)
|
|||
for (i=0;i<Last_level;i++)
|
||||
sprintf(Level_names[i], "level%02d.sdl", i+1);
|
||||
|
||||
strcpy(Briefing_text_filename,BIMD1_BRIEFING_FILE);
|
||||
strcpy(Ending_text_filename,BIMD1_ENDING_FILE_SHARE);
|
||||
|
||||
break;
|
||||
case D1_MAC_SHARE_MISSION_HOGSIZE:
|
||||
N_secret_levels = 0;
|
||||
|
@ -94,6 +92,9 @@ int load_mission_d1(void)
|
|||
for (i=0;i<Last_level;i++)
|
||||
sprintf(Level_names[i], "level%02d.sdl", i+1);
|
||||
|
||||
strcpy(Briefing_text_filename,BIMD1_BRIEFING_FILE);
|
||||
strcpy(Ending_text_filename,BIMD1_ENDING_FILE_SHARE);
|
||||
|
||||
break;
|
||||
case D1_OEM_MISSION_HOGSIZE:
|
||||
case D1_OEM_10_MISSION_HOGSIZE:
|
||||
|
@ -111,6 +112,9 @@ int load_mission_d1(void)
|
|||
|
||||
Secret_level_table[0] = 10;
|
||||
|
||||
strcpy(Briefing_text_filename,BIMD1_BRIEFING_FILE);
|
||||
strcpy(Ending_text_filename,BIMD1_ENDING_FILE_OEM);
|
||||
|
||||
break;
|
||||
default:
|
||||
Int3(); // fall through
|
||||
|
@ -119,8 +123,8 @@ int load_mission_d1(void)
|
|||
case D1_MAC_MISSION_HOGSIZE:
|
||||
N_secret_levels = 3;
|
||||
|
||||
Last_level = BIM_LAST_LEVEL;
|
||||
Last_secret_level = BIM_LAST_SECRET_LEVEL;
|
||||
Last_level = BIMD1_LAST_LEVEL;
|
||||
Last_secret_level = BIMD1_LAST_SECRET_LEVEL;
|
||||
|
||||
//build level names
|
||||
for (i=0;i<Last_level;i++)
|
||||
|
@ -132,10 +136,11 @@ int load_mission_d1(void)
|
|||
Secret_level_table[1] = 21;
|
||||
Secret_level_table[2] = 24;
|
||||
|
||||
strcpy(Briefing_text_filename,BIMD1_BRIEFING_FILE);
|
||||
strcpy(Ending_text_filename,BIMD1_ENDING_FILE);
|
||||
|
||||
break;
|
||||
}
|
||||
strcpy(Briefing_text_filename,BIM_BRIEFING_FILE);
|
||||
strcpy(Ending_text_filename,BIM_ENDING_FILE);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
@ -476,8 +481,8 @@ int load_mission(mle *mission)
|
|||
//init vars
|
||||
Last_level = 0;
|
||||
Last_secret_level = 0;
|
||||
Briefing_text_filename[0] = 0;
|
||||
Ending_text_filename[0] = 0;
|
||||
memset(&Briefing_text_filename, '\0', sizeof(Briefing_text_filename));
|
||||
memset(&Ending_text_filename, '\0', sizeof(Ending_text_filename));
|
||||
|
||||
// for Descent 1 missions, load descent.hog
|
||||
if (!cfile_init("descent.hog", 1))
|
||||
|
|
|
@ -78,6 +78,13 @@ extern Mission *Current_mission; // current mission
|
|||
#define PLAYING_BUILTIN_MISSION (Current_mission->builtin_hogsize != 0)
|
||||
#define ANARCHY_ONLY_MISSION (Current_mission->anarchy_only_flag == 1)
|
||||
|
||||
#define BIMD1_LAST_LEVEL 27
|
||||
#define BIMD1_LAST_SECRET_LEVEL -3
|
||||
#define BIMD1_BRIEFING_FILE "briefing.tex"
|
||||
#define BIMD1_ENDING_FILE "endreg.tex"
|
||||
#define BIMD1_ENDING_FILE_OEM "endsat.tex"
|
||||
#define BIMD1_ENDING_FILE_SHARE "ending.tex"
|
||||
|
||||
//loads the named mission if it exists.
|
||||
//Returns true if mission loaded ok, else false.
|
||||
int load_mission_by_name (char *mission_name);
|
||||
|
|
182
main/titles.c
182
main/titles.c
|
@ -61,7 +61,6 @@ void title_save_game();
|
|||
void set_briefing_fontcolor ();
|
||||
|
||||
#define MAX_BRIEFING_COLORS 7
|
||||
#define SHAREWARE_ENDING_FILENAME "ending.tex"
|
||||
#define DEFAULT_BRIEFING_BKG "brief03.pcx"
|
||||
|
||||
int Briefing_text_colors[MAX_BRIEFING_COLORS];
|
||||
|
@ -220,7 +219,7 @@ void show_order_form()
|
|||
|
||||
//-----------------------------------------------------------------------------
|
||||
typedef struct {
|
||||
char bs_name[14]; // filename, eg merc01. Assumes .lbm suffix.
|
||||
char bs_name[16]; // filename, eg merc01. Assumes .lbm suffix.
|
||||
sbyte level_num;
|
||||
sbyte message_num;
|
||||
short text_ulx, text_uly; // upper left x,y of text window
|
||||
|
@ -230,8 +229,8 @@ typedef struct {
|
|||
#define BRIEFING_SECRET_NUM 31 // This must correspond to the first secret level which must come at the end of the list.
|
||||
#define BRIEFING_OFFSET_NUM 4 // This must correspond to the first level screen (ie, past the bald guy briefing screens)
|
||||
|
||||
#define SHAREWARE_ENDING_LEVEL_NUM 0x7f
|
||||
#define REGISTERED_ENDING_LEVEL_NUM 0x7e
|
||||
#define ENDING_LEVEL_NUM_OEMSHARE 0x7f
|
||||
#define ENDING_LEVEL_NUM_REGISTER 0x7e
|
||||
#define Briefing_screens_LH ((SWIDTH >= 640 && SHEIGHT >= 480 && cfexist( "brief01h.pcx"))?Briefing_screens_h:Briefing_screens)
|
||||
|
||||
briefing_screen Briefing_screens[] = {
|
||||
|
@ -251,7 +250,6 @@ briefing_screen Briefing_screens[] = {
|
|||
{ "merc01.pcx", 6, 11, 10, 15, 300, 200 }, // level 6
|
||||
{ "merc01.pcx", 7, 12, 10, 15, 300, 200 }, // level 7
|
||||
|
||||
#ifndef SHAREWARE
|
||||
{ "brief03.pcx", 8, 13, 20, 22, 257, 177 },
|
||||
{ "mars01.pcx", 8, 14, 10, 100, 300, 200 }, // level 8
|
||||
{ "mars01.pcx", 9, 15, 10, 100, 300, 200 }, // level 9
|
||||
|
@ -286,14 +284,11 @@ briefing_screen Briefing_screens[] = {
|
|||
{ "aster01.pcx", -1, 38, 10, 90, 300, 200 }, // secret level -1
|
||||
{ "aster01.pcx", -2, 39, 10, 90, 300, 200 }, // secret level -2
|
||||
{ "aster01.pcx", -3, 40, 10, 90, 300, 200 }, // secret level -3
|
||||
#endif
|
||||
|
||||
{ "end01.pcx", SHAREWARE_ENDING_LEVEL_NUM, 1, 23, 40, 320, 200 }, // shareware end
|
||||
#ifndef SHAREWARE
|
||||
{ "end02.pcx", REGISTERED_ENDING_LEVEL_NUM, 1, 5, 5, 300, 200 }, // registered end
|
||||
{ "end01.pcx", REGISTERED_ENDING_LEVEL_NUM, 2, 23, 40, 320, 200 }, // registered end
|
||||
{ "end03.pcx", REGISTERED_ENDING_LEVEL_NUM, 3, 5, 5, 300, 200 }, // registered end
|
||||
#endif
|
||||
{ "end01.pcx", ENDING_LEVEL_NUM_OEMSHARE, 1, 23, 40, 320, 200 }, // OEM and shareware end
|
||||
{ "end02.pcx", ENDING_LEVEL_NUM_REGISTER, 1, 5, 5, 300, 200 }, // registered end
|
||||
{ "end01.pcx", ENDING_LEVEL_NUM_REGISTER, 2, 23, 40, 320, 200 }, // registered end
|
||||
{ "end03.pcx", ENDING_LEVEL_NUM_REGISTER, 3, 5, 5, 300, 200 }, // registered end
|
||||
|
||||
};
|
||||
|
||||
|
@ -314,7 +309,6 @@ briefing_screen Briefing_screens_h[] = { // hires screens
|
|||
{ "merc01h.pcx", 6, 11, 10, 15, 300, 200 }, // level 6
|
||||
{ "merc01h.pcx", 7, 12, 10, 15, 300, 200 }, // level 7
|
||||
|
||||
#ifndef SHAREWARE
|
||||
{ "brief03h.pcx", 8, 13, 20, 22, 257, 177 },
|
||||
{ "mars01h.pcx", 8, 14, 10, 100, 300, 200 }, // level 8
|
||||
{ "mars01h.pcx", 9, 15, 10, 100, 300, 200 }, // level 9
|
||||
|
@ -349,14 +343,11 @@ briefing_screen Briefing_screens_h[] = { // hires screens
|
|||
{ "aster01h.pcx", -1, 38, 10, 90, 300, 200 }, // secret level -1
|
||||
{ "aster01h.pcx", -2, 39, 10, 90, 300, 200 }, // secret level -2
|
||||
{ "aster01h.pcx", -3, 40, 10, 90, 300, 200 }, // secret level -3
|
||||
#endif
|
||||
|
||||
{ "end01h.pcx", SHAREWARE_ENDING_LEVEL_NUM, 1, 23, 40, 320, 200 }, // shareware end
|
||||
#ifndef SHAREWARE
|
||||
{ "end02h.pcx", REGISTERED_ENDING_LEVEL_NUM, 1, 5, 5, 300, 200 }, // registered end
|
||||
{ "end01h.pcx", REGISTERED_ENDING_LEVEL_NUM, 2, 23, 40, 320, 200 }, // registered end
|
||||
{ "end03h.pcx", REGISTERED_ENDING_LEVEL_NUM, 3, 5, 5, 300, 200 }, // registered end
|
||||
#endif
|
||||
{ "end01h.pcx", ENDING_LEVEL_NUM_OEMSHARE, 1, 23, 40, 320, 200 }, // OEM and shareware end
|
||||
{ "end02h.pcx", ENDING_LEVEL_NUM_REGISTER, 1, 5, 5, 300, 200 }, // registered end
|
||||
{ "end01h.pcx", ENDING_LEVEL_NUM_REGISTER, 2, 23, 40, 320, 200 }, // registered end
|
||||
{ "end03h.pcx", ENDING_LEVEL_NUM_REGISTER, 3, 5, 5, 300, 200 }, // registered end
|
||||
|
||||
};
|
||||
|
||||
|
@ -407,7 +398,7 @@ void briefing_init(briefing *br, short level_num)
|
|||
br->cur_screen = 0;
|
||||
br->screen = NULL;
|
||||
gr_init_bitmap_data (&br->background);
|
||||
strcpy(br->background_name, DEFAULT_BRIEFING_BKG);
|
||||
strncpy(br->background_name, DEFAULT_BRIEFING_BKG, sizeof(br->background_name));
|
||||
br->robot_canv = NULL;
|
||||
br->bitmap_name[0] = '\0';
|
||||
br->door_dir = 1;
|
||||
|
@ -860,8 +851,7 @@ void show_briefing_bitmap(grs_bitmap *bmp)
|
|||
{
|
||||
grs_canvas *curcanv_save, *bitmap_canv;
|
||||
|
||||
bitmap_canv = gr_create_sub_canvas(grd_curcanv, 220*((double)SWIDTH/(HIRESMODE ? 640 : 320)), 45*((double)SHEIGHT/(HIRESMODE ? 480 : 200)),
|
||||
bmp->bm_w, bmp->bm_h);
|
||||
bitmap_canv = gr_create_sub_canvas(grd_curcanv, rescale_x(220), rescale_y(55), (bmp->bm_w*(SWIDTH/(HIRESMODE ? 640 : 320))),(bmp->bm_h*(SHEIGHT/(HIRESMODE ? 480 : 200))));
|
||||
curcanv_save = grd_curcanv;
|
||||
gr_set_current_canvas(bitmap_canv);
|
||||
#ifdef OGL
|
||||
|
@ -962,8 +952,8 @@ int load_briefing_screen(briefing *br, char *fname)
|
|||
free_briefing_screen(br);
|
||||
|
||||
gr_init_bitmap_data(&br->background);
|
||||
|
||||
strcpy (br->background_name,fname);
|
||||
if (stricmp(br->background_name, fname))
|
||||
strncpy (br->background_name,fname, sizeof(br->background_name));
|
||||
|
||||
if (!stricmp(fname, "brief02h.pcx") && baldguy_cheat)
|
||||
if ( bald_guy_load(new_baldguy_pcx, &br->background, BM_LINEAR, gr_palette) == 0)
|
||||
|
@ -1250,132 +1240,32 @@ void do_briefing_screens(char *filename, int level_num)
|
|||
event_process();
|
||||
}
|
||||
|
||||
#ifndef SHAREWARE
|
||||
void do_registered_end_game(void)
|
||||
void do_end_briefing_screens(char *filename)
|
||||
{
|
||||
briefing *br;
|
||||
window *wind;
|
||||
int level_num_screen = Current_level_num, showorder = 0;
|
||||
|
||||
if (!Ending_text_filename[0]) //no filename?
|
||||
return;
|
||||
if (!strlen(filename))
|
||||
return; // no filename, no ending
|
||||
|
||||
MALLOC(br, briefing, 1);
|
||||
if (!br)
|
||||
return;
|
||||
|
||||
briefing_init(br, REGISTERED_ENDING_LEVEL_NUM);
|
||||
|
||||
if ((Game_mode & GM_MULTI) && !(Game_mode & GM_MULTI_COOP))
|
||||
if (stricmp(filename, BIMD1_ENDING_FILE_OEM) == 0)
|
||||
{
|
||||
// Special ending for deathmatch!!
|
||||
int len = 40;
|
||||
|
||||
MALLOC(br->text, char, len);
|
||||
sprintf(br->text, "Test");
|
||||
songs_play_song( SONG_ENDGAME, 0 );
|
||||
level_num_screen = ENDING_LEVEL_NUM_OEMSHARE;
|
||||
showorder = 1;
|
||||
}
|
||||
else if (stricmp(filename, BIMD1_ENDING_FILE_SHARE) == 0)
|
||||
{
|
||||
songs_play_song( SONG_BRIEFING, 1 );
|
||||
level_num_screen = ENDING_LEVEL_NUM_OEMSHARE;
|
||||
showorder = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
songs_play_song( SONG_ENDGAME, 0 );
|
||||
level_num_screen = ENDING_LEVEL_NUM_REGISTER;
|
||||
}
|
||||
|
||||
if (!load_screen_text(Ending_text_filename, &br->text) && !((Game_mode & GM_MULTI) && !(Game_mode & GM_MULTI_COOP)))
|
||||
{
|
||||
d_free(br);
|
||||
return;
|
||||
}
|
||||
|
||||
wind = window_create(&grd_curscreen->sc_canvas, 0, 0, SWIDTH, SHEIGHT, (int (*)(window *, d_event *, void *))briefing_handler, br);
|
||||
if (!wind)
|
||||
{
|
||||
d_free(br->text);
|
||||
d_free(br);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!new_briefing_screen(br, 1))
|
||||
{
|
||||
window_close(wind);
|
||||
return;
|
||||
}
|
||||
|
||||
// Stay where we are in the stack frame until briefing done
|
||||
// Too complicated otherwise
|
||||
while (window_exists(wind))
|
||||
event_process();
|
||||
}
|
||||
#endif
|
||||
|
||||
void do_shareware_end_game(void)
|
||||
{
|
||||
briefing *br;
|
||||
window *wind;
|
||||
|
||||
#ifdef NETWORK
|
||||
if ((Game_mode & GM_MULTI) && !(Game_mode & GM_MULTI_COOP))
|
||||
{
|
||||
kmatrix_view(1);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
MALLOC(br, briefing, 1);
|
||||
if (!br)
|
||||
return;
|
||||
|
||||
briefing_init(br, SHAREWARE_ENDING_LEVEL_NUM);
|
||||
|
||||
#ifdef DEST_SAT
|
||||
load_screen_text(Ending_text_filename, &br->text);
|
||||
#else
|
||||
load_screen_text(SHAREWARE_ENDING_FILENAME, &br->text);
|
||||
#endif
|
||||
|
||||
wind = window_create(&grd_curscreen->sc_canvas, 0, 0, SWIDTH, SHEIGHT, (int (*)(window *, d_event *, void *))briefing_handler, br);
|
||||
if (!wind)
|
||||
{
|
||||
d_free(br->text);
|
||||
d_free(br);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!new_briefing_screen(br, 1))
|
||||
{
|
||||
window_close(wind);
|
||||
return;
|
||||
}
|
||||
|
||||
// Stay where we are in the stack frame until briefing done
|
||||
// Too complicated otherwise
|
||||
while (window_exists(wind))
|
||||
event_process();
|
||||
}
|
||||
|
||||
void do_end_game(void)
|
||||
{
|
||||
set_screen_mode( SCREEN_MENU );
|
||||
gr_set_current_canvas(NULL);
|
||||
|
||||
key_flush();
|
||||
|
||||
#ifdef SHAREWARE
|
||||
do_shareware_end_game(); //hurrah! you win!
|
||||
#else
|
||||
#ifdef DEST_SAT
|
||||
do_shareware_end_game(); //hurrah! you win!
|
||||
#else
|
||||
do_registered_end_game(); //hurrah! you win!
|
||||
#endif
|
||||
#endif
|
||||
|
||||
key_flush();
|
||||
|
||||
Function_mode = FMODE_MENU;
|
||||
|
||||
Game_mode = GM_GAME_OVER;
|
||||
|
||||
#ifdef DEST_SAT
|
||||
do_briefing_screens(filename, level_num_screen);
|
||||
if (showorder)
|
||||
show_order_form();
|
||||
#endif
|
||||
|
||||
#ifdef SHAREWARE
|
||||
show_order_form();
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
|
||||
extern void show_titles(void);
|
||||
extern void do_briefing_screens(char *filename, int level_num);
|
||||
extern void do_end_game(void);
|
||||
extern void do_end_briefing_screens(char *filename);
|
||||
extern char * get_briefing_screen( int level_num );
|
||||
extern void show_order_form(void);
|
||||
extern void bald_guy_cheat(int key);
|
||||
|
|
Loading…
Reference in a new issue