zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- moved the last remaining function out of baselayer.cpp and removed that file.

Browse source 
g_logFlushWindow was deleted entirely because with the current console this is not needed anymore.
This commit is contained in:
Christoph Oelckers 2020-01-01 12:01:26 +01:00
parent 7ec8368688
commit d09b83d4a5
10 changed files with 39 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/CMakeLists.txt
View file

@ -683,7 +683,6 @@ set (PCH_SOURCES
# Todo: Split out the license-safe code from this.
build/src/a-c.cpp
build/src/animvpx.cpp
build/src/baselayer.cpp
build/src/clip.cpp
build/src/colmatch.cpp
build/src/common.cpp

54
source/build/src/baselayer.cpp
View file

@ -1,54 +0,0 @@
#include "compat.h"
#include "osd.h"
#include "build.h"
#include "baselayer.h"
#include "baselayer.h"
#include "a.h"
#include "polymost.h"
#include "inputstate.h"
#include "d_event.h"
#include "../../glbackend/glbackend.h"
int GUICapture = false;
// Calculate ylookup[] and call setvlinebpl()
void calc_ylookup(int32_t bpl, int32_t lastyidx)
{
int32_t i, j=0;
static int32_t ylookupsiz;
Bassert(lastyidx <= MAXYDIM);
lastyidx++;
if (lastyidx > ylookupsiz)
{
ylookup.Resize(lastyidx);
ylookupsiz = lastyidx;
}
for (i=0; i<=lastyidx-4; i+=4)
{
ylookup[i] = j;
ylookup[i + 1] = j + bpl;
ylookup[i + 2] = j + (bpl << 1);
ylookup[i + 3] = j + (bpl * 3);
j += (bpl << 2);
}
for (; i<lastyidx; i++)
{
ylookup[i] = j;
j += bpl;
}
setvlinebpl(bpl);
}
int32_t g_logFlushWindow = 1;

9
source/build/src/defs.cpp
View file

@ -158,9 +158,7 @@ static void defsparser_include(const char *fn, const scriptfile *script, const c
{
if (!cmdtokptr)
{
g_logFlushWindow = 1;
initprintf("Loading module \"%s\"\n",fn);
g_logFlushWindow = 0;
}
defsparser(included);
@ -299,9 +297,7 @@ static int32_t defsparser(scriptfile *script)
#ifdef USE_DEF_PROGRESS
if (++iter >= 50)
{
g_logFlushWindow = 1;
initprintf(".");
g_logFlushWindow = 0;
iter = 0;
}
#endif
@ -3443,15 +3439,12 @@ static int32_t defsparser(scriptfile *script)
int32_t loaddefinitionsfile(const char *fn)
{
scriptfile *script;
int32_t f = g_logFlushWindow;
script = scriptfile_fromfile(fn);
if (script)
{
g_logFlushWindow = 1;
initprintf("Loading \"%s\"\n",fn);
g_logFlushWindow = 0;
defsparser(script);
}
@ -3459,8 +3452,6 @@ int32_t loaddefinitionsfile(const char *fn)
if (userConfig.AddDefs) for (auto& m : *userConfig.AddDefs)
defsparser_include(m, NULL, NULL);
g_logFlushWindow = f;
if (script)
scriptfile_close(script);

2
source/build/src/engine.cpp
View file

@ -10557,6 +10557,8 @@ void rotatesprite_(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t picnum,
}
//
// clearview
//

35
source/build/src/sdlayer.cpp
View file

@ -158,6 +158,41 @@ void videoResetMode(void)
videomodereset = 1;
}
// Calculate ylookup[] and call setvlinebpl()
void calc_ylookup(int32_t bpl, int32_t lastyidx)
{
int32_t i, j = 0;
static int32_t ylookupsiz;
Bassert(lastyidx <= MAXYDIM);
lastyidx++;
if (lastyidx > ylookupsiz)
{
ylookup.Resize(lastyidx);
ylookupsiz = lastyidx;
}
for (i = 0; i <= lastyidx - 4; i += 4)
{
ylookup[i] = j;
ylookup[i + 1] = j + bpl;
ylookup[i + 2] = j + (bpl << 1);
ylookup[i + 3] = j + (bpl * 3);
j += (bpl << 2);
}
for (; i < lastyidx; i++)
{
ylookup[i] = j;
j += bpl;
}
setvlinebpl(bpl);
}
//
// begindrawing() -- locks the framebuffer for drawing
//

2
source/common/inputstate.cpp
View file

@ -36,6 +36,8 @@
#include "build.h"
#include "gamecvars.h"
int GUICapture = false;
//==========================================================================
//
//

3
source/duke3d/src/game.cpp
View file

@ -5724,9 +5724,6 @@ int GameInterface::app_main()
S_InitSound();
g_logFlushWindow = 0;
G_SetupCheats();
if (SHAREWARE)

4
source/duke3d/src/gamedef.cpp
View file

@ -5906,8 +5906,6 @@ void C_Compile(const char *fileName)
initprintf("Compiling: %s (%d bytes)\n", fileName, kFileLen);
g_logFlushWindow = 0;
uint32_t const startcompiletime = timerGetTicks();
char * mptr = (char *)Xmalloc(kFileLen+1);
@ -5942,8 +5940,6 @@ void C_Compile(const char *fileName)
C_Include(m);
}
g_logFlushWindow = 1;
if (g_errorCnt > 63)
initprintf("fatal error: too many errors: Aborted\n");

2
source/rr/src/game.cpp
View file

@ -7164,8 +7164,6 @@ int GameInterface::app_main()
S_InitSound();
g_logFlushWindow = 0;
if (RR)
{
g_cdTrack = -1;

4
source/rr/src/gamedef.cpp
View file

@ -2212,8 +2212,6 @@ void C_Compile(const char *fileName)
initprintf("Compiling: %s (%d bytes)\n", fileName, kFileLen);
g_logFlushWindow = 0;
uint32_t const startcompiletime = timerGetTicks();
char * mptr = (char *)Xmalloc(kFileLen+1);
@ -2250,8 +2248,6 @@ void C_Compile(const char *fileName)
}
userConfig.AddCons.reset();
g_logFlushWindow = 1;
if (g_errorCnt > 63)
initprintf("fatal error: too many errors: Aborted\n");