From: <js...@us...> - 2004-09-19 22:36:08
|
Update of /cvsroot/exult/exult In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25270 Modified Files: fnames.h gamewin.cc Log Message: Text: one file with several sections supported Index: fnames.h =================================================================== RCS file: /cvsroot/exult/exult/fnames.h,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- fnames.h 19 Sep 2004 07:18:16 -0000 1.68 +++ fnames.h 19 Sep 2004 22:35:57 -0000 1.69 @@ -125,12 +125,8 @@ #define GNEWGAMEVER "<GAMEDAT>/newgame.ver" #define KEYRINGDAT "<GAMEDAT>/keyring.dat" -#define SHAPESTXT "<STATIC>/shapes.txt" #define TEXTMSGS "<STATIC>/textmsg.txt" -#define MISCNMS "<STATIC>/miscnms.txt" -#define PATCH_SHAPESTXT "<PATCH>/shapes.txt" #define PATCH_TEXTMSGS "<PATCH>/textmsg.txt" -#define PATCH_MISCNMS "<PATCH>/miscnms.txt" #define NUM_FONTS (20) Index: gamewin.cc =================================================================== RCS file: /cvsroot/exult/exult/gamewin.cc,v retrieving revision 1.698 retrieving revision 1.699 diff -u -d -r1.698 -r1.699 --- gamewin.cc 18 Sep 2004 20:47:09 -0000 1.698 +++ gamewin.cc 19 Sep 2004 22:35:57 -0000 1.699 @@ -489,14 +489,7 @@ shape_man->load(); // All the .vga files! CYCLE_RED_PLASMA(); - ifstream textflx, exultmsg; - if (is_system_path_defined("<PATCH>") && U7exists(PATCH_TEXT)) - U7open(textflx, PATCH_TEXT); - else - U7open(textflx, TEXT_FLX); - if (U7exists(EXULTMSG)) - U7open(exultmsg, EXULTMSG, true); - Setup_item_names(textflx, exultmsg); // Set up list of item names. + Setup_text(); unsigned long timer = SDL_GetTicks(); srand(timer); // Use time to seed rand. generator. // Force clock to start. |