scale Mac fonts correctly

This commit is contained in:
kreatordxx 2008-03-22 08:30:23 +00:00
parent b7cb6790ff
commit 141bd94cf2
3 changed files with 16 additions and 1 deletions

View file

@ -3,6 +3,7 @@ D1X-Rebirth Changelog
20080322
--------
d1x-rebirth.xcodeproj, INSTALL.txt, SConstruct: make compile instructions clearer for Windows and Mac users, for Mac OS X don't use Sharepath when using SConstruct, handle warnings differently in Xcode
main/gamefont.c, main/mission.h: scale Mac fonts correctly
20080321
--------

View file

@ -27,6 +27,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "args.h"
#include "cfile.h"
#include "gamefont.h"
#include "mission.h"
char * Gamefont_filenames_l[] = {
"font1-1.fnt", // Font 0
@ -145,10 +146,19 @@ void addfontconf(int gf, int x, int y, char * fn){
void gamefont_init()
{
int i;
int mac_hog = 0;
if (Gamefont_installed)
return;
switch (cfile_size("descent.hog"))
{
case D1_MAC_SHARE_MISSION_HOGSIZE:
case D1_MAC_MISSION_HOGSIZE:
mac_hog = 1;
break;
}
Gamefont_installed = 1;
for (i=0;i<MAX_FONTS;i++){
@ -156,7 +166,10 @@ void gamefont_init()
if (GameArg.GfxHiresFNTAvailable)
addfontconf(i,640,480,Gamefont_filenames_h[i]); // ZICO - addition to use D2 fonts if available
addfontconf(i,320,200,Gamefont_filenames_l[i]);
if (mac_hog)
addfontconf(i,640,480,Gamefont_filenames_l[i]); // Mac fonts are hires
else
addfontconf(i,320,200,Gamefont_filenames_l[i]);
}
gamefont_choose_game_font(grd_curscreen->sc_canvas.cv_bitmap.bm_w,grd_curscreen->sc_canvas.cv_bitmap.bm_h);

View file

@ -21,6 +21,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#define _MISSION_H
#include "pstypes.h"
#include "inferno.h"
#define MAX_MISSIONS 5000 // ZICO - changed from 300 to get more levels in list
#define MAX_LEVELS_PER_MISSION 30