jetomit/avp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More compiling.

Browse source
This commit is contained in:
Steven Fuller 2001-07-31 04:06:01 +00:00 • committed by Patryk Obara
parent eb5c2cc01d
commit cfd7274022
14 changed files with 109 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -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

8
source2.txt
View file

@ -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

4
src/avp/davehook.cpp
View file

@ -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

11
src/avp/game_statistics.c
View file

@ -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
}
};

4
src/avp/game_statistics.h
View file

@ -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;

121
src/avp/win95/frontend/avp_menudata.c
View file

@ -890,21 +890,21 @@ extern void MakeSelectSessionMenu(void)
for (i=0; i<NumberOfSessionsFound; i++)
{
AvPMenu_MultiplayerSelectSession[i].ElementID = AVPMENU_ELEMENT_LISTCHOICE;
AvPMenu_MultiplayerSelectSession[i].TextPtr = SessionData[i].Name;
AvPMenu_MultiplayerSelectSession[i].MenuToGoTo = AVPMENU_MULTIPLAYER_JOINING;
AvPMenu_MultiplayerSelectSession[i].c.TextPtr = SessionData[i].Name;
AvPMenu_MultiplayerSelectSession[i].b.MenuToGoTo = AVPMENU_MULTIPLAYER_JOINING;
AvPMenu_MultiplayerSelectSession[i].HelpString = TEXTSTRING_MULTIPLAYER_SELECTSESSION_HELP;
}
}
else
{
AvPMenu_MultiplayerSelectSession[0].ElementID = AVPMENU_ELEMENT_GOTOMENU;
AvPMenu_MultiplayerSelectSession[0].TextDescription = TEXTSTRING_MULTIPLAYER_NOSESSIONSFOUND;
AvPMenu_MultiplayerSelectSession[0].MenuToGoTo = AVPMENU_MULTIPLAYERJOINGAME;
AvPMenu_MultiplayerSelectSession[0].a.TextDescription = TEXTSTRING_MULTIPLAYER_NOSESSIONSFOUND;
AvPMenu_MultiplayerSelectSession[0].b.MenuToGoTo = AVPMENU_MULTIPLAYERJOINGAME;
AvPMenu_MultiplayerSelectSession[0].HelpString = TEXTSTRING_MULTIPLAYER_NOSESSIONSFOUND_HELP;
if(netGameData.connectionType!=CONN_TCPIP)
{
AvPMenu_MultiplayerSelectSession[0].MenuToGoTo = AVPMENU_MULTIPLAYER;
AvPMenu_MultiplayerSelectSession[0].b.MenuToGoTo = AVPMENU_MULTIPLAYER;
}
i=1;
@ -936,29 +936,29 @@ extern void MakeInGameMenu(void)
{
case I_Marine:
{
AvPMenu_InGame[6].TextDescription = TEXTSTRING_MARINEKEYCONTROLS_TITLE;
AvPMenu_InGame[6].MenuToGoTo = AVPMENU_MARINEKEYCONFIG;
AvPMenu_InGame[6].a.TextDescription = TEXTSTRING_MARINEKEYCONTROLS_TITLE;
AvPMenu_InGame[6].b.MenuToGoTo = AVPMENU_MARINEKEYCONFIG;
AvPMenu_InNetGame[3].TextDescription = TEXTSTRING_MARINEKEYCONTROLS_TITLE;
AvPMenu_InNetGame[3].MenuToGoTo = AVPMENU_MARINEKEYCONFIG;
AvPMenu_InNetGame[3].a.TextDescription = TEXTSTRING_MARINEKEYCONTROLS_TITLE;
AvPMenu_InNetGame[3].b.MenuToGoTo = AVPMENU_MARINEKEYCONFIG;
break;
}
case I_Predator:
{
AvPMenu_InGame[6].TextDescription = TEXTSTRING_PREDATORKEYCONTROLS_TITLE;
AvPMenu_InGame[6].MenuToGoTo = AVPMENU_PREDATORKEYCONFIG;
AvPMenu_InGame[6].a.TextDescription = TEXTSTRING_PREDATORKEYCONTROLS_TITLE;
AvPMenu_InGame[6].b.MenuToGoTo = AVPMENU_PREDATORKEYCONFIG;
AvPMenu_InNetGame[3].TextDescription = TEXTSTRING_PREDATORKEYCONTROLS_TITLE;
AvPMenu_InNetGame[3].MenuToGoTo = AVPMENU_PREDATORKEYCONFIG;
AvPMenu_InNetGame[3].a.TextDescription = TEXTSTRING_PREDATORKEYCONTROLS_TITLE;
AvPMenu_InNetGame[3].b.MenuToGoTo = AVPMENU_PREDATORKEYCONFIG;
break;
}
case I_Alien:
{
AvPMenu_InGame[6].TextDescription = TEXTSTRING_ALIENKEYCONTROLS_TITLE;
AvPMenu_InGame[6].MenuToGoTo = AVPMENU_ALIENKEYCONFIG;
AvPMenu_InGame[6].a.TextDescription = TEXTSTRING_ALIENKEYCONTROLS_TITLE;
AvPMenu_InGame[6].b.MenuToGoTo = AVPMENU_ALIENKEYCONFIG;
AvPMenu_InNetGame[3].TextDescription = TEXTSTRING_ALIENKEYCONTROLS_TITLE;
AvPMenu_InNetGame[3].MenuToGoTo = AVPMENU_ALIENKEYCONFIG;
AvPMenu_InNetGame[3].a.TextDescription = TEXTSTRING_ALIENKEYCONTROLS_TITLE;
AvPMenu_InNetGame[3].b.MenuToGoTo = AVPMENU_ALIENKEYCONFIG;
break;
}
}
@ -970,26 +970,26 @@ extern void MakePredatorKeyConfigMenu(void)
int j;
AvPMenu_KeyConfig[i].ElementID = AVPMENU_ELEMENT_KEYCONFIGOK;
AvPMenu_KeyConfig[i].TextDescription = TEXTSTRING_MOUSECONTROLS_SAVETHESESETTINGS;
AvPMenu_KeyConfig[i].MenuToGoTo = AVPMENU_INGAME;
AvPMenu_KeyConfig[i].a.TextDescription = TEXTSTRING_MOUSECONTROLS_SAVETHESESETTINGS;
AvPMenu_KeyConfig[i].b.MenuToGoTo = AVPMENU_INGAME;
AvPMenu_KeyConfig[i].HelpString = TEXTSTRING_MOUSECONTROLS_SAVETHESESETTINGS_HELP;
i++;
AvPMenu_KeyConfig[i].ElementID = AVPMENU_ELEMENT_RESETKEYCONFIG;
AvPMenu_KeyConfig[i].TextDescription = TEXTSTRING_CONTROLS_RESETTODEFAULT;
AvPMenu_KeyConfig[i].a.TextDescription = TEXTSTRING_CONTROLS_RESETTODEFAULT;
AvPMenu_KeyConfig[i].HelpString = TEXTSTRING_CONTROLS_RESETTODEFAULT_HELP;
i++;
#if 1
for(j=0; j<NUMBER_OF_PREDATOR_INPUTS; j++)
{
AvPMenu_KeyConfig[i+j].ElementID = AVPMENU_ELEMENT_KEYCONFIG;
AvPMenu_KeyConfig[i+j].TextDescription = TEXTSTRING_PREDATOR_KEY_FORWARD+j;
AvPMenu_KeyConfig[i+j].MenuToGoTo = AVPMENU_MAIN;
AvPMenu_KeyConfig[i+j].a.TextDescription = TEXTSTRING_PREDATOR_KEY_FORWARD+j;
AvPMenu_KeyConfig[i+j].b.MenuToGoTo = AVPMENU_MAIN;
AvPMenu_KeyConfig[i+j].HelpString = TEXTSTRING_KEYCONTROLS_HELP;
}
#else
AvPMenu_KeyConfig[i].ElementID = AVPMENU_ELEMENT_BUTTONSETTING;
AvPMenu_KeyConfig[i].TextDescription = TEXTSTRING_PREDATOR_KEY_FORWARD;
AvPMenu_KeyConfig[i].a.TextDescription = TEXTSTRING_PREDATOR_KEY_FORWARD;
AvPMenu_KeyConfig[i].MaxSliderValue = NUMBER_OF_PREDATOR_INPUTS-1;
i++;
#endif
@ -1004,26 +1004,26 @@ extern void MakeMarineKeyConfigMenu(void)
int j;
AvPMenu_KeyConfig[i].ElementID = AVPMENU_ELEMENT_KEYCONFIGOK;
AvPMenu_KeyConfig[i].TextDescription = TEXTSTRING_MOUSECONTROLS_SAVETHESESETTINGS;
AvPMenu_KeyConfig[i].MenuToGoTo = AVPMENU_INGAME;
AvPMenu_KeyConfig[i].a.TextDescription = TEXTSTRING_MOUSECONTROLS_SAVETHESESETTINGS;
AvPMenu_KeyConfig[i].b.MenuToGoTo = AVPMENU_INGAME;
AvPMenu_KeyConfig[i].HelpString = TEXTSTRING_MOUSECONTROLS_SAVETHESESETTINGS_HELP;
i++;
AvPMenu_KeyConfig[i].ElementID = AVPMENU_ELEMENT_RESETKEYCONFIG;
AvPMenu_KeyConfig[i].TextDescription = TEXTSTRING_CONTROLS_RESETTODEFAULT;
AvPMenu_KeyConfig[i].a.TextDescription = TEXTSTRING_CONTROLS_RESETTODEFAULT;
AvPMenu_KeyConfig[i].HelpString = TEXTSTRING_CONTROLS_RESETTODEFAULT_HELP;
i++;
#if 1
for(j=0; j<NUMBER_OF_MARINE_INPUTS; j++)
{
AvPMenu_KeyConfig[i+j].ElementID = AVPMENU_ELEMENT_KEYCONFIG;
AvPMenu_KeyConfig[i+j].TextDescription = TEXTSTRING_MARINE_KEY_FORWARD+j;
AvPMenu_KeyConfig[i+j].MenuToGoTo = AVPMENU_MAIN;
AvPMenu_KeyConfig[i+j].a.TextDescription = TEXTSTRING_MARINE_KEY_FORWARD+j;
AvPMenu_KeyConfig[i+j].b.MenuToGoTo = AVPMENU_MAIN;
AvPMenu_KeyConfig[i+j].HelpString = TEXTSTRING_KEYCONTROLS_HELP;
}
#else
AvPMenu_KeyConfig[i].ElementID = AVPMENU_ELEMENT_BUTTONSETTING;
AvPMenu_KeyConfig[i].TextDescription = TEXTSTRING_MARINE_KEY_FORWARD;
AvPMenu_KeyConfig[i].MaxSliderValue = NUMBER_OF_MARINE_INPUTS-1;
AvPMenu_KeyConfig[i].a.TextDescription = TEXTSTRING_MARINE_KEY_FORWARD;
AvPMenu_KeyConfig[i].b.MaxSliderValue = NUMBER_OF_MARINE_INPUTS-1;
i++;
#endif
@ -1032,10 +1032,10 @@ extern void MakeMarineKeyConfigMenu(void)
AutoWeaponChangeOn_Temp = AutoWeaponChangeOn;
//add autoweapon change option , for lack of anywhere better to put it
AvPMenu_KeyConfig[i+j].ElementID = AVPMENU_ELEMENT_TEXTSLIDER;
AvPMenu_KeyConfig[i+j].TextDescription = TEXTSTRING_AUTOWEAPONCHANGE;
AvPMenu_KeyConfig[i+j].MaxSliderValue = 1;
AvPMenu_KeyConfig[i+j].SliderValuePtr = &AutoWeaponChangeOn_Temp;
AvPMenu_KeyConfig[i+j].FirstTextSliderString = TEXTSTRING_NO;
AvPMenu_KeyConfig[i+j].a.TextDescription = TEXTSTRING_AUTOWEAPONCHANGE;
AvPMenu_KeyConfig[i+j].b.MaxSliderValue = 1;
AvPMenu_KeyConfig[i+j].c.SliderValuePtr = &AutoWeaponChangeOn_Temp;
AvPMenu_KeyConfig[i+j].d.FirstTextSliderString = TEXTSTRING_NO;
AvPMenu_KeyConfig[i+j].HelpString = TEXTSTRING_AUTOWEAPONCHANGE_HELP;
AvPMenu_KeyConfig[i+j+1].ElementID = AVPMENU_ELEMENT_ENDOFMENU;
@ -1046,26 +1046,26 @@ extern void MakeAlienKeyConfigMenu(void)
int j;
AvPMenu_KeyConfig[i].ElementID = AVPMENU_ELEMENT_KEYCONFIGOK;
AvPMenu_KeyConfig[i].TextDescription = TEXTSTRING_MOUSECONTROLS_SAVETHESESETTINGS;
AvPMenu_KeyConfig[i].MenuToGoTo = AVPMENU_INGAME;
AvPMenu_KeyConfig[i].a.TextDescription = TEXTSTRING_MOUSECONTROLS_SAVETHESESETTINGS;
AvPMenu_KeyConfig[i].b.MenuToGoTo = AVPMENU_INGAME;
AvPMenu_KeyConfig[i].HelpString = TEXTSTRING_MOUSECONTROLS_SAVETHESESETTINGS_HELP;
i++;
AvPMenu_KeyConfig[i].ElementID = AVPMENU_ELEMENT_RESETKEYCONFIG;
AvPMenu_KeyConfig[i].TextDescription = TEXTSTRING_CONTROLS_RESETTODEFAULT;
AvPMenu_KeyConfig[i].a.TextDescription = TEXTSTRING_CONTROLS_RESETTODEFAULT;
AvPMenu_KeyConfig[i].HelpString = TEXTSTRING_CONTROLS_RESETTODEFAULT_HELP;
i++;
#if 1
for(j=0; j<NUMBER_OF_ALIEN_INPUTS; j++)
{
AvPMenu_KeyConfig[i+j].ElementID = AVPMENU_ELEMENT_KEYCONFIG;
AvPMenu_KeyConfig[i+j].TextDescription = TEXTSTRING_ALIEN_KEY_FORWARD+j;
AvPMenu_KeyConfig[i+j].MenuToGoTo = AVPMENU_MAIN;
AvPMenu_KeyConfig[i+j].a.TextDescription = TEXTSTRING_ALIEN_KEY_FORWARD+j;
AvPMenu_KeyConfig[i+j].b.MenuToGoTo = AVPMENU_MAIN;
AvPMenu_KeyConfig[i+j].HelpString = TEXTSTRING_KEYCONTROLS_HELP;
}
#else
AvPMenu_KeyConfig[i].ElementID = AVPMENU_ELEMENT_BUTTONSETTING;
AvPMenu_KeyConfig[i].TextDescription = TEXTSTRING_ALIEN_KEY_FORWARD;
AvPMenu_KeyConfig[i].MaxSliderValue = NUMBER_OF_ALIEN_INPUTS-1;
AvPMenu_KeyConfig[i].a.TextDescription = TEXTSTRING_ALIEN_KEY_FORWARD;
AvPMenu_KeyConfig[i].b.MaxSliderValue = NUMBER_OF_ALIEN_INPUTS-1;
i++;
#endif
AvPMenu_KeyConfig[i+j].ElementID = AVPMENU_ELEMENT_ENDOFMENU;
@ -1074,7 +1074,7 @@ extern void MakeAlienKeyConfigMenu(void)
extern void MakeUserProfileSelectMenu(void)
{
int n = NumberOfUserProfiles();
AvPMenu_UserProfileSelect[0].MaxSliderValue = n;
AvPMenu_UserProfileSelect[0].b.MaxSliderValue = n;
if (n>0) 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()
}
}

18
src/avp/win95/frontend/avp_menus.h
View file

@ -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;

17
src/avp/win95/scrshot.cpp
View file

@ -1,15 +1,15 @@
#include "3dc.h"
#include "bmp2.h"
#include "endianio.h"
#include <String.hpp>
#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<h.WinInfo.Width; ++j)
{
colour=*(short*)&BufferPtr[j*2];
fprintf(stderr, "ScreenShot: VideoModeTypeScreen==VideoModeType_15\n");
/*
PutByte((BYTE)(((colour & DisplayPixelFormat.dwBBitMask)>>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)

10
src/main.c
View file

@ -6,6 +6,16 @@
#include "fixer.h"
PROCESSORTYPES ReadProcessorType()
{
return PType_PentiumMMX;
}
int InitialiseWindowsSystem()
{
return 0;
}
int main(int argc, char *argv[])
{
return 0;

2
src/module.c
View file

@ -1127,5 +1127,3 @@ int IsAIModuleVisibleFromAIModule(AIMODULE *source,AIMODULE *target) {
}
#endif

9
src/win95/awtexld.cpp
View file

@ -1,4 +1,5 @@
#include "advwin32.h"
#include "fixer.h"
#ifndef DB_LEVEL
#define DB_LEVEL 4
#endif
@ -19,10 +20,8 @@
#include <stdarg.h>
#include <limits.h>
#include "awTexLd.h"
#pragma warning(disable: 4701)
#include "awTexLd.hpp"
#pragma warning(default: 4701)
#include "awtexld.h"
#include "awtexld.hpp"
#ifdef _CPPRTTI
#include <typeinfo.h>

2
src/win95/dd_func.cpp
View file

@ -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

19
src/win95/io.c
View file

@ -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!!!

79
src/win95/platform.h
View file

@ -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);