Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

2dlib: Fix set but not used variable compiler warning in surface.cpp

Browse Source
This commit is contained in:
Sebastian Holtermann 2024-10-30 14:36:30 +01:00
parent e122a16804
commit a97416fc28
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
2dlib/surface.cpp
View File

@ -319,7 +319,6 @@ void grSurface::uniblt(int dx, int dy, grSurface *ssf, int sx, int sy, int sw, i
// mode 11b = dd_to_dd, 01b = mem_to_dd, 10b = dd_to_mem, 00b = mem_to_mem // mode 11b = dd_to_dd, 01b = mem_to_dd, 10b = dd_to_mem, 00b = mem_to_mem
int mode = 0; int mode = 0;
ddgr_surface *dsfs = &ddsfObj, *ssfs = &ssf->ddsfObj; ddgr_surface *dsfs = &ddsfObj, *ssfs = &ssf->ddsfObj;
bool err;
// setup blitting mode // setup blitting mode
if (ssfs->type == SURFTYPE_GENERIC || ssfs->type == SURFTYPE_VIDEOSCREEN) if (ssfs->type == SURFTYPE_GENERIC || ssfs->type == SURFTYPE_VIDEOSCREEN)
@ -332,7 +331,7 @@ void grSurface::uniblt(int dx, int dy, grSurface *ssf, int sx, int sy, int sw, i
*/ */
if (mode == 0x3) { if (mode == 0x3) {
ASSERT(!surf_Locked); ASSERT(!surf_Locked);
err = ddgr_surf_Blt(dsfs, dx, dy, ssfs, sx, sy, sw, sh); ddgr_surf_Blt(dsfs, dx, dy, ssfs, sx, sy, sw, sh);
return; return;
} }
@ -340,7 +339,7 @@ void grSurface::uniblt(int dx, int dy, grSurface *ssf, int sx, int sy, int sw, i
just lock both surfaces and do a memory blt. just lock both surfaces and do a memory blt.
*/ */
if (mode == 0) { if (mode == 0) {
err = gr_mem_surf_Blt(dsfs, dx, dy, ssfs, sx, sy, sw, sh); gr_mem_surf_Blt(dsfs, dx, dy, ssfs, sx, sy, sw, sh);
return; return;
} }
@ -359,7 +358,7 @@ void grSurface::uniblt(int dx, int dy, grSurface *ssf, int sx, int sy, int sw, i
grSurface::scratch_mem_surf->flags = ssfs->flags; grSurface::scratch_mem_surf->flags = ssfs->flags;
gr_mem_surf_Init(grSurface::scratch_mem_surf, data, rowsize); gr_mem_surf_Init(grSurface::scratch_mem_surf, data, rowsize);
err = gr_mem_surf_Blt(dsfs, dx, dy, grSurface::scratch_mem_surf, sx, sy, sw, sh); gr_mem_surf_Blt(dsfs, dx, dy, grSurface::scratch_mem_surf, sx, sy, sw, sh);
ssf->unlock(); ssf->unlock();
return; return;
@ -380,7 +379,7 @@ void grSurface::uniblt(int dx, int dy, grSurface *ssf, int sx, int sy, int sw, i
grSurface::scratch_mem_surf->flags = dsfs->flags; grSurface::scratch_mem_surf->flags = dsfs->flags;
gr_mem_surf_Init(grSurface::scratch_mem_surf, m_DataPtr, m_DataRowsize); gr_mem_surf_Init(grSurface::scratch_mem_surf, m_DataPtr, m_DataRowsize);
err = gr_mem_surf_Blt(grSurface::scratch_mem_surf, dx, dy, ssfs, sx, sy, sw, sh); gr_mem_surf_Blt(grSurface::scratch_mem_surf, dx, dy, ssfs, sx, sy, sw, sh);
grSurface::unlock(); grSurface::unlock();
return; return;