summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/avp/davehook.cpp4
-rw-r--r--src/avp/game_statistics.c11
-rw-r--r--src/avp/game_statistics.h4
-rw-r--r--src/avp/win95/frontend/avp_menudata.c121
-rw-r--r--src/avp/win95/frontend/avp_menus.h18
-rw-r--r--src/avp/win95/scrshot.cpp17
-rw-r--r--src/main.c10
-rw-r--r--src/module.c2
-rw-r--r--src/win95/awtexld.cpp9
-rw-r--r--src/win95/dd_func.cpp2
-rw-r--r--src/win95/io.c19
-rw-r--r--src/win95/platform.h79
12 files changed, 102 insertions, 194 deletions
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; 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()
}
}
-
-
-
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 <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)
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 <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>
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
@@ -36,25 +36,6 @@
#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!!!
Leave this 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).
@@ -378,15 +360,6 @@ typedef enum {
/*
- 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
@@ -563,42 +521,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
loader.
@@ -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);
generated by cgit v1.3 (git 2.53.0) at 2026-03-22 09:31:20 +0000