AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-25 13:55:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

some clean-up, mostly whitespace, some comments

Browse Source
This commit is contained in:
Fabian Greffrath 2021-02-01 15:09:22 +01:00
parent b704f5f7a0
commit 8e2c5d8297
15 changed files with 51 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/d_player.h
View File

@ -169,9 +169,6 @@ typedef struct player_s
// True if secret level has been done.
boolean didsecret;
// [crispy] show centered "Secret Revealed!" message
//char* centermessage;
// [AM] Previous position of viewz before think.
// Used to interpolate between camera positions.
angle_t oldviewz;

3
Source/hu_stuff.c
View File

@ -43,7 +43,7 @@
int hud_active; //jff 2/17/98 controls heads-up display mode
int hud_displayed; //jff 2/23/98 turns heads-up display on/off
int hud_nosecrets; //jff 2/18/98 allows secrets line to be disabled in HUD
int hud_secret_message; // "A secret is revealed" message
int hud_secret_message; // "A secret is revealed!" message
int hud_distributed; //jff 3/4/98 display HUD in different places on screen
int hud_graph_keys=1; //jff 3/7/98 display HUD keys as graphics
@ -1325,6 +1325,7 @@ void HU_Ticker(void)
if (showMessages || message_dontfuckwithme)
{
// [Woof!] "A secret is revealed!" message
if (plr->message == s_HUSTR_SECRETFOUND)
{
extern int M_StringWidth(const char *string);

2
Source/hu_stuff.h
View File

@ -84,7 +84,7 @@ extern int hud_displayed; // hud is displayed
//jff 2/18/98 hud/status control
extern int hud_active; // hud mode 0=off, 1=small, 2=full
extern int hud_nosecrets; // status does not list secrets/items/kills
extern int hud_secret_message; // "A secret is revealed" message
extern int hud_secret_message; // "A secret is revealed!" message
extern int map_player_coords, map_level_stats, map_level_time; // [FG] level stats and level time widgets
#endif

20
Source/i_video.c
View File

@ -1077,7 +1077,7 @@ static void I_GetWindowPosition(int *x, int *y, int w, int h)
void I_GetScreenDimensions(void)
{
SDL_DisplayMode mode;
int w = 16, h = 10;
int w = 16, h = 9;
int ah;
static boolean firsttime = true;
@ -1109,24 +1109,6 @@ void I_GetScreenDimensions(void)
// [crispy] widescreen rendering makes no sense without aspect ratio correction
if (widescreen && useaspect)
{
// switch(crispy->widescreen)
// {
// case RATIO_16_10:
// w = 16;
// h = 10;
// break;
// case RATIO_16_9:
// w = 16;
// h = 9;
// break;
// case RATIO_21_9:
// w = 21;
// h = 9;
// break;
// default:
// break;
// }
SCREENWIDTH = w * ah / h;
// [crispy] make sure SCREENWIDTH is an integer multiple of 4 ...
SCREENWIDTH = (SCREENWIDTH + (hires ? 0 : 3)) & (int)~3;

30
Source/m_menu.c
View File

@ -1786,16 +1786,16 @@ void M_DrawBackground(char* patchname, byte *back_dest)
#else // while this pixel-doubles it
/*
for (y = 0 ; y < SCREENHEIGHT ; src = ((++y & 63)<<6) + back_src,
back_dest += SCREENWIDTH*2)
for (x = 0 ; x < SCREENWIDTH/64 ; x++)
{
int i = 63;
do
back_dest[i*2] = back_dest[i*2+SCREENWIDTH*2] =
back_dest[i*2+1] = back_dest[i*2+SCREENWIDTH*2+1] = src[i];
while (--i>=0);
back_dest += 128;
}
back_dest += SCREENWIDTH*2)
for (x = 0 ; x < SCREENWIDTH/64 ; x++)
{
int i = 63;
do
back_dest[i*2] = back_dest[i*2+SCREENWIDTH*2] =
back_dest[i*2+1] = back_dest[i*2+SCREENWIDTH*2+1] = src[i];
while (--i>=0);
back_dest += 128;
}
*/
for (int y = 0; y < SCREENHEIGHT<<1; y++)
for (int x = 0; x < SCREENWIDTH<<1; x += 2)
@ -1810,10 +1810,10 @@ void M_DrawBackground(char* patchname, byte *back_dest)
/*
for (y = 0 ; y < SCREENHEIGHT ; src = ((++y & 63)<<6) + back_src)
for (x = 0 ; x < SCREENWIDTH/64 ; x++)
{
memcpy (back_dest,back_src+((y & 63)<<6),64);
back_dest += 64;
}
{
memcpy (back_dest,back_src+((y & 63)<<6),64);
back_dest += 64;
}
*/
for (y = 0; y < SCREENHEIGHT; y++)
for (x = 0; x < SCREENWIDTH; x++)
@ -2809,7 +2809,7 @@ setup_menu_t stat_settings1[] = // Status Bar and HUD Settings screen
{"ARMOR GOOD/EXTRA" ,S_NUM ,m_null,ST_X,ST_Y+13*8, {"armor_green"}},
{"AMMO LOW/OK" ,S_NUM ,m_null,ST_X,ST_Y+14*8, {"ammo_red"}},
{"AMMO OK/GOOD" ,S_NUM ,m_null,ST_X,ST_Y+15*8, {"ammo_yellow"}},
{"\"A SECRET IS REVEALED\" MESSAGE",S_YESNO,m_null,ST_X,ST_Y+16*8, {"hud_secret_message"}},
{"\"A SECRET IS REVEALED!\" MESSAGE",S_YESNO,m_null,ST_X,ST_Y+16*8, {"hud_secret_message"}},
// Button for resetting to defaults
{0,S_RESET,m_null,X_BUTTON,Y_BUTTON},

5
Source/m_misc.c
View File

@ -1698,11 +1698,12 @@ default_t defaults[] = {
"1 to disable display of kills/items/secrets on HUD"
},
{ // "A secret is revealed" message
// "A secret is revealed!" message
{
"hud_secret_message",
(config_t *) &hud_secret_message, NULL,
{0}, {0,1}, number, ss_none, wad_no,
"\"A secret is revealed\" message"
"\"A secret is revealed!\" message"
},
{ // killough 2/8/98: weapon preferences set by user:

2
Source/mmus2mid.c
View File

@ -303,6 +303,8 @@ int mmus2mid(UBYTE *mus, MIDI *mididata, UWORD division, int nocomp)
signed char MUS2MIDchannel[MIDI_TRACKS];
// copy the MUS header from the MUS buffer to the MUSh header structure
// [Woof!] fix MIDI endianess
memcpy(MUSh.ID, mus, 4);
MUSh.ScoreLength = READ_INT16(&mus[4]);
MUSh.ScoreStart = READ_INT16(&mus[6]);

2
Source/w_wad.c
View File

@ -429,7 +429,7 @@ void W_InitMultipleFiles(char *const *filenames)
// killough 4/4/98: add colormap markers
W_CoalesceMarkedResource("C_START", "C_END", ns_colormaps);
// To ignore lumps between HI_START / HI_END markers
// [Woof!] namespace to avoid conflicts with high-resolution textures
W_CoalesceMarkedResource("HI_START", "HI_END", ns_hires);
// set up caching

2
Source/w_wad.h
View File

@ -70,7 +70,7 @@ typedef struct
ns_sprites,
ns_flats,
ns_colormaps,
ns_hires // namespace to avoid conflicts with high-resolution textures
ns_hires // [Woof!] namespace to avoid conflicts with high-resolution textures
} namespace;
int handle;