X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16text.h;h=3a07783ac6c61a31f3406361a80d66fbbdafc884;hb=6021fc3f27b895d382fbd30488ead35657e39196;hp=a44537397e2c19c145cb97021ebb1e2f7fe4a4e7;hpb=351c4812d3c1db4a33cd6f2c166456d6b0b757e0;p=16.git diff --git a/src/lib/16text.h b/src/lib/16text.h old mode 100644 new mode 100755 index a4453739..3a07783a --- a/src/lib/16text.h +++ b/src/lib/16text.h @@ -1,24 +1,24 @@ -/* Project 16 Source Code~ - * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669 - * - * This file is part of Project 16. - * - * Project 16 is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * Project 16 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see , or - * write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301 USA. - * - */ +/* Project 16 Source Code~ + * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * + * This file is part of Project 16. + * + * Project 16 is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * Project 16 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see , or + * write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301 USA. + * + */ /* * This is the text subsystem for project 16. * These functions provide for the rendering of text strings @@ -26,12 +26,12 @@ * They copy the font characters directly to VGA. */ #ifndef TEXT_H -#define TEXT_H -#ifdef __WATCOMC__ -#include +#define TEXT_H +#ifdef __WATCOMC__ +#include #include -#endif -#include "src/lib/types.h" +#endif +#include "src/lib/16_head.h" /* font information type */ typedef struct font { @@ -40,8 +40,17 @@ typedef struct font { byte charSize; //bytes in each character } font_t; +typedef struct fontdata { + byte z[9]; + byte col; //color + byte bgcol; //bg color! + word chw; //char width + byte l[1024]; +} fontdata_t; + /* storage for the rom fonts */ extern font_t romFonts[4]; +extern fontdata_t romFontsData; #define ROM_FONT_8x14 0 #define ROM_FONT_8x8_LOW 1 #define ROM_FONT_8x8_HIGH 2