Skip to content

Commit

Permalink
Fix typo.
Browse files Browse the repository at this point in the history
  • Loading branch information
@JadingTsunami
JadingTsunami committed Feb 12, 2024
1 parent ba5682a commit baf8ada
Show file tree
Hide file tree
Showing 2 changed files with 307 additions and 1 deletion.
2 changes: 1 addition & 1 deletion prboom2/src/SDL/i_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ static void I_Quit (void)
if (demorecording)
G_CheckDemoStatus();
M_SaveDefaults ();
if (!netgame && !demorecording && !demoplayback && !gameaction == ga_playdemo)
if (!netgame && !demorecording && !demoplayback && gameaction != ga_playdemo)
C_SaveSettings();
I_DemoExShutdown();
}
Expand Down
306 changes: 306 additions & 0 deletions prboom2/src/spectre.inl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,306 @@
/* Emacs style mode select -*- C++ -*-
*-----------------------------------------------------------------------------
*
*
* PrBoom: a Doom port merged with LxDoom and LSDLDoom
* based on BOOM, a modified and improved DOOM engine
* Copyright (C) 1999 by
* id Software, Chi Hoang, Lee Killough, Jim Flynn, Rand Phares, Ty Halderman
* Copyright (C) 1999-2000 by
* Jess Haas, Nicolas Kalkhof, Colin Phipps, Florian Schulze
* Copyright 2005, 2006 by
* Florian Schulze, Colin Phipps, Neil Stevens, Andrey Budko
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*
*-----------------------------------------------------------------------------*/

#if (R_DRAWCOLUMN_PIPELINE_BITS == 8)
#define SCREENTYPE byte
#define TOPLEFT byte_topleft
#define PITCH byte_pitch
#define TEMPBUF byte_tempbuf
#elif (R_DRAWCOLUMN_PIPELINE_BITS == 15)
#define SCREENTYPE unsigned short
#define TOPLEFT short_topleft
#define PITCH short_pitch
#define TEMPBUF short_tempbuf
#elif (R_DRAWCOLUMN_PIPELINE_BITS == 16)
#define SCREENTYPE unsigned short
#define TOPLEFT short_topleft
#define PITCH short_pitch
#define TEMPBUF short_tempbuf
#elif (R_DRAWCOLUMN_PIPELINE_BITS == 32)
#define SCREENTYPE unsigned int
#define TOPLEFT int_topleft
#define PITCH int_pitch
#define TEMPBUF int_tempbuf
#endif

#if (R_DRAWCOLUMN_PIPELINE & RDC_TRANSLUCENT)
#define GETDESTCOLOR8(col1, col2) (temptranmap[((col1)<<8)+(col2)])
#define GETDESTCOLOR15(col1, col2) (GETBLENDED15_3268((col1), (col2)))
#define GETDESTCOLOR16(col1, col2) (GETBLENDED16_3268((col1), (col2)))
#define GETDESTCOLOR32(col1, col2) (GETBLENDED32_3268((col1), (col2)))
#elif (R_DRAWCOLUMN_PIPELINE & RDC_FUZZ)
#define GETDESTCOLOR8(col) (tempfuzzmap[6*256+(col)])
#define GETDESTCOLOR15(col) GETBLENDED15_9406(col, 0)
#define GETDESTCOLOR16(col) GETBLENDED16_9406(col, 0)
#define GETDESTCOLOR32(col) GETBLENDED32_9406(col, 0)
#else
#define GETDESTCOLOR8(col) (col)
#define GETDESTCOLOR15(col) (col)
#define GETDESTCOLOR16(col) (col)
#define GETDESTCOLOR32(col) (col)
#endif

#if (R_DRAWCOLUMN_PIPELINE & RDC_TRANSLUCENT)
#if (R_DRAWCOLUMN_PIPELINE_BITS == 8)
#define GETDESTCOLOR(col1, col2) GETDESTCOLOR8(col1, col2)
#elif (R_DRAWCOLUMN_PIPELINE_BITS == 15)
#define GETDESTCOLOR(col1, col2) GETDESTCOLOR15(col1, col2)
#elif (R_DRAWCOLUMN_PIPELINE_BITS == 16)
#define GETDESTCOLOR(col1, col2) GETDESTCOLOR16(col1, col2)
#elif (R_DRAWCOLUMN_PIPELINE_BITS == 32)
#define GETDESTCOLOR(col1, col2) GETDESTCOLOR32(col1, col2)
#endif
#else
#if (R_DRAWCOLUMN_PIPELINE_BITS == 8)
#define GETDESTCOLOR(col) GETDESTCOLOR8(col)
#define WIGGLE(col) (-6*256 + col)
#elif (R_DRAWCOLUMN_PIPELINE_BITS == 15)
#define GETDESTCOLOR(col) GETDESTCOLOR15(col)
#define WIGGLE(col) (col&0x7f00)
#elif (R_DRAWCOLUMN_PIPELINE_BITS == 16)
#define GETDESTCOLOR(col) GETDESTCOLOR16(col)
#define WIGGLE(col) (col&0xff00)
#elif (R_DRAWCOLUMN_PIPELINE_BITS == 32)
#define GETDESTCOLOR(col) GETDESTCOLOR32(col)
#define WIGGLE(col) ((col<<4)/15)
#endif
#endif

//
// R_FlushWholeOpaque
//
// Flushes the entire columns in the buffer, one at a time.
// This is used when a quad flush isn't possible.
// Opaque version -- no remapping whatsoever.
//
static void R_FLUSHWHOLE_FUNCNAME(void)
{
SCREENTYPE *source;
SCREENTYPE *dest;
int count, yl;

while(--temp_x >= 0)
{
yl = tempyl[temp_x];
source = &TEMPBUF[temp_x + (yl << 2)];
dest = drawvars.TOPLEFT + yl*drawvars.PITCH + startx + temp_x;
count = tempyh[temp_x] - yl + 1;

while(--count >= 0)
{
#if (R_DRAWCOLUMN_PIPELINE & RDC_TRANSLUCENT)
*dest = GETDESTCOLOR(*dest, *source);
#elif (R_DRAWCOLUMN_PIPELINE & RDC_FUZZ)
// SoM 7-28-04: Fix the fuzz problem.

*dest = GETDESTCOLOR( ((count != tempyh[temp_x]-yl) && fuzzoffset[fuzzpos] < 0) ? WIGGLE(dest[fuzzoffset[fuzzpos]]) : dest[fuzzoffset[fuzzpos]]);

// Clamp table lookup index.
if(++fuzzpos == FUZZTABLE)
fuzzpos = 0;
#else
*dest = *source;
#endif

source += 4;
dest += drawvars.PITCH;
}
}
}

//
// R_FlushHTOpaque
//
// Flushes the head and tail of columns in the buffer in
// preparation for a quad flush.
// Opaque version -- no remapping whatsoever.
//
static void R_FLUSHHEADTAIL_FUNCNAME(void)
{
SCREENTYPE *source;
SCREENTYPE *dest;
int count, colnum = 0;
int yl, yh;

while(colnum < 4)
{
yl = tempyl[colnum];
yh = tempyh[colnum];

// flush column head
if(yl < commontop)
{
source = &TEMPBUF[colnum + (yl << 2)];
dest = drawvars.TOPLEFT + yl*drawvars.PITCH + startx + colnum;
count = commontop - yl;

while(--count >= 0)
{
#if (R_DRAWCOLUMN_PIPELINE & RDC_TRANSLUCENT)
// haleyjd 09/11/04: use temptranmap here
*dest = GETDESTCOLOR(*dest, *source);
#elif (R_DRAWCOLUMN_PIPELINE & RDC_FUZZ)
// SoM 7-28-04: Fix the fuzz problem.
*dest = GETDESTCOLOR( ((count != yh-yl) && fuzzoffset[fuzzpos] < 0) ? WIGGLE(dest[fuzzoffset[fuzzpos]]) : dest[fuzzoffset[fuzzpos]]);

// Clamp table lookup index.
if(++fuzzpos == FUZZTABLE)
fuzzpos = 0;
#else
*dest = *source;
#endif

source += 4;
dest += drawvars.PITCH;
}
}

// flush column tail
if(yh > commonbot)
{
source = &TEMPBUF[colnum + ((commonbot + 1) << 2)];
dest = drawvars.TOPLEFT + (commonbot + 1)*drawvars.PITCH + startx + colnum;
count = yh - commonbot;

while(--count >= 0)
{
#if (R_DRAWCOLUMN_PIPELINE & RDC_TRANSLUCENT)
// haleyjd 09/11/04: use temptranmap here
*dest = GETDESTCOLOR(*dest, *source);
#elif (R_DRAWCOLUMN_PIPELINE & RDC_FUZZ)
// SoM 7-28-04: Fix the fuzz problem.
*dest = GETDESTCOLOR( ((count != yh-yl) && fuzzoffset[fuzzpos] < 0) ? WIGGLE(dest[fuzzoffset[fuzzpos]]) : dest[fuzzoffset[fuzzpos]]);

// Clamp table lookup index.
if(++fuzzpos == FUZZTABLE)
fuzzpos = 0;
#else
*dest = *source;
#endif

source += 4;
dest += drawvars.PITCH;
}
}
++colnum;
}
}

static void R_FLUSHQUAD_FUNCNAME(void)
{
SCREENTYPE *source = &TEMPBUF[commontop << 2];
SCREENTYPE *dest = drawvars.TOPLEFT + commontop*drawvars.PITCH + startx;
int count;
#if (R_DRAWCOLUMN_PIPELINE & RDC_FUZZ)
int fuzz1, fuzz2, fuzz3, fuzz4;

fuzz1 = fuzzpos;
fuzz2 = (fuzz1 + tempyl[1]) % FUZZTABLE;
fuzz3 = (fuzz2 + tempyl[2]) % FUZZTABLE;
fuzz4 = (fuzz3 + tempyl[3]) % FUZZTABLE;
#endif

count = commonbot - commontop + 1;

#if (R_DRAWCOLUMN_PIPELINE & RDC_TRANSLUCENT)
while(--count >= 0)
{
dest[0] = GETDESTCOLOR(dest[0], source[0]);
dest[1] = GETDESTCOLOR(dest[1], source[1]);
dest[2] = GETDESTCOLOR(dest[2], source[2]);
dest[3] = GETDESTCOLOR(dest[3], source[3]);
source += 4 * sizeof(byte);
dest += drawvars.PITCH * sizeof(byte);
}
#elif (R_DRAWCOLUMN_PIPELINE & RDC_FUZZ)
while(--count >= 0)
{

dest[0] = GETDESTCOLOR( (fuzzoffset[fuzz1] < 0) ? WIGGLE(dest[fuzzoffset[fuzz1]]) : dest[fuzzoffset[fuzz1]]);
dest[1] = GETDESTCOLOR( (fuzzoffset[fuzz2] < 0) ? WIGGLE(dest[1+fuzzoffset[fuzz2]]) : dest[1+fuzzoffset[fuzz2]]);
dest[2] = GETDESTCOLOR( (fuzzoffset[fuzz3] < 0) ? WIGGLE(dest[2+fuzzoffset[fuzz3]]) : dest[2+fuzzoffset[fuzz3]]);
dest[3] = GETDESTCOLOR( (fuzzoffset[fuzz4] < 0) ? WIGGLE(dest[3+fuzzoffset[fuzz4]]) : dest[3+fuzzoffset[fuzz4]]);
fuzz1 = (fuzz1 + 1) % FUZZTABLE;
fuzz2 = (fuzz2 + 1) % FUZZTABLE;
fuzz3 = (fuzz3 + 1) % FUZZTABLE;
fuzz4 = (fuzz4 + 1) % FUZZTABLE;
source += 4 * sizeof(byte);
dest += drawvars.PITCH * sizeof(byte);
}
#else
#if (R_DRAWCOLUMN_PIPELINE_BITS == 8)
if ((sizeof(int) == 4) && (((intptr_t)source % 4) == 0) && (((intptr_t)dest % 4) == 0)) {
while(--count >= 0)
{
*(int *)dest = *(int *)source;
source += 4 * sizeof(byte);
dest += drawvars.PITCH * sizeof(byte);
}
} else {
while(--count >= 0)
{
dest[0] = source[0];
dest[1] = source[1];
dest[2] = source[2];
dest[3] = source[3];
source += 4 * sizeof(byte);
dest += drawvars.PITCH * sizeof(byte);
}
}
#else
while(--count >= 0)
{
dest[0] = source[0];
dest[1] = source[1];
dest[2] = source[2];
dest[3] = source[3];
source += 4;
dest += drawvars.PITCH;
}
#endif
#endif
}

#undef GETDESTCOLOR32
#undef GETDESTCOLOR16
#undef GETDESTCOLOR15
#undef GETDESTCOLOR8
#undef GETDESTCOLOR

#undef TEMPBUF
#undef PITCH
#undef TOPLEFT
#undef SCREENTYPE

#undef R_DRAWCOLUMN_PIPELINE_BITS
#undef R_DRAWCOLUMN_PIPELINE
#undef R_FLUSHWHOLE_FUNCNAME
#undef R_FLUSHHEADTAIL_FUNCNAME
#undef R_FLUSHQUAD_FUNCNAME

0 comments on commit baf8ada

Please sign in to comment.