TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Expand cur_tmap_ macros inline

Browse source 
These date to when there was a choice.  Now, there is no choice.  The
target functions are always in C.
This commit is contained in:
Kp 2021-11-01 03:37:20 +00:00
parent 29b619db99
commit 494ded9e04
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/texmap/ntmap.cpp
View file

@ -355,7 +355,7 @@ static void ntmap_scanline_lighted(const grs_bitmap &srcb, int y, fix xleft, fix
fx_xleft = f2i(xleft);
tmap_flat_color = 1;
cur_tmap_scanline_flat();
c_tmap_scanline_flat();
#else
Int3(); // Illegal, called an editor only routine!
#endif
@ -573,7 +573,7 @@ static void ntmap_scanline_lighted_linear(const grs_bitmap &srcb, int y, fix xle
fx_xleft = 0;
//end addition -adb
cur_tmap_scanline_lin_nolight();
c_tmap_scanline_lin_nolight();
break;
case 1:
if (lleft < F1_0/2)
@ -608,14 +608,14 @@ static void ntmap_scanline_lighted_linear(const grs_bitmap &srcb, int y, fix xle
fx_l = lleft;
dl_dx = fixmul(lright - lleft,recip_dx);
fx_dl_dx = dl_dx;
cur_tmap_scanline_lin();
c_tmap_scanline_lin();
break;
case 2:
#ifdef EDITOR_TMAP
fx_xright = f2i(xright);
fx_xleft = f2i(xleft);
tmap_flat_color = 1;
cur_tmap_scanline_flat();
c_tmap_scanline_flat();
#else
Int3(); // Illegal, called an editor only routine!
#endif

4
common/texmap/scanline.h
View file

@ -43,10 +43,6 @@ struct tmap_scanline_function_table
};
#define cur_tmap_scanline_per (tmap_scanline_functions.sl_per)
#define cur_tmap_scanline_lin (c_tmap_scanline_lin)
#define cur_tmap_scanline_lin_nolight (c_tmap_scanline_lin_nolight)
#define cur_tmap_scanline_shaded (c_tmap_scanline_shaded)
#define cur_tmap_scanline_flat (c_tmap_scanline_flat)
extern tmap_scanline_function_table tmap_scanline_functions;
void select_tmap(const std::string &type);

4
common/texmap/tmapflat.cpp
View file

@ -63,9 +63,9 @@ static void tmap_scanline_flat(grs_canvas &canvas, int y, fix xleft, fix xright)
fx_xright = xright/F1_0;
if (canvas.cv_fade_level >= GR_FADE_OFF)
cur_tmap_scanline_flat();
c_tmap_scanline_flat();
else {
cur_tmap_scanline_shaded(canvas.cv_fade_level);
c_tmap_scanline_shaded(canvas.cv_fade_level);
}
}