[Qb2c-cvs] goengine/src/engine fileinput.cpp,1.6,1.7 render.cpp,1.14,1.15

[<b_l...@us...>]

Update of /cvsroot/qb2c/goengine/src/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv26403/src/engine

Modified Files:
	fileinput.cpp render.cpp 
Log Message:
Another bunch of warnings fixed.

Index: fileinput.cpp
===================================================================
RCS file: /cvsroot/qb2c/goengine/src/engine/fileinput.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fileinput.cpp	20 Jan 2004 14:47:58 -0000	1.6
--- fileinput.cpp	20 Jan 2004 18:19:27 -0000	1.7
***************
*** 31,39 ****
  	fscanf(fp, "%d", &c);
  
! 	fscanf(fp, "%s", &tmp);
! 	fscanf(fp, "%d", &endplane);
! 	fscanf(fp, "%d", &lastlight);
  		
! 	fscanf(fp, "%s", &tmp);
  	for (c = 0; c <= endplane; c++)
  	{
--- 31,39 ----
  	fscanf(fp, "%d", &c);
  
! 	fscanf(fp, "%s", &tmp[0]);
! 	fscanf(fp, "%hd", &endplane);
! 	fscanf(fp, "%hd", &lastlight);
  		
! 	fscanf(fp, "%s", &tmp[0]);
  	for (c = 0; c <= endplane; c++)
  	{
***************
*** 64,73 ****
  		fscanf(fp, "%f", &planeinfo[c].rbz);
  
! 		fscanf(fp, "%d", &planeinfo[c].rows);
! 		fscanf(fp, "%d", &planeinfo[c].cols);
! 		fscanf(fp, "%d", &planeinfo[c].lastpoint);
! 		fscanf(fp, "%d", &planeinfo[c].lastpoly);
! 		fscanf(fp, "%d", &planeinfo[c].npoints);
! 		fscanf(fp, "%d", &planeinfo[c].npolies);
  
  		for (d = 0; d <= planeinfo[c].lastpoint; d++)
--- 64,73 ----
  		fscanf(fp, "%f", &planeinfo[c].rbz);
  
! 		fscanf(fp, "%hd", &planeinfo[c].rows);
! 		fscanf(fp, "%hd", &planeinfo[c].cols);
! 		fscanf(fp, "%hd", &planeinfo[c].lastpoint);
! 		fscanf(fp, "%hd", &planeinfo[c].lastpoly);
! 		fscanf(fp, "%hd", &planeinfo[c].npoints);
! 		fscanf(fp, "%hd", &planeinfo[c].npolies);
  
  		for (d = 0; d <= planeinfo[c].lastpoint; d++)
***************
*** 83,91 ****
  			for (e = 0; e < 10; e++)
  			{
! 				fscanf(fp, "%d", &planeinfo[c].polyinfo[d][e]);
  			}
  			for (e = 0; e < 6; e++)
  			{
! 				fscanf(fp, "%d", &planeinfo[c].polyvtx[d][e]);
  			}
  
--- 83,91 ----
  			for (e = 0; e < 10; e++)
  			{
! 				fscanf(fp, "%hd", &planeinfo[c].polyinfo[d][e]);
  			}
  			for (e = 0; e < 6; e++)
  			{
! 				fscanf(fp, "%hd", &planeinfo[c].polyvtx[d][e]);
  			}
  
***************
*** 111,117 ****
  		{
  			fscanf(fp, "%f", &lightinfo[d].strength);
! 			fscanf(fp, "%d", &lightinfo[d].lightr);
! 			fscanf(fp, "%d", &lightinfo[d].lightg);
! 			fscanf(fp, "%d", &lightinfo[d].lightb);
  		}
  
--- 111,117 ----
  		{
  			fscanf(fp, "%f", &lightinfo[d].strength);
! 			fscanf(fp, "%hd", &lightinfo[d].lightr);
! 			fscanf(fp, "%hd", &lightinfo[d].lightg);
! 			fscanf(fp, "%hd", &lightinfo[d].lightb);
  		}
  

Index: render.cpp
===================================================================
RCS file: /cvsroot/qb2c/goengine/src/engine/render.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** render.cpp	20 Jan 2004 11:23:34 -0000	1.14
--- render.cpp	20 Jan 2004 18:19:27 -0000	1.15
***************
*** 224,229 ****
  	int gfx_mode;
  
! 	if (mode == 0) gfx_mode = GFX_AUTODETECT_WINDOWED;
! 	if (mode == 1) gfx_mode = GFX_AUTODETECT_FULLSCREEN;
  
  	xcenter = xres / 2;
--- 224,232 ----
  	int gfx_mode;
  
! 	if (mode == 0) {
! 		gfx_mode = GFX_AUTODETECT_WINDOWED;
! 	} else {
! 		gfx_mode = GFX_AUTODETECT_FULLSCREEN;
! 	}
  
  	xcenter = xres / 2;