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

comments, formatting, etc. courtesy of Martin Schaffner <maschaffner@gmx.ch>

Browse source
This commit is contained in:
Bradley Bell 2002-10-04 07:19:59 +00:00
parent f79f52e3ae
commit 65b1d2017f
4 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cfile/cfile.c
View file

@ -1,4 +1,4 @@
/* $Id: cfile.c,v 1.9 2002-09-14 00:20:44 btb Exp $ */
/* $Id: cfile.c,v 1.10 2002-10-04 07:19:59 btb Exp $ */
/*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -206,6 +206,9 @@ int cfile_size(char *hogname)
return statbuf.st_size;
}
/*
* return handle for file called "name", embedded in one of the hogfiles
*/
FILE * cfile_find_libfile(char * name, int * length)
{
FILE * fp;

29
include/iff.h
View file

@ -1,3 +1,4 @@
/* $Id: iff.h,v 1.2 2002-10-04 07:19:59 btb Exp $ */
/*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -7,7 +8,7 @@ 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.
AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
*/
@ -55,19 +56,19 @@ char *iff_errormsg(int error_number);
//Error codes for read & write routines
#define IFF_NO_ERROR 0 //everything is fine, have a nice day
#define IFF_NO_MEM 1 //not enough mem for loading or processing
#define IFF_UNKNOWN_FORM 2 //IFF file, but not a bitmap
#define IFF_NOT_IFF 3 //this isn't even an IFF file
#define IFF_NO_FILE 4 //cannot find or open file
#define IFF_BAD_BM_TYPE 5 //tried to save invalid type, like BM_RGB15
#define IFF_CORRUPT 6 //bad data in file
#define IFF_FORM_ANIM 7 //this is an anim, with non-anim load rtn
#define IFF_FORM_BITMAP 8 //this is not an anim, with anim load rtn
#define IFF_TOO_MANY_BMS 9 //anim read had more bitmaps than room for
#define IFF_UNKNOWN_MASK 10 //unknown masking type
#define IFF_READ_ERROR 11 //error reading from file
#define IFF_BM_MISMATCH 12 //bm being loaded doesn't match bm loaded into
#define IFF_NO_ERROR 0 //everything is fine, have a nice day
#define IFF_NO_MEM 1 //not enough mem for loading or processing
#define IFF_UNKNOWN_FORM 2 //IFF file, but not a bitmap
#define IFF_NOT_IFF 3 //this isn't even an IFF file
#define IFF_NO_FILE 4 //cannot find or open file
#define IFF_BAD_BM_TYPE 5 //tried to save invalid type, like BM_RGB15
#define IFF_CORRUPT 6 //bad data in file
#define IFF_FORM_ANIM 7 //this is an anim, with non-anim load rtn
#define IFF_FORM_BITMAP 8 //this is not an anim, with anim load rtn
#define IFF_TOO_MANY_BMS 9 //anim read had more bitmaps than room for
#define IFF_UNKNOWN_MASK 10 //unknown masking type
#define IFF_READ_ERROR 11 //error reading from file
#define IFF_BM_MISMATCH 12 //bm being loaded doesn't match bm loaded into
#endif

3
main/gamepal.c
View file

@ -124,8 +124,7 @@ int load_palette(char *name,int used_for_level,int no_change_screen)
if (used_for_level && stricmp(last_palette_loaded_pig,name) != 0) {
_splitpath(name,NULL,NULL,pigname,NULL);
strcat(pigname,".PIG");
strcat(pigname,".pig");
//if not editor, load pig first so small install message can come
//up in old palette. If editor version, we must load the pig after
//the palette is loaded so we can remap new textures.

8
main/titles.c
View file

@ -1,4 +1,4 @@
/* $Id: titles.c,v 1.15 2002-09-14 00:32:52 btb Exp $ */
/* $Id: titles.c,v 1.16 2002-10-04 07:19:59 btb Exp $ */
/*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -581,7 +581,7 @@ int load_new_briefing_screen( char *fname )
{
int pcx_error;
mprintf ((0,"Loading new briefing %s!\n",fname));
mprintf ((0,"Loading new briefing <%s>\n",fname));
strcpy (CurBriefScreenName,fname);
//WIN(DEFINE_SCREEN(CurBriefScreenName));
@ -1558,7 +1558,7 @@ void do_briefing_screens(char *filename,int level_num)
#endif
mprintf ((0,"Trying briefing screen! %s\n",filename));
mprintf ((0,"Trying briefing screen <%s>\n",filename));
if (!filename)
return;
@ -1579,7 +1579,7 @@ void do_briefing_screens(char *filename,int level_num)
gr_set_current_canvas(NULL)
);
mprintf ((0,"Playing briefing screen! %s %d\n",filename,level_num));
mprintf ((0,"Playing briefing screen <%s>, level %d\n",filename,level_num));
key_flush();