From 87d19d5cde8accff84056e9959f2b28a79f09868 Mon Sep 17 00:00:00 2001 From: terminx Date: Thu, 12 Apr 2018 21:04:00 +0000 Subject: [PATCH] More function name shit git-svn-id: https://svn.eduke32.com/eduke32@6832 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/build/include/build.h | 8 ++--- source/build/src/2d.cpp | 2 +- source/build/src/engine.cpp | 56 +++++++++++++++++----------------- source/build/src/engine_priv.h | 2 +- source/build/src/polymost.cpp | 2 +- source/duke3d/src/astub.cpp | 6 ++-- source/duke3d/src/demo.cpp | 2 +- source/duke3d/src/gameexec.cpp | 2 +- source/duke3d/src/premap.cpp | 6 ++-- source/duke3d/src/sbar.cpp | 2 +- source/duke3d/src/screens.cpp | 42 ++++++++++++------------- 11 files changed, 65 insertions(+), 65 deletions(-) diff --git a/source/build/include/build.h b/source/build/include/build.h index 95d5082db..bd93210f9 100644 --- a/source/build/include/build.h +++ b/source/build/include/build.h @@ -1060,7 +1060,7 @@ void videoNextPage(void); void videoSetCorrectedAspect(); void videoSetViewableArea(int32_t x1, int32_t y1, int32_t x2, int32_t y2); void renderSetAspect(int32_t daxrange, int32_t daaspect); -void flushperms(void); +void renderFlushPerms(void); void plotlines2d(const int32_t *xx, const int32_t *yy, int32_t numpoints, int col) ATTRIBUTE((nonnull(1,2))); @@ -1085,7 +1085,7 @@ void renderDrawMapView(int32_t dax, int32_t day, int32_t zoome, int16_t ang); void rotatesprite_(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t picnum, int8_t dashade, char dapalnum, int32_t dastat, uint8_t daalpha, uint8_t dablend, int32_t cx1, int32_t cy1, int32_t cx2, int32_t cy2); -void drawline256(int32_t x1, int32_t y1, int32_t x2, int32_t y2, char col); +void renderDrawLine(int32_t x1, int32_t y1, int32_t x2, int32_t y2, char col); void drawlinergb(int32_t x1, int32_t y1, int32_t x2, int32_t y2, palette_t col); int32_t printext16(int32_t xpos, int32_t ypos, int16_t col, int16_t backcol, const char *name, char fontsize) ATTRIBUTE((nonnull(5))); @@ -1426,7 +1426,7 @@ int32_t engineLoadBoardV5V6(const char *filename, char fromwhere, vec3_t *dapos, extern "C" { #endif -static FORCE_INLINE void push_nofog(void) +static FORCE_INLINE void renderDisableFog(void) { #ifdef USE_OPENGL if (videoGetRenderMode() >= REND_POLYMOST) @@ -1436,7 +1436,7 @@ static FORCE_INLINE void push_nofog(void) #endif } -static FORCE_INLINE void pop_nofog(void) +static FORCE_INLINE void renderEnableFog(void) { #ifdef USE_OPENGL if (videoGetRenderMode() >= REND_POLYMOST && !nofog) diff --git a/source/build/src/2d.cpp b/source/build/src/2d.cpp index 2c69fe24b..482d21755 100644 --- a/source/build/src/2d.cpp +++ b/source/build/src/2d.cpp @@ -231,7 +231,7 @@ void drawlinergb(int32_t x1, int32_t y1, int32_t x2, int32_t y2, palette_t p) drawlinepixels(x1, y1, x2, y2, col); } -void drawline256(int32_t x1, int32_t y1, int32_t x2, int32_t y2, char col) +void renderDrawLine(int32_t x1, int32_t y1, int32_t x2, int32_t y2, char col) { col = palookup[0][col]; diff --git a/source/build/src/engine.cpp b/source/build/src/engine.cpp index 2dd9154d0..4cc36ed4d 100644 --- a/source/build/src/engine.cpp +++ b/source/build/src/engine.cpp @@ -207,7 +207,7 @@ int32_t getinvdisplacement(int32_t *dx, int32_t *dy, int32_t dz); } #endif -static void scansector(int16_t startsectnum); +static void classicScanSector(int16_t startsectnum); static void draw_rainbow_background(void); int16_t editstatus = 0; @@ -713,7 +713,7 @@ static void yax_scanbunches(int32_t bbeg, int32_t numhere, const uint8_t *lastgo { numscans = numbunches = 0; if (videoGetRenderMode() == REND_CLASSIC) - scansector(k); + classicScanSector(k); #ifdef USE_OPENGL else polymost_scansector(k); @@ -1484,7 +1484,7 @@ char apptitle[256] = "Build Engine"; // returns: 0=continue sprite collecting; // 1=break out of sprite collecting; -int32_t engine_addtsprite(int16_t z, int16_t sectnum) +int32_t renderAddTsprite(int16_t z, int16_t sectnum) { uspritetype *spr = (uspritetype *)&sprite[z]; #ifdef YAX_ENABLE @@ -1644,7 +1644,7 @@ static int get_screen_coords(const vec2_t p1, const vec2_t p2, // // scansector (internal) // -static void scansector(int16_t startsectnum) +static void classicScanSector(int16_t startsectnum) { if (startsectnum < 0) return; @@ -1670,7 +1670,7 @@ static void scansector(int16_t startsectnum) if ((spr->cstat&48) || ((coord_t)s.x*cosglobalang+(coord_t)s.y*singlobalang > 0)) if ((spr->cstat&(64+48))!=(64+16) || dmulscale6(sintable[(spr->ang+512)&2047],-s.x, sintable[spr->ang&2047],-s.y) > 0) - if (engine_addtsprite(i, sectnum)) + if (renderAddTsprite(i, sectnum)) break; } @@ -3870,7 +3870,7 @@ static int32_t should_clip_fwall(int32_t x1, int32_t x2) // // drawalls (internal) // -static void drawalls(int32_t bunch) +static void classicDrawBunches(int32_t bunch) { int32_t i, x; @@ -4236,12 +4236,12 @@ static void drawalls(int32_t bunch) if (!(wal->cstat&32) && (gotsector[nextsectnum>>3]&pow2char[nextsectnum&7]) == 0) { if (umost[x2] < dmost[x2]) - scansector(nextsectnum); + classicScanSector(nextsectnum); else { for (x=x1; x>30; } -static void drawsprite_classic(int32_t snum) +static void classicDrawSprite(int32_t snum) { uspritetype *const tspr = tspriteptr[snum]; const int32_t sectnum = tspr->sectnum; @@ -5785,16 +5785,16 @@ draw_as_face_sprite: i = (int32_t)tspr->ang+1536; i += spriteext[spritenum].angoff; - drawvox(tspr->x,tspr->y,tspr->z,i,daxrepeat,(int32_t)tspr->yrepeat,vtilenum,tspr->shade,tspr->pal,lwall,swall); + classicDrawVoxel(tspr->x,tspr->y,tspr->z,i,daxrepeat,(int32_t)tspr->yrepeat,vtilenum,tspr->shade,tspr->pal,lwall,swall); } } -static void drawsprite(int32_t snum) +static void renderDrawSprite(int32_t snum) { switch (videoGetRenderMode()) { case REND_CLASSIC: - drawsprite_classic(snum); + classicDrawSprite(snum); return; #ifdef USE_OPENGL case REND_POLYMOST: @@ -5820,13 +5820,13 @@ static void drawsprite(int32_t snum) // // drawmaskwall (internal) // -static void drawmaskwall(int16_t damaskwallcnt) +static void renderDrawMaskedWall(int16_t damaskwallcnt) { //============================================================================= //POLYMOST BEGINS #ifdef USE_OPENGL if (videoGetRenderMode() == REND_POLYMOST) { polymost_drawmaskwall(damaskwallcnt); return; } # ifdef POLYMER - if (videoGetRenderMode() == REND_POLYMER) + else if (videoGetRenderMode() == REND_POLYMER) { glEnable(GL_ALPHA_TEST); glEnable(GL_BLEND); @@ -5923,7 +5923,7 @@ static void drawmaskwall(int16_t damaskwallcnt) // // fillpolygon (internal) // -static void fillpolygon(int32_t npoints) +static void renderFillPolygon(int32_t npoints) { int32_t i, z, y, miny, maxy; @@ -8095,7 +8095,7 @@ int32_t renderDrawRoomsQ16(int32_t daposx, int32_t daposy, int32_t daposz, if (globalposz < cz) globparaceilclip = 0; if (globalposz > fz) globparaflorclip = 0; */ - scansector(globalcursectnum); + classicScanSector(globalcursectnum); if (inpreparemirror) { @@ -8129,7 +8129,7 @@ int32_t renderDrawRoomsQ16(int32_t daposx, int32_t daposy, int32_t daposz, if (umost[i] <= dmost[i]) { umost[i] = 1; dmost[i] = 0; numhits--; } - drawalls(0L); + classicDrawBunches(0L); numbunches--; bunchfirst[0] = bunchfirst[numbunches]; bunchlast[0] = bunchlast[numbunches]; @@ -8158,7 +8158,7 @@ int32_t renderDrawRoomsQ16(int32_t daposx, int32_t daposy, int32_t daposz, if (j == 0) tempbuf[closest] = 1, closest = i, i = 0; } - drawalls(closest); + classicDrawBunches(closest); numbunches--; bunchfirst[closest] = bunchfirst[numbunches]; @@ -8567,7 +8567,7 @@ killsprite: if (ok) { debugmask_add(i | 32768, tspr->owner); - drawsprite(i); + renderDrawSprite(i); tspriteptr[i] = NULL; } @@ -8576,7 +8576,7 @@ killsprite: } debugmask_add(maskwall[maskwallcnt], thewall[maskwall[maskwallcnt]]); - drawmaskwall(maskwallcnt); + renderDrawMaskedWall(maskwallcnt); } i = spritesortcnt; @@ -8591,7 +8591,7 @@ killsprite: ) { debugmask_add(i | 32768, tspriteptr[i]->owner); - drawsprite(i); + renderDrawSprite(i); tspriteptr[i] = NULL; } @@ -8608,7 +8608,7 @@ killsprite: if (tspriteptr[spritesortcnt] != NULL) { Bassert(tspriteptr[spritesortcnt]->cstat & 1024); - drawsprite(spritesortcnt); + renderDrawSprite(spritesortcnt); tspriteptr[spritesortcnt] = NULL; } } @@ -8820,7 +8820,7 @@ void renderDrawMapView(int32_t dax, int32_t day, int32_t zoome, int16_t ang) set_globalpos(((int64_t) globalposx<<(20+globalxshift))+(((uint32_t) sec->floorxpanning)<<24), ((int64_t) globalposy<<(20+globalyshift))-(((uint32_t) sec->floorypanning)<<24), globalposz); - fillpolygon(npoints); + renderFillPolygon(npoints); } //Sort sprite list @@ -8950,7 +8950,7 @@ void renderDrawMapView(int32_t dax, int32_t day, int32_t zoome, int16_t ang) // so polymost can get the translucency. ignored in software mode: globalorientation = ((spr->cstat&2)<<7) | ((spr->cstat&512)>>2); - fillpolygon(npoints); + renderFillPolygon(npoints); } } @@ -12103,7 +12103,7 @@ void renderSetAspect(int32_t daxrange, int32_t daaspect) // // flushperms // -void flushperms(void) +void renderFlushPerms(void) { permhead = permtail = 0; } diff --git a/source/build/src/engine_priv.h b/source/build/src/engine_priv.h index 8023cc44e..0b6a185d9 100644 --- a/source/build/src/engine_priv.h +++ b/source/build/src/engine_priv.h @@ -296,7 +296,7 @@ void dorotspr_handle_bit2(int32_t *sx, int32_t *sy, int32_t *z, int32_t dastat, #ifdef USE_OPENGL extern void polymost_scansector(int32_t sectnum); #endif -int32_t engine_addtsprite(int16_t z, int16_t sectnum); +int32_t renderAddTsprite(int16_t z, int16_t sectnum); #ifdef YAX_ENABLE extern int32_t g_nodraw, scansector_retfast; extern int32_t yax_globallev, yax_globalbunch; diff --git a/source/build/src/polymost.cpp b/source/build/src/polymost.cpp index ff8cda078..d6aefd1c8 100644 --- a/source/build/src/polymost.cpp +++ b/source/build/src/polymost.cpp @@ -5008,7 +5008,7 @@ void polymost_scansector(int32_t sectnum) if ((spr->cstat&48) || (usemodels && tile2model[spr->picnum].modelid>=0) || ((s.x * gcosang) + (s.y * gsinang) > 0)) { if ((spr->cstat&(64+48))!=(64+16) || dmulscale6(sintable[(spr->ang+512)&2047],-s.x, sintable[spr->ang&2047],-s.y) > 0) - if (engine_addtsprite(z, sectnum)) + if (renderAddTsprite(z, sectnum)) break; } } diff --git a/source/duke3d/src/astub.cpp b/source/duke3d/src/astub.cpp index f573bcafc..c205f9bb5 100644 --- a/source/duke3d/src/astub.cpp +++ b/source/duke3d/src/astub.cpp @@ -2360,7 +2360,7 @@ static void m32_showmouse(void) #ifdef USE_OPENGL if (videoGetRenderMode() >= REND_POLYMOST) { - push_nofog(); + renderDisableFog(); glDisable(GL_TEXTURE_2D); polymost_useColorOnly(true); } @@ -2405,7 +2405,7 @@ static void m32_showmouse(void) #ifdef USE_OPENGL if (videoGetRenderMode() >= REND_POLYMOST) { - pop_nofog(); + renderEnableFog(); polymost_useColorOnly(false); } #endif @@ -3452,7 +3452,7 @@ static void tilescreen_drawrest(int32_t iSelected, int32_t showmsg) // Clear out behind the text for improved visibility. //drawline256(0, (ydim-12)<<12, xdim<<12, (ydim-12)<<12, whitecol); for (i=ydim-12; i=0; i--) @@ -376,11 +376,11 @@ static void G_DrawOverheadMap(int32_t cposx, int32_t cposy, int32_t czoom, int16 x2 = dmulscale16(ox, xvect, -oy, yvect)+(xdim<<11); y2 = dmulscale16(oy, xvect2, ox, yvect2)+(ydim<<11); - drawline256(x1, y1, x2, y2, col); + renderDrawLine(x1, y1, x2, y2, col); } } - pop_nofog(); + renderEnableFog(); //Draw sprites k = g_player[screenpeek].ps->i; @@ -417,11 +417,11 @@ static void G_DrawOverheadMap(int32_t cposx, int32_t cposy, int32_t czoom, int16 x3 = mulscale16(x2, yxaspect); y3 = mulscale16(y2, yxaspect); - drawline256(x1-x2+(xdim<<11), y1-y3+(ydim<<11), + renderDrawLine(x1-x2+(xdim<<11), y1-y3+(ydim<<11), x1+x2+(xdim<<11), y1+y3+(ydim<<11), col); - drawline256(x1-y2+(xdim<<11), y1+x3+(ydim<<11), + renderDrawLine(x1-y2+(xdim<<11), y1+x3+(ydim<<11), x1+x2+(xdim<<11), y1+y3+(ydim<<11), col); - drawline256(x1+y2+(xdim<<11), y1-x3+(ydim<<11), + renderDrawLine(x1+y2+(xdim<<11), y1-x3+(ydim<<11), x1+x2+(xdim<<11), y1+y3+(ydim<<11), col); break; @@ -454,7 +454,7 @@ static void G_DrawOverheadMap(int32_t cposx, int32_t cposy, int32_t czoom, int16 x2 = dmulscale16(ox, xvect, -oy, yvect); y2 = dmulscale16(oy, xvect2, ox, yvect2); - drawline256(x1+(xdim<<11), y1+(ydim<<11), + renderDrawLine(x1+(xdim<<11), y1+(ydim<<11), x2+(xdim<<11), y2+(ydim<<11), col); } @@ -510,16 +510,16 @@ static void G_DrawOverheadMap(int32_t cposx, int32_t cposy, int32_t czoom, int16 x4 = dmulscale16(ox, xvect, -oy, yvect); y4 = dmulscale16(oy, xvect2, ox, yvect2); - drawline256(x1+(xdim<<11), y1+(ydim<<11), + renderDrawLine(x1+(xdim<<11), y1+(ydim<<11), x2+(xdim<<11), y2+(ydim<<11), col); - drawline256(x2+(xdim<<11), y2+(ydim<<11), + renderDrawLine(x2+(xdim<<11), y2+(ydim<<11), x3+(xdim<<11), y3+(ydim<<11), col); - drawline256(x3+(xdim<<11), y3+(ydim<<11), + renderDrawLine(x3+(xdim<<11), y3+(ydim<<11), x4+(xdim<<11), y4+(ydim<<11), col); - drawline256(x4+(xdim<<11), y4+(ydim<<11), + renderDrawLine(x4+(xdim<<11), y4+(ydim<<11), x1+(xdim<<11), y1+(ydim<<11), col); break; @@ -527,7 +527,7 @@ static void G_DrawOverheadMap(int32_t cposx, int32_t cposy, int32_t czoom, int16 } } - push_nofog(); + renderDisableFog(); //Draw white lines for (i=numsectors-1; i>=0; i--) @@ -565,11 +565,11 @@ static void G_DrawOverheadMap(int32_t cposx, int32_t cposy, int32_t czoom, int16 x2 = dmulscale16(ox, xvect, -oy, yvect)+(xdim<<11); y2 = dmulscale16(oy, xvect2, ox, yvect2)+(ydim<<11); - drawline256(x1, y1, x2, y2, editorcolors[7]); + renderDrawLine(x1, y1, x2, y2, editorcolors[7]); } } - pop_nofog(); + renderEnableFog(); videoSetCorrectedAspect(); @@ -1442,7 +1442,7 @@ void G_DisplayExtraScreens(void) inExtraScreens = 1; #endif videoSetViewableArea(0, 0, xdim-1, ydim-1); - flushperms(); + renderFlushPerms(); //g_player[myconnectindex].ps->palette = palette; P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 1); // JBF 20040308 fadepal(0, 0, 0, 0, 252, 28); @@ -1470,7 +1470,7 @@ void G_DisplayExtraScreens(void) inExtraScreens = 1; #endif videoSetViewableArea(0, 0, xdim-1, ydim-1); - flushperms(); + renderFlushPerms(); //g_player[myconnectindex].ps->palette = palette; P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 1); // JBF 20040308 fadepal(0, 0, 0, 0, 252, 28); @@ -1502,7 +1502,7 @@ void G_DisplayLogo(void) videoClearScreen(0L); G_FadePalette(0, 0, 0, 252); - flushperms(); + renderFlushPerms(); videoNextPage(); G_UpdateAppTitle(); @@ -1571,7 +1571,7 @@ void G_DisplayLogo(void) P_SetGamePalette(g_player[myconnectindex].ps, DREALMSPAL, 8 + 2 + 1); // JBF 20040308 fadepal(0, 0, 0, 0, 252, 28); - flushperms(); + renderFlushPerms(); rotatesprite_fs(160 << 16, 100 << 16, 65536L, 0, DREALMS, 0, 0, 2 + 8 + 64 + BGSTRETCH); videoNextPage(); fadepaltile(0, 0, 0, 252, 0, -28, DREALMS); @@ -1613,7 +1613,7 @@ void G_DisplayLogo(void) //g_player[myconnectindex].ps->palette = titlepal; P_SetGamePalette(g_player[myconnectindex].ps, TITLEPAL, 8+2+1); // JBF 20040308 - flushperms(); + renderFlushPerms(); rotatesprite_fs(160<<16, 100<<16, 65536L, 0, BETASCREEN, 0, 0, 2+8+64+BGSTRETCH); KB_FlushKeyboardQueue(); fadepaltile(0, 0, 0, 252, 0, -28, BETASCREEN); @@ -1709,7 +1709,7 @@ void G_DisplayLogo(void) I_ClearAllInput(); } - flushperms(); + renderFlushPerms(); videoClearScreen(0L); videoNextPage(); @@ -2211,7 +2211,7 @@ void G_BonusScreen(int32_t bonusonly) videoSetViewableArea(0, 0, xdim-1, ydim-1); videoClearScreen(0L); videoNextPage(); - flushperms(); + renderFlushPerms(); FX_StopAllSounds(); S_ClearSoundLocks();