From cfd7274022c512ba5e06a659a5281097f6468e40 Mon Sep 17 00:00:00 2001 From: Steven Fuller Date: Tue, 31 Jul 2001 04:06:01 +0000 Subject: [PATCH] More compiling. --- Makefile | 6 +- source2.txt | 8 +- src/avp/davehook.cpp | 4 +- src/avp/game_statistics.c | 11 +-- src/avp/game_statistics.h | 4 +- src/avp/win95/frontend/avp_menudata.c | 121 +++++++++++++------------- src/avp/win95/frontend/avp_menus.h | 18 ++-- src/avp/win95/scrshot.cpp | 17 ++-- src/main.c | 10 +++ src/module.c | 2 - src/win95/awtexld.cpp | 9 +- src/win95/dd_func.cpp | 2 +- src/win95/io.c | 19 ---- src/win95/platform.h | 79 ----------------- 14 files changed, 109 insertions(+), 201 deletions(-) diff --git a/Makefile b/Makefile index 9499c63..0a5c52e 100644 --- a/Makefile +++ b/Makefile @@ -11,11 +11,11 @@ LDLIBS += -L/usr/X11R6/lib -lX11 -lXext `sdl-config --libs` AFLAGS = -g -Iinclude/ -w+macro-params -w+orphan-labels -w+number-overflow ROOT = main.c stubs.c afont.c frustum.c kshape.c map.c maths.c md5.c mem3dc.c mem3dcpp.cpp module.c morph.c mslhand.c object.c shpanim.c sphere.c tables.c vdb.c version.c -AVP = ai_sight.c avpview.c bh_agun.c bh_ais.c bh_alien.c bh_binsw.c bh_cable.c bh_corpse.c bh_deathvol.c bh_debri.c bh_dummy.c bh_fan.c bh_far.c bh_fhug.c bh_gener.c bh_ldoor.c bh_lift.c bh_light.c bh_lnksw.c bh_ltfx.c bh_marin.c bh_mission.c bh_near.c bh_pargen.c bh_plachier.c bh_plift.c bh_pred.c bh_queen.c bh_rubberduck.c bh_selfdest.c bh_snds.c bh_spcl.c bh_swdor.c bh_track.c bh_types.c bh_videoscreen.c bh_waypt.c bh_weap.c bh_xeno.c bonusabilities.c cconvars.cpp cdtrackselection.cpp cheatmodes.c comp_map.c comp_shp.c consolelog.cpp davehook.cpp deaths.c decal.c detaillevels.c dynamics.c dynblock.c equipmnt.c equiputl.cpp extents.c game.c gamecmds.cpp gameflow.c gamevars.cpp hmodel.c hud.c inventry.c language.c lighting.c load_shp.c los.c maps.c mempool.c messagehistory.c missions.cpp movement.c paintball.c particle.c pfarlocs.c pheromon.c player.c pmove.c psnd.c psndproj.c pvisible.c savegame.c scream.cpp secstats.c sfx.c stratdef.c targeting.c track.c triggers.c weapons.c +AVP = ai_sight.c avpview.c bh_agun.c bh_ais.c bh_alien.c bh_binsw.c bh_cable.c bh_corpse.c bh_deathvol.c bh_debri.c bh_dummy.c bh_fan.c bh_far.c bh_fhug.c bh_gener.c bh_ldoor.c bh_lift.c bh_light.c bh_lnksw.c bh_ltfx.c bh_marin.c bh_mission.c bh_near.c bh_pargen.c bh_plachier.c bh_plift.c bh_pred.c bh_queen.c bh_rubberduck.c bh_selfdest.c bh_snds.c bh_spcl.c bh_swdor.c bh_track.c bh_types.c bh_videoscreen.c bh_waypt.c bh_weap.c bh_xeno.c bonusabilities.c cconvars.cpp cdtrackselection.cpp cheatmodes.c comp_map.c comp_shp.c consolelog.cpp davehook.cpp deaths.c decal.c detaillevels.c dynamics.c dynblock.c equipmnt.c equiputl.cpp extents.c game.c game_statistics.c gamecmds.cpp gameflow.c gamevars.cpp hmodel.c hud.c inventry.c language.c lighting.c load_shp.c los.c maps.c mempool.c messagehistory.c missions.cpp movement.c paintball.c particle.c pfarlocs.c pheromon.c player.c pmove.c psnd.c psndproj.c pvisible.c savegame.c scream.cpp secstats.c sfx.c stratdef.c targeting.c track.c triggers.c weapons.c SHAPES = cube.c SUPPORT = consbind.cpp consbtch.cpp coordstr.cpp daemon.cpp r2base.cpp r2pos666.cpp reflist.cpp refobj.cpp scstring.cpp strtab.cpp strutil.c trig666.cpp wrapstr.cpp -AVPWIN95 = avpchunk.cpp cheat.c chtcodes.cpp d3d_hud.cpp ddplat.cpp endianio.c ffread.cpp ffstdio.cpp gflwplat.c hierplace.cpp iofocus.cpp jsndsup.cpp kzsort.c langplat.c modcmds.cpp npcsetup.cpp objsetup.cpp pathchnk.cpp platsup.c pldghost.c projload.cpp strachnk.cpp system.c vision.c -FRONTEND = avp_envinfo.c avp_intro.cpp +AVPWIN95 = avpchunk.cpp cheat.c chtcodes.cpp d3d_hud.cpp ddplat.cpp endianio.c ffread.cpp ffstdio.cpp gflwplat.c hierplace.cpp iofocus.cpp jsndsup.cpp kzsort.c langplat.c modcmds.cpp npcsetup.cpp objsetup.cpp pathchnk.cpp platsup.c pldghost.c projload.cpp scrshot.cpp strachnk.cpp system.c vision.c +FRONTEND = avp_envinfo.c avp_intro.cpp avp_menudata.c GADGETS = ahudgadg.cpp conscmnd.cpp conssym.cpp consvar.cpp gadget.cpp hudgadg.cpp rootgadg.cpp t_ingadg.cpp teletype.cpp textexp.cpp textin.cpp trepgadg.cpp WIN95 = animchnk.cpp animobs.cpp awbmpld.cpp awiffld.cpp awpnmld.cpp bmpnames.cpp chnkload.cpp chnktexi.cpp chnktype.cpp chunk.cpp chunkpal.cpp debuglog.cpp dummyobjectchunk.cpp enumchnk.cpp enumsch.cpp envchunk.cpp fail.c fragchnk.cpp gsprchnk.cpp hierchnk.cpp huffman.cpp iff.cpp iff_ilbm.cpp ilbm_ext.cpp io.c list_tem.cpp ltchunk.cpp media.cpp mishchnk.cpp obchunk.cpp oechunk.cpp our_mem.c plat_shp.c plspecfn.c shpchunk.cpp sndchunk.cpp sprchunk.cpp string.cpp texio.c toolchnk.cpp txioctrl.cpp wpchunk.cpp zsp.cpp diff --git a/source2.txt b/source2.txt index 4e3b7a2..132ce16 100644 --- a/source2.txt +++ b/source2.txt @@ -72,7 +72,7 @@ avp/equipmnt.c avp/equiputl.cpp avp/extents.c avp/game.c -TODO avp/game_statistics.c +avp/game_statistics.c avp/gamecmds.cpp avp/gameflow.c avp/gamevars.cpp @@ -133,7 +133,7 @@ avp/win95/cheat.c avp/win95/chtcodes.cpp avp/win95/d3d_hud.cpp TODO avp/win95/d3d_render.cpp -TODO avp/win95/ddplat.cpp +avp/win95/ddplat.cpp TODO avp/win95/directplay.c TODO avp/win95/dp_func.c TODO avp/win95/dplayext.c @@ -161,7 +161,7 @@ TODO avp/win95/pldnet.c TODO avp/win95/progress_bar.cpp avp/win95/projload.cpp TODO avp/win95/psndplat.c -TODO avp/win95/scrshot.cpp +avp/win95/scrshot.cpp avp/win95/strachnk.cpp avp/win95/system.c TODO avp/win95/usr_io.c @@ -171,7 +171,7 @@ TODO avp/win95/winmain.c avp/win95/frontend/avp_envinfo.c avp/win95/frontend/avp_intro.cpp -TODO avp/win95/frontend/avp_menudata.c +avp/win95/frontend/avp_menudata.c TODO avp/win95/frontend/avp_menugfx.cpp TODO avp/win95/frontend/avp_menus.c TODO avp/win95/frontend/avp_mp_config.cpp diff --git a/src/avp/davehook.cpp b/src/avp/davehook.cpp index ccd7c9c..17593b1 100644 --- a/src/avp/davehook.cpp +++ b/src/avp/davehook.cpp @@ -414,7 +414,7 @@ void DAVEHOOK_Maintain(void) #if SupportWindows95 if ( bFirstFrame ) { - RE_ENTRANT_QUEUE_WinMain_FlushMessagesWithoutProcessing(); +// RE_ENTRANT_QUEUE_WinMain_FlushMessagesWithoutProcessing(); // this is a hack to ensure that none of the keypresses used // in the menu get through to the first frame of the game and // for example, switch to typing mode (for CR presses) @@ -424,7 +424,7 @@ void DAVEHOOK_Maintain(void) else { // Flush the WinProc messages: - RE_ENTRANT_QUEUE_WinMain_FlushMessages(); +// RE_ENTRANT_QUEUE_WinMain_FlushMessages(); } #endif // SupportWindows95 diff --git a/src/avp/game_statistics.c b/src/avp/game_statistics.c index 110254d..d4de953 100644 --- a/src/avp/game_statistics.c +++ b/src/avp/game_statistics.c @@ -44,10 +44,11 @@ extern void DoStatisticsScreen(int completed_level); /* Default structure: */ AvP_GameStats_Stored DefaultLevelGameStats = { - {0,0,0,0,0,0,0,0,0,0,}, - {0,0,0,0,0,0,0,0,0,0,}, - {0,0,0,0,0,0,0,0,0,0,}, - {0,0,0,0,0,0,0,0,0,0,}, + {0,0,0,0,0,0,0,0,0,0}, + {0,0,0,0,0,0,0,0,0,0}, + {0,0,0,0,0,0,0,0,0,0}, /* Trophies */ + {0,0,0,0,0,0,0,0,0,0}, /* LiveHeadBites */ + {0,0,0,0,0,0,0,0,0,0}, 10000, 0, 100, @@ -67,7 +68,7 @@ AvP_GameStats_Stored DefaultLevelGameStats = { 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0 } }; diff --git a/src/avp/game_statistics.h b/src/avp/game_statistics.h index 79a827c..1381dae 100644 --- a/src/avp/game_statistics.h +++ b/src/avp/game_statistics.h @@ -52,10 +52,10 @@ typedef struct int Killed[STATS_VICTIM_MAXIMUM]; int Decapitated[STATS_VICTIM_MAXIMUM]; - union { +// union { int Trophies[STATS_VICTIM_MAXIMUM]; int LiveHeadBites[STATS_VICTIM_MAXIMUM]; - }; +// }; int DeadHeadBites[STATS_VICTIM_MAXIMUM]; int ShotsFired; diff --git a/src/avp/win95/frontend/avp_menudata.c b/src/avp/win95/frontend/avp_menudata.c index 406a296..bdc4d44 100644 --- a/src/avp/win95/frontend/avp_menudata.c +++ b/src/avp/win95/frontend/avp_menudata.c @@ -890,21 +890,21 @@ extern void MakeSelectSessionMenu(void) for (i=0; i0) UserProfileNumber=1; else UserProfileNumber=0; @@ -1087,36 +1087,36 @@ extern void MakeConnectionSelectMenu() if(netGameData.tcpip_available) { AvPMenu_MultiplayerConnection[pos].ElementID = AVPMENU_ELEMENT_CONNECTIONCHOICE; - AvPMenu_MultiplayerConnection[pos].TextDescription = TEXTSTRING_MULTIPLAYER_TCPIP; - AvPMenu_MultiplayerConnection[pos].MenuToGoTo = AVPMENU_MULTIPLAYER; - AvPMenu_MultiplayerConnection[pos].Value = CONN_TCPIP; + AvPMenu_MultiplayerConnection[pos].a.TextDescription = TEXTSTRING_MULTIPLAYER_TCPIP; + AvPMenu_MultiplayerConnection[pos].b.MenuToGoTo = AVPMENU_MULTIPLAYER; + AvPMenu_MultiplayerConnection[pos].c.Value = CONN_TCPIP; AvPMenu_MultiplayerConnection[pos].HelpString = TEXTSTRING_MULTIPLAYER_PROTOCOL_HELP; pos++; } if(netGameData.ipx_available) { AvPMenu_MultiplayerConnection[pos].ElementID = AVPMENU_ELEMENT_CONNECTIONCHOICE; - AvPMenu_MultiplayerConnection[pos].TextDescription = TEXTSTRING_MULTIPLAYER_IPX; - AvPMenu_MultiplayerConnection[pos].MenuToGoTo = AVPMENU_MULTIPLAYER; - AvPMenu_MultiplayerConnection[pos].Value = CONN_IPX; + AvPMenu_MultiplayerConnection[pos].a.TextDescription = TEXTSTRING_MULTIPLAYER_IPX; + AvPMenu_MultiplayerConnection[pos].b.MenuToGoTo = AVPMENU_MULTIPLAYER; + AvPMenu_MultiplayerConnection[pos].c.Value = CONN_IPX; AvPMenu_MultiplayerConnection[pos].HelpString = TEXTSTRING_MULTIPLAYER_PROTOCOL_HELP; pos++; } if(netGameData.modem_available) { AvPMenu_MultiplayerConnection[pos].ElementID = AVPMENU_ELEMENT_CONNECTIONCHOICE; - AvPMenu_MultiplayerConnection[pos].TextDescription = TEXTSTRING_MULTIPLAYER_MODEM; - AvPMenu_MultiplayerConnection[pos].MenuToGoTo = AVPMENU_MULTIPLAYER; - AvPMenu_MultiplayerConnection[pos].Value = CONN_Modem; + AvPMenu_MultiplayerConnection[pos].a.TextDescription = TEXTSTRING_MULTIPLAYER_MODEM; + AvPMenu_MultiplayerConnection[pos].b.MenuToGoTo = AVPMENU_MULTIPLAYER; + AvPMenu_MultiplayerConnection[pos].c.Value = CONN_Modem; AvPMenu_MultiplayerConnection[pos].HelpString = TEXTSTRING_MULTIPLAYER_PROTOCOL_HELP; pos++; } if(netGameData.serial_available) { AvPMenu_MultiplayerConnection[pos].ElementID = AVPMENU_ELEMENT_CONNECTIONCHOICE; - AvPMenu_MultiplayerConnection[pos].TextDescription = TEXTSTRING_MULTIPLAYER_SERIAL; - AvPMenu_MultiplayerConnection[pos].MenuToGoTo = AVPMENU_MULTIPLAYER; - AvPMenu_MultiplayerConnection[pos].Value = CONN_Serial; + AvPMenu_MultiplayerConnection[pos].a.TextDescription = TEXTSTRING_MULTIPLAYER_SERIAL; + AvPMenu_MultiplayerConnection[pos].b.MenuToGoTo = AVPMENU_MULTIPLAYER; + AvPMenu_MultiplayerConnection[pos].c.Value = CONN_Serial; AvPMenu_MultiplayerConnection[pos].HelpString = TEXTSTRING_MULTIPLAYER_PROTOCOL_HELP; pos++; } @@ -1125,9 +1125,9 @@ extern void MakeConnectionSelectMenu() //Add an option for launching a game using mplayer { AvPMenu_MultiplayerConnection[pos].ElementID = AVPMENU_ELEMENT_CONNECTIONCHOICE; - AvPMenu_MultiplayerConnection[pos].TextDescription = TEXTSTRING_MPLAYER_TEXT_1; - AvPMenu_MultiplayerConnection[pos].MenuToGoTo = AVPMENU_MULTIPLAYER; - AvPMenu_MultiplayerConnection[pos].Value = CONN_Mplayer; + AvPMenu_MultiplayerConnection[pos].a.TextDescription = TEXTSTRING_MPLAYER_TEXT_1; + AvPMenu_MultiplayerConnection[pos].b.MenuToGoTo = AVPMENU_MULTIPLAYER; + AvPMenu_MultiplayerConnection[pos].c.Value = CONN_Mplayer; pos++; } #endif @@ -1138,8 +1138,8 @@ extern void MakeConnectionSelectMenu() { //no available connections AvPMenu_MultiplayerConnection[0].ElementID = AVPMENU_ELEMENT_GOTOMENU; - AvPMenu_MultiplayerConnection[0].TextDescription = TEXTSTRING_MULTIPLAYER_NOCONNECTIONS; - AvPMenu_MultiplayerConnection[0].MenuToGoTo = AVPMENU_MAIN; + AvPMenu_MultiplayerConnection[0].a.TextDescription = TEXTSTRING_MULTIPLAYER_NOCONNECTIONS; + AvPMenu_MultiplayerConnection[0].b.MenuToGoTo = AVPMENU_MAIN; AvPMenu_MultiplayerConnection[pos].HelpString = TEXTSTRING_MULTIPLAYER_NOCONNECTIONS_HELP; pos=1; @@ -1161,6 +1161,3 @@ extern void MakeOpenIPAddressMenu() } } - - - diff --git a/src/avp/win95/frontend/avp_menus.h b/src/avp/win95/frontend/avp_menus.h index 80a009a..8d0cbf8 100644 --- a/src/avp/win95/frontend/avp_menus.h +++ b/src/avp/win95/frontend/avp_menus.h @@ -210,7 +210,7 @@ typedef struct { enum TEXTSTRING_ID TextDescription; enum AVPMENUGFX_ID GfxID; - }; + } a; union { @@ -218,7 +218,7 @@ typedef struct int MaxSliderValue; int MaxTextLength; int MaxValue; //for number fields - }; + } b; union { @@ -227,23 +227,20 @@ typedef struct char *TextPtr; int *NumberPtr; int Value; - }; + } c; union { enum TEXTSTRING_ID FirstTextSliderString; enum TEXTSTRING_ID NumberFieldUnitsString; char** TextSliderStringPointer; - }; + } d; enum TEXTSTRING_ID HelpString; - union - { - enum TEXTSTRING_ID NumberFieldZeroString; //special string for 0 - }; - int Brightness; + enum TEXTSTRING_ID NumberFieldZeroString; //special string for 0 + int Brightness; } AVPMENU_ELEMENT; typedef struct @@ -254,8 +251,6 @@ typedef struct AVPMENU_ELEMENT *MenuElements; enum AVPMENU_ID ParentMenu; int DefaultElement; - - } AVPMENU; @@ -280,7 +275,6 @@ typedef struct unsigned int UserEnteringNumber :1; unsigned int UserChangingKeyConfig :1; unsigned int ChangingPrimaryConfig :1; - } AVP_MENUS; diff --git a/src/avp/win95/scrshot.cpp b/src/avp/win95/scrshot.cpp index a8115a5..cbc7d6b 100644 --- a/src/avp/win95/scrshot.cpp +++ b/src/avp/win95/scrshot.cpp @@ -1,15 +1,15 @@ #include "3dc.h" #include "bmp2.h" #include "endianio.h" -#include +#include "string.hpp" #include "scrshot.hpp" #include "module.h" #include "stratdef.h" #include "gamedef.h" #include "ourasert.h" -#include "frontend\avp_menus.h" +#include "frontend/avp_menus.h" extern "C"{ - extern DDPIXELFORMAT DisplayPixelFormat; +// extern DDPIXELFORMAT DisplayPixelFormat; extern SCREENDESCRIPTORBLOCK ScreenDescriptorBlock; extern int VideoModeTypeScreen; extern long BackBufferPitch; @@ -97,11 +97,12 @@ void HandleScreenShot() void ScreenShot() { + int i; char Name[40]; strcpy(Name,"AVP"); int length=strlen(Name); strncpy(&Name[length],"00.bmp",8); - for(int i=0;i<100;i++) + for(i=0;i<100;i++) { Name[length]=i/10+'0'; Name[length+1]=(i%10)+'0'; @@ -179,6 +180,8 @@ void ScreenShot() int red_shift,red_scale,green_shift,green_scale,blue_shift,blue_scale; if(VideoModeTypeScreen==VideoModeType_15) { + fprintf(stderr, "ScreenShot: VideoModeTypeScreen==VideoModeType_15\n"); +/* int m; for (red_shift = 0, m = DisplayPixelFormat.dwRBitMask; !(m & 1); red_shift++, m >>= 1); @@ -191,7 +194,7 @@ void ScreenShot() for (blue_shift = 0, m = DisplayPixelFormat.dwBBitMask; !(m & 1); blue_shift++, m >>= 1); blue_scale=255/m; - +*/ } // write 24 bit image @@ -216,9 +219,13 @@ void ScreenShot() for (j=0; j>blue_shift)*blue_scale),fp); //b PutByte((BYTE)(((colour & DisplayPixelFormat.dwGBitMask)>>green_shift)*green_scale),fp); //g PutByte((BYTE)(((colour & DisplayPixelFormat.dwRBitMask)>>red_shift)*red_scale),fp); //r +*/ } } else if(VideoModeTypeScreen==VideoModeType_24) diff --git a/src/main.c b/src/main.c index ce2be09..bd845a0 100644 --- a/src/main.c +++ b/src/main.c @@ -6,6 +6,16 @@ #include "fixer.h" +PROCESSORTYPES ReadProcessorType() +{ + return PType_PentiumMMX; +} + +int InitialiseWindowsSystem() +{ + return 0; +} + int main(int argc, char *argv[]) { return 0; diff --git a/src/module.c b/src/module.c index cd973c0..b181a2b 100644 --- a/src/module.c +++ b/src/module.c @@ -1127,5 +1127,3 @@ int IsAIModuleVisibleFromAIModule(AIMODULE *source,AIMODULE *target) { } #endif - - diff --git a/src/win95/awtexld.cpp b/src/win95/awtexld.cpp index 65f4b7a..d0209f9 100644 --- a/src/win95/awtexld.cpp +++ b/src/win95/awtexld.cpp @@ -1,4 +1,5 @@ -#include "advwin32.h" +#include "fixer.h" + #ifndef DB_LEVEL #define DB_LEVEL 4 #endif @@ -19,10 +20,8 @@ #include #include -#include "awTexLd.h" -#pragma warning(disable: 4701) -#include "awTexLd.hpp" -#pragma warning(default: 4701) +#include "awtexld.h" +#include "awtexld.hpp" #ifdef _CPPRTTI #include diff --git a/src/win95/dd_func.cpp b/src/win95/dd_func.cpp index 3be2188..d1fbbf0 100644 --- a/src/win95/dd_func.cpp +++ b/src/win95/dd_func.cpp @@ -53,7 +53,7 @@ LPDIRECTDRAW lpDD; // DirectDraw object LPDIRECTDRAWSURFACE lpDDSPrimary; // DirectDraw primary surface LPDIRECTDRAWSURFACE lpDDSBack; // DirectDraw back surface LPDIRECTDRAWSURFACE lpDDSHiddenBack; // for system memory rendering target, stable configuration -LPDIRECTDRAWPALETTE lpDDPal[MaxPalettes]; // DirectDraw palette +LPDIRECTDRAWPALETTE lpDDPal[1]; // DirectDraw palette #if debug || PreBeta LPDIRECTDRAWSURFACE lpDDDbgFont; // Debugging font, specific to current video mode #endif diff --git a/src/win95/io.c b/src/win95/io.c index ef3400f..bbc9202 100644 --- a/src/win95/io.c +++ b/src/win95/io.c @@ -35,25 +35,6 @@ /* As specified by Roxby */ #define ClearScreenColour 1000 -/* - To filter frame rate values from - Windows timer to provide a smoother - ride. This may make some AI systems - etc behave better, though it will take - some time to catch up if there is a genuine - abrupt transition in the frame rate. - - There may also be some sort of convergence - instability here!!!! IMPORTANT - FIXME!!!! (possibly) - - Although this code was derived from - some of Jamie's filter algorithms, I have - mangled it hideously, so _don't blame him_! -*/ - -#define KalmanTimer No - /* Experiment to try and fix mystery driver problems Don't set with ForceWindowsPalette on!!! diff --git a/src/win95/platform.h b/src/win95/platform.h index 06abf3b..ec5085b 100644 --- a/src/win95/platform.h +++ b/src/win95/platform.h @@ -59,24 +59,6 @@ typedef enum { } PROCESSORTYPES; - -/* - - VGA Palette Entry - -*/ - -typedef struct vgapaletteentry { - - unsigned char vga_r; - unsigned char vga_g; - unsigned char vga_b; - -} VGAPALETTEENTRY; - - -extern void LoadAndChangeToPalette(char*); - /* Video mode decsription (to be filled in by DirectDraw callback). @@ -377,15 +359,6 @@ typedef enum { #define MaxScreenWidth 1600 /* Don't get this wrong! */ -/* - Max no of palettes -- at present there is NO - code for palette switching and ALL palette - calls within the DirectDraw interface system - run on palette 0 -*/ - -#define MaxPalettes 4 - /* Video Mode Types @@ -447,21 +420,6 @@ typedef enum { } VIDEORESTARTMODES; -/* - Load modes for putting an image - in a DirectDraw surface --- either - do or do not deallocate the - system memory image, but always - keep the DirectDraw one -*/ - -typedef enum { - - LoadModeDirectDrawOnly, - LoadModeFull - -} IMAGELOADMODES; - /* Direct3D driver modes @@ -562,42 +520,6 @@ typedef enum { } DXMEMORYMODES; -/* - - .BMP File header - -*/ - -/* - Pack the header to 1 byte alignment so that the - loader works (John's code, still under test). -*/ - -typedef struct bmpheader { - - unsigned short BMP_ID; /* Contains 'BM' */ - int BMP_Size; - - short BMP_Null1; - short BMP_Null2; - - int BMP_Image; /* Byte offset of image start relative to offset 14 */ - int BMP_HeadSize; /* Size of header (40 for Windows, 12 for OS/2) */ - int BMP_Width; /* Width of image in pixels */ - int BMP_Height; /* Height of image in pixels */ - - short BMP_Planes; /* Number of image planes (must be 1) */ - short BMP_Bits; /* Number of bits per pixel (1,4,8 or 24) */ - - int BMP_Comp; /* Compression type */ - int BMP_CSize; /* Size in bytes of compressed image */ - int BMP_Hres; /* Horizontal resolution in pixels/meter */ - int BMP_Vres; /* Vertical resolution in pixels/meter */ - int BMP_Colours; /* Number of colours used, below (N) */ - int BMP_ImpCols; /* Number of important colours */ - -} PACKED BMPHEADER; - /* Types of texture files that can be requested from the main D3D texture @@ -802,7 +724,6 @@ int textprint(const char* t, ...); //#endif -void MakePaletteShades(VGAPALETTEENTRY *vga_palptr, int hue, int pal_shades_per_hue); void ConvertToDDPalette(unsigned char* src, unsigned char* dst, int length, int flags); int textprintXY(int x, int y, const char* t, ...); void LoadSystemFonts(char* fname);