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

Fixed set but unused variables in OGL build

Browse source
This commit is contained in:
zicodxx 2012-04-15 16:15:21 +02:00
parent 8a136a461c
commit 0011e44087
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
2d/bitblt.c
View file

@ -385,12 +385,26 @@ void gr_bitmap( int x, int y, grs_bitmap *bm )
{
int dx1=x, dx2=x+bm->bm_w-1;
int dy1=y, dy2=y+bm->bm_h-1;
#ifndef OGL
int sx=0, sy=0;
#endif
if ((dx1 >= grd_curcanv->cv_bitmap.bm_w ) || (dx2 < 0)) return;
if ((dy1 >= grd_curcanv->cv_bitmap.bm_h) || (dy2 < 0)) return;
if ( dx1 < 0 ) { sx = -dx1; dx1 = 0; }
if ( dy1 < 0 ) { sy = -dy1; dy1 = 0; }
if ( dx1 < 0 )
{
#ifndef OGL
sx = -dx1;
#endif
dx1 = 0;
}
if ( dy1 < 0 )
{
#ifndef OGL
sy = -dy1;
#endif
dy1 = 0;
}
if ( dx2 >= grd_curcanv->cv_bitmap.bm_w ) { dx2 = grd_curcanv->cv_bitmap.bm_w-1; }
if ( dy2 >= grd_curcanv->cv_bitmap.bm_h ) { dy2 = grd_curcanv->cv_bitmap.bm_h-1; }

1
CHANGELOG.txt
View file

@ -8,6 +8,7 @@ editor/meddraw.c: Set edge_list_size to Num_segments*12 to avoid crashes in the
editor/centers.c: Create a centers dialog that won't crash
main/bmread.c, main/game.c, main/gameseq.c, main/gameseq.h, main/gauges.c, main/kmatrix.c, main/multi.c, main/multi.h, main/net_udp.c, main/state.c: Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition
misc/hmp.c: Addition for last change in hmp_reset(): execute midiOutShortMsg() even if midiOutPrepareHeader() fails as not related to SysEx part
2d/bitblt.c, main/render.c: Fixed set but unused variables in OGL build
20120414
--------

6
main/render.c
View file

@ -336,18 +336,20 @@ void check_face(int segnum, int sidenum, int facenum, int nv, int *vp, int tmap1
if (_search_mode) {
int save_lighting;
#ifndef OGL
grs_bitmap *bm;
#endif
g3s_uvl uvl_copy[8];
g3s_lrgb dyn_light[8];
g3s_point *pointlist[4];
memset(dyn_light, 0, sizeof(dyn_light));
#ifndef OGL
if (tmap2 > 0 )
bm = texmerge_get_cached_bitmap( tmap1, tmap2 );
else
bm = &GameBitmaps[Textures[tmap1].index];
#endif
for (i=0; i<nv; i++) {
uvl_copy[i].u = uvlp[i].u;
uvl_copy[i].v = uvlp[i].v;