diff options
Diffstat (limited to 'src/win95')
| -rw-r--r-- | src/win95/io.c | 103 | ||||
| -rw-r--r-- | src/win95/texio.c | 181 |
2 files changed, 0 insertions, 284 deletions
diff --git a/src/win95/io.c b/src/win95/io.c index 8777eba..a8c4c3e 100644 --- a/src/win95/io.c +++ b/src/win95/io.c @@ -15,17 +15,6 @@ #undef textprint - -#if SupportTLTFiles -#define Output_TLT_File No -#endif - -#define Output_VEA_File No - -#define Proper_8Bit_MIP No - -#define DontLet222ColoursGoToBlack Yes - #define textprintOn Yes #define DHMtextprint Yes @@ -70,7 +59,6 @@ */ -extern SCENE Global_Scene; extern SHAPEHEADER **mainshapelist; extern SHAPEHEADER *testpaletteshapelist[]; extern SCREENDESCRIPTORBLOCK ScreenDescriptorBlock; @@ -110,15 +98,10 @@ extern IMAGEHEADER ImageHeaderArray[]; /* Array of Image Headers */ */ - int DrawMode = DrawPerVDB; -/* Win95 default ought to be per frame */ - /* Timer */ long lastTickCount; unsigned char *ScreenBuffer = 0; /* Ensure initialised to Null */ - unsigned char *ScreenBuffer2 = 0; - unsigned char LPTestPalette[1024]; /* to cast to lp*/ @@ -141,10 +124,8 @@ extern IMAGEHEADER ImageHeaderArray[]; /* Array of Image Headers */ unsigned char *PaletteRemapTable = 0; - int **ShadingTableArray = 0; int NumShadingTables = 0; - unsigned char **PaletteShadingTableArray = 0; int NumPaletteShadingTables = 0; int FrameRate; @@ -294,63 +275,6 @@ void GetDOSFilename(char *fnameptr) } - -/* - - Compare two strings. - - Return Yes if they're the same, else No. - -*/ - -/* - IMPORTANT!!! - This function is not ideal!!! It is used - here because this is only an initialisation - stage, but if you want to compare strings - elsewhere you should either use the C library - function or (if there's a problem with that) - write your own. -*/ - -int CompareStringCH(char *string1, char *string2) - -{ - - char *srtmp; - char *srtmp2; - int slen1 = 0; - int slen2 = 0; - int i; - - - srtmp = string1; - - while(*srtmp++ != 0) - slen1++; - - srtmp = string2; - - while(*srtmp++ != 0) - slen2++; - - if(slen1 != slen2) return No; - - else { - - srtmp = string1; - srtmp2 = string2; - - for(i=slen1; i!=0; i--) - if(*srtmp++ != *srtmp2++) return No; - - return Yes; - - } - -} - - /* Compare two filenames. @@ -839,19 +763,6 @@ void (*UpdateScreen[]) (void) = { }; - -/* - Not supported in Windows 95 !!! -*/ - - -void PlotPixelTest(int x, int y, unsigned char col) - -{ - -} - - /* Wait for Return Key @@ -963,11 +874,6 @@ void GetProjectFilename(char *fname, char *image) } - - - - - /* Attempts to load the image file. @@ -989,13 +895,6 @@ TEXTURE* LoadImageCH(char *fname, IMAGEHEADER *iheader) } - - - - - - - void ConvertToDDPalette(unsigned char* src, unsigned char* dst, int length, int flags) { int i; @@ -1943,5 +1842,3 @@ void ConvertDDToInternalPalette(unsigned char* src, unsigned char* dst, int leng *dst++ = (*src++) >> 2; } } - - diff --git a/src/win95/texio.c b/src/win95/texio.c index 9dffdcf..39ba97c 100644 --- a/src/win95/texio.c +++ b/src/win95/texio.c @@ -149,184 +149,6 @@ void InitialiseImageHeaders(void) #endif } - -int LoadImageCHsForShapes(SHAPEHEADER **shapelist) - -{ - - SHAPEHEADER **shlistptr; - SHAPEHEADER *shptr; - char **txfiles; - int TxIndex; - int LTxIndex; - - -/* - - Build the Texture List - -*/ - - shlistptr = shapelist; - - while(*shlistptr) { - - shptr = *shlistptr++; - - /* If the shape has textures */ - - if(shptr->sh_localtextures) { - - txfiles = shptr->sh_localtextures; - - LTxIndex = 0; - - while(*txfiles) { - - /* The RIFF Image loaders have changed to support not loading the same image twice - JH 17-2-96 */ - - char *src; - char *dst; - char fname[ImageNameSize]; - char *texfilesptr; - #ifndef RIFF_SYSTEM - int i, j, NewImage; - char *iname; - IMAGEHEADER *ihptr; - IMAGEHEADER *new_ihptr; - void* im; - #endif - - txfilesptr = *txfiles++; - - /* - - "txfilesptr" is in the form "textures\<fname>". We need to - prefix that text with the name of the current textures path. - - Soon this path may be varied but for now it is just the name of - the current project subdirectory. - - */ - - src = projectsubdirectory; - dst = fname; - - while(*src) - *dst++ = *src++; - - src = txfilesptr; - - while(*src) - *dst++ = *src++; - - *dst = 0; - - #ifdef RIFF_SYSTEM - - /* This function calls GetExistingImageHeader to figure out if the image is already loaded */ - TxIndex = CL_LoadImageOnce(fname,(ScanDrawDirectDraw == ScanDrawMode ? LIO_CHIMAGE : LIO_D3DTEXTURE)|LIO_TRANSPARENT|LIO_RELATIVEPATH|LIO_RESTORABLE); - GLOBALASSERT(GEI_NOTLOADED != TxIndex); - - #else - - /* If there are already images, try and find this one */ - - NewImage = Yes; - - #ifdef MaxImageGroups - - TxIndex = CurrentImageGroup * MaxImages; /* Assume image 0 */ - - if(NumImagesArray[CurrentImageGroup]) { - - for(i=NumImagesArray[CurrentImageGroup]; i!=0 && NewImage!=No; i--) { - - #else - - TxIndex = 0; /* Assume image 0 */ - - if(NumImages) { - - for(i=NumImages; i!=0 && NewImage!=No; i--) { - - #endif - - ihptr = ImageHeaderPtrs[TxIndex]; - - iname = &ihptr->ImageName[0]; - - j = CompareFilenameCH(txfilesptr, iname); - - if(j) NewImage = No; - - else TxIndex++; - - } - - } - - - /* If this is a new image, add it */ - - if(NewImage) { - - /* Get an Image Header */ - - new_ihptr = GetImageHeader(); - - if(new_ihptr) { - - if (ScanDrawMode == ScanDrawDirectDraw) - im = (void*) LoadImageCH(&fname[0], new_ihptr); - else - im = LoadImageIntoD3DImmediateSurface - (&fname[0], new_ihptr, DefinedTextureType); - - } - - } - - #endif - - /* - - The local index for this image in this shape is - "LTxIndex". - - The global index for the image is "TxIndex". - - We must go through the shape's items and change all the - local references to global. - - */ - - MakeShapeTexturesGlobal(shptr, TxIndex, LTxIndex); - - LTxIndex++; /* Next Local Texture */ - - } - - /* Is this shape a sprite that requires resizing? */ - - if((shptr->shapeflags & ShapeFlag_Sprite) && - (shptr->shapeflags & ShapeFlag_SpriteResizing)) { - - SpriteResizing(shptr); - - } - - } - - } - - - return Yes; - - -} - - #else @@ -575,10 +397,7 @@ int InitialiseTextures(void) #endif - return Yes; - - } |