From f418785edc7c2713a7cdf465018b574a6549d8f5 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 3 Mar 2013 01:03:33 +0000 Subject: [PATCH] Move */main/gamefont.c -> similar/main/gamefont.c --- SConstruct | 3 +- d2x-rebirth/main/gamefont.c | 195 ----------------------- {d1x-rebirth => similar}/main/gamefont.c | 11 +- 3 files changed, 10 insertions(+), 199 deletions(-) delete mode 100644 d2x-rebirth/main/gamefont.c rename {d1x-rebirth => similar}/main/gamefont.c (92%) diff --git a/SConstruct b/SConstruct index 2eeadea70..72e502966 100644 --- a/SConstruct +++ b/SConstruct @@ -375,6 +375,7 @@ class DXXProgram(DXXCommon): 'arch/sdl/mouse.c', 'arch/sdl/timer.c', 'main/console.c', +'main/gamefont.c', 'mem/mem.c', 'misc/hash.c', 'misc/physfsx.c', @@ -601,7 +602,6 @@ class D1XProgram(DXXProgram): 'main/fvi.c', 'main/game.c', 'main/gamecntl.c', -'main/gamefont.c', 'main/gamemine.c', 'main/gamerend.c', 'main/gamesave.c', @@ -729,7 +729,6 @@ class D2XProgram(DXXProgram): 'main/fvi.c', 'main/game.c', 'main/gamecntl.c', -'main/gamefont.c', 'main/gamemine.c', 'main/gamepal.c', 'main/gamerend.c', diff --git a/d2x-rebirth/main/gamefont.c b/d2x-rebirth/main/gamefont.c deleted file mode 100644 index 8e5c56466..000000000 --- a/d2x-rebirth/main/gamefont.c +++ /dev/null @@ -1,195 +0,0 @@ -/* -THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX -SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO -END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A -ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS -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. -COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. -*/ - -/* - * - * Fonts for the game. - * - */ - -#include -#include - -#include "gr.h" -#include "dxxerror.h" -#include -#include "strutil.h" -#include "args.h" -#include "gamefont.h" -#include "config.h" - -static const char Gamefont_filenames_l[][16] = { - "font1-1.fnt", // Font 0 - "font2-1.fnt", // Font 1 - "font2-2.fnt", // Font 2 - "font2-3.fnt", // Font 3 - "font3-1.fnt" // Font 4 -}; - -static const char Gamefont_filenames_h[][16] = { - "font1-1h.fnt", // Font 0 - "font2-1h.fnt", // Font 1 - "font2-2h.fnt", // Font 2 - "font2-3h.fnt", // Font 3 - "font3-1h.fnt" // Font 4 -}; - -grs_font *Gamefonts[MAX_FONTS]; - -int Gamefont_installed=0; -float FNTScaleX = 1, FNTScaleY = 1; - -//code to allow variable GAME_FONT, added 10/7/99 Matt Mueller - updated 11/18/99 to handle all fonts, not just GFONT_SMALL -// take scry into account? how/when? -typedef struct _a_gamefont_conf{ - int x; - int y; - union{ - char name[64];//hrm. - grs_font *ptr; - } f; -}a_gamefont_conf; - -typedef struct _gamefont_conf{ - a_gamefont_conf font[10]; - int num,cur; -}gamefont_conf; - -gamefont_conf font_conf[MAX_FONTS]; - -const char *gamefont_curfontname(int gf){ - if (font_conf[gf].cur<0) - return Gamefont_filenames_l[gf]; - else - return font_conf[gf].font[font_conf[gf].cur].f.name; -} - -static void gamefont_unloadfont(int gf) -{ - if (Gamefonts[gf]){ - font_conf[gf].cur=-1; - gr_close_font(Gamefonts[gf]); - Gamefonts[gf]=NULL; - } -} - -static void gamefont_loadfont(int gf,int fi) -{ - if (PHYSFSX_exists(font_conf[gf].font[fi].f.name,1)){ - gamefont_unloadfont(gf); - Gamefonts[gf]=gr_init_font(font_conf[gf].font[fi].f.name); - }else { - if (Gamefonts[gf]==NULL){ - Gamefonts[gf]=gr_init_font(Gamefont_filenames_l[gf]); - font_conf[gf].cur=-1; - } - return; - } - font_conf[gf].cur=fi; -} - -void gamefont_choose_game_font(int scrx,int scry){ - int gf,i,close=-1,m=-1; - if (!Gamefont_installed) return; - - for (gf=0;gf=font_conf[gf].font[i].x && close=font_conf[gf].font[i].y && closesc_canvas.cv_bitmap.bm_w,grd_curscreen->sc_canvas.cv_bitmap.bm_h); -} - - -void gamefont_close() -{ - int i; - - if (!Gamefont_installed) return; - Gamefont_installed = 0; - - for (i=0; i