AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-26 06:20:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

support crosshair patches from extras.wad

Browse Source
This commit is contained in:
Fabian Greffrath 2022-03-24 12:21:09 +01:00
parent 7c7168186e
commit 56717231b0
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cross.h
View File

@ -19,20 +19,20 @@
// DESCRIPTION: // DESCRIPTION:
// crosshair patches // crosshair patches
static unsigned char cross1[] = { static unsigned char cross00[] = {
5,0,5,0,0,0,0,0,28,0,0,0,34,0,0,0,40,0,0,0,53,0,0,0,59,0,0,0,2,1,0,184,0,255, 5,0,5,0,0,0,0,0,28,0,0,0,34,0,0,0,40,0,0,0,53,0,0,0,59,0,0,0,2,1,0,184,0,255,
2,1,0,184,0,255,0,2,0,184,184,0,3,2,0,184,184,0,255,2,1,0,184,0,255,2,1,0, 2,1,0,184,0,255,0,2,0,184,184,0,3,2,0,184,184,0,255,2,1,0,184,0,255,2,1,0,
184,0,255, 184,0,255,
}; };
static unsigned char cross2[] = { static unsigned char cross01[] = {
5,0,5,0,0,0,0,0,28,0,0,0,29,0,0,0,30,0,0,0,38,0,0,0,44,0,0,0,255,255,2,3,0, 5,0,5,0,0,0,0,0,28,0,0,0,29,0,0,0,30,0,0,0,38,0,0,0,44,0,0,0,255,255,2,3,0,
184,184,184,0,255,2,1,0,184,0,255,2,1,0,184,0,255, 184,184,184,0,255,2,1,0,184,0,255,2,1,0,184,0,255,
}; };
static unsigned char cross3[] = { static unsigned char cross02[] = {
5,0,5,0,0,0,0,0,28,0,0,0,29,0,0,0,30,0,0,0,36,0,0,0,37,0,0,0,255,255,2,1,0, 5,0,5,0,0,0,0,0,28,0,0,0,29,0,0,0,30,0,0,0,36,0,0,0,37,0,0,0,255,255,2,1,0,
184,0,255,255,255, 184,0,255,255,255,
}; };
static unsigned char cross4[] = { static unsigned char cross03[] = {
0x09, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x09, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00,
0x32, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
0x3f, 0x00, 0x00, 0x00, 0x4e, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x4e, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00,

10
Source/hu_stuff.c
View File

@ -435,6 +435,14 @@ void HU_Init(void)
hu_fontk[3] = (patch_t *) W_CacheLumpName("STKEYS3", PU_STATIC); hu_fontk[3] = (patch_t *) W_CacheLumpName("STKEYS3", PU_STATIC);
hu_fontk[4] = (patch_t *) W_CacheLumpName("STKEYS4", PU_STATIC); hu_fontk[4] = (patch_t *) W_CacheLumpName("STKEYS4", PU_STATIC);
hu_fontk[5] = (patch_t *) W_CacheLumpName("STKEYS5", PU_STATIC); hu_fontk[5] = (patch_t *) W_CacheLumpName("STKEYS5", PU_STATIC);
// [FG] support crosshair patches from extras.wad
for (i = 1; i < HU_CROSSHAIRS; i++)
{
j = W_CheckNumForName(crosshair_nam[i]);
if (j >= num_predefined_lumps)
crosshair_str[i] = crosshair_nam[i];
}
} }
// //
@ -869,7 +877,7 @@ typedef struct
static crosshair_t crosshair; static crosshair_t crosshair;
const char *crosshair_nam[HU_CROSSHAIRS] = const char *crosshair_nam[HU_CROSSHAIRS] =
{ NULL, "CROSS1", "CROSS2", "CROSS3", "CROSS4" }; { NULL, "CROSS00", "CROSS01", "CROSS02", "CROSS03" };
const char *crosshair_str[HU_CROSSHAIRS+1] = const char *crosshair_str[HU_CROSSHAIRS+1] =
{ "none", "cross", "angle", "dot", "big", NULL }; { "none", "cross", "angle", "dot", "big", NULL };

8
Source/info.c
View File

@ -7939,10 +7939,10 @@ const lumpinfo_t predefined_lumps[]={
{ "BOXLR", sizeof boxlr, boxlr }, { "BOXLR", sizeof boxlr, boxlr },
// [FG] crosshair patches // [FG] crosshair patches
{ "CROSS1", sizeof cross1, cross1 }, { "CROSS00", sizeof cross00, cross00 },
{ "CROSS2", sizeof cross2, cross2 }, { "CROSS01", sizeof cross01, cross01 },
{ "CROSS3", sizeof cross3, cross3 }, { "CROSS02", sizeof cross02, cross02 },
{ "CROSS4", sizeof cross4, cross4 }, { "CROSS03", sizeof cross03, cross03 },
// killough 8/98: remove ENDBOOM lump, use id's ENDOOM instead // killough 8/98: remove ENDBOOM lump, use id's ENDOOM instead

8
Source/m_menu.c
View File

@ -3136,24 +3136,24 @@ static void M_UpdateCrosshairItems (void)
{ {
if (hud_crosshair) if (hud_crosshair)
{ {
stat_settings2[8].m_flags &= ~S_DISABLE;
stat_settings2[9].m_flags &= ~S_DISABLE; stat_settings2[9].m_flags &= ~S_DISABLE;
stat_settings2[10].m_flags &= ~S_DISABLE; stat_settings2[10].m_flags &= ~S_DISABLE;
stat_settings2[11].m_flags &= ~S_DISABLE;
if (hud_crosshair_target) if (hud_crosshair_target)
{ {
stat_settings2[11].m_flags &= ~S_DISABLE; stat_settings2[12].m_flags &= ~S_DISABLE;
} }
else else
{ {
stat_settings2[11].m_flags |= S_DISABLE; stat_settings2[12].m_flags |= S_DISABLE;
} }
} }
else else
{ {
stat_settings2[8].m_flags |= S_DISABLE;
stat_settings2[9].m_flags |= S_DISABLE; stat_settings2[9].m_flags |= S_DISABLE;
stat_settings2[10].m_flags |= S_DISABLE; stat_settings2[10].m_flags |= S_DISABLE;
stat_settings2[11].m_flags |= S_DISABLE; stat_settings2[11].m_flags |= S_DISABLE;
stat_settings2[12].m_flags |= S_DISABLE;
} }
} }