TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add support for Macintosh splash screens and menu backgrounds in descent.hog, but not fonts (yet)

Browse source
This commit is contained in:
kreatordxx 2008-02-21 10:32:34 +00:00
parent a1beb821ea
commit c356ebcf69
4 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D1X-Rebirth Changelog
20080221
--------
main/inferno.c, main/newmenu.c, main/titles.c: add support for Macintosh splash screens and menu backgrounds in descent.hog, but not fonts (yet)
20080217
--------
d1x-rebirth.xcodeproj, main/game.c, main/newmenu.c: get SDL Video build to work again

10
main/inferno.c
View file

@ -361,7 +361,15 @@ int main(int argc,char *argv[])
if (!GameArg.SysNoTitles)
{
show_title_screen( "iplogo1.pcx", 1 );
char publisher[16];
strcpy(publisher, "macplay.pcx"); // Mac Shareware
if (!PHYSFS_exists(publisher))
strcpy(publisher, "mplaycd.pcx"); // Mac Registered
if (!PHYSFS_exists(publisher))
strcpy(publisher, "iplogo1.pcx"); // PC. Only down here because it's lowres ;-)
show_title_screen( publisher, 1 );
show_title_screen( "logo.pcx", 1 );
show_title_screen( "descent.pcx", 1 );
}

2
main/newmenu.c
View file

@ -174,7 +174,7 @@ void nm_draw_background(int x1, int y1, int x2, int y2 )
grs_bitmap bg;
old=grd_curcanv;
tmp=gr_create_sub_canvas(old,x1,y1,w,h);
gr_init_sub_bitmap(&bg,&nm_background,0,0,w*(320.0/SWIDTH),h*(200.0/SHEIGHT));//note that we haven't replaced current_canvas yet, so these macros are still ok.
gr_init_sub_bitmap(&bg,&nm_background,0,0,w*(((float) nm_background.bm_w)/SWIDTH),h*(((float) nm_background.bm_h)/SHEIGHT));//note that we haven't replaced current_canvas yet, so these macros are still ok.
gr_set_current_canvas(tmp);
gr_palette_load( gr_palette );

15
main/titles.c
View file

@ -1095,13 +1095,14 @@ void do_briefing_screens(int level_num)
void show_order_form()
{
show_title_screen(
#ifdef SHAREWARE
"order01.pcx",
#else
"warning.pcx",
#endif
1);
char exit_screen[16];
strcpy(exit_screen, "apple.pcx"); // D1 Mac OEM Demo
if (! cfexist(exit_screen))
strcpy(exit_screen, "order01.pcx"); // D1 Demo
if (! cfexist(exit_screen))
strcpy(exit_screen, "warning.pcx"); // D1 Registered
show_title_screen(exit_screen, 1);
}
#ifndef SHAREWARE