[Qb2c-cvs] goengine/src/editor gomapedit.cpp,1.12,1.13 mapeditgui.cpp,1.5,1.6 mapeditgui.h,1.4,1.5

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

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

Modified Files:
	gomapedit.cpp mapeditgui.cpp mapeditgui.h 
Log Message:
Another bunch of warnings fixed.

Index: gomapedit.cpp
===================================================================
RCS file: /cvsroot/qb2c/goengine/src/editor/gomapedit.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** gomapedit.cpp	20 Jan 2004 02:48:43 -0000	1.12
--- gomapedit.cpp	20 Jan 2004 18:19:27 -0000	1.13
***************
*** 44,49 ****
  	setup_scene();
  
! 	int	cgrey = makecol(128,128,128), whitec = makecol(192,192,192);
! 	
  
  	printf("Game data initialized, starting main loop...\n");	
--- 44,48 ----
  	setup_scene();
  
! 	int	cgrey = makecol(128,128,128);
  
  	printf("Game data initialized, starting main loop...\n");	

Index: mapeditgui.cpp
===================================================================
RCS file: /cvsroot/qb2c/goengine/src/editor/mapeditgui.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mapeditgui.cpp	20 Jan 2004 02:48:43 -0000	1.5
--- mapeditgui.cpp	20 Jan 2004 18:19:27 -0000	1.6
***************
*** 164,197 ****
  		if (strlen(rbasex) > 0 && strlen(rbasey) > 0 && strlen(rbasez) > 0 && strlen(rendx) > 0 && strlen(rendy) > 0 && strlen(rendz) > 0 && strlen(rheight) > 0 && strlen(rcols) > 0 && strlen(rrows) > 0)
  		{
! 			int c, newplane;
! 			for	(c = 0; c < max_planes; c++)
  			{
! 				if (planeinfo[c].active == FALSE)
! 				{
! 					newplane = c;
! 					break;
  				}
  			}
- 			planeinfo[newplane].active = TRUE;
- 		
- 			planeinfo[newplane].basex = strtod(rbasex, NULL);
- 			planeinfo[newplane].basey = strtod(rbasey, NULL);
- 			planeinfo[newplane].basez = strtod(rbasez, NULL);
- 			planeinfo[newplane].endx = strtod(rendx, NULL);
- 			planeinfo[newplane].endy = strtod(rendy, NULL);
- 			planeinfo[newplane].endz = strtod(rendz, NULL);
- 			planeinfo[newplane].height = strtod(rheight, NULL);
- 			planeinfo[newplane].rows = (short)strtod(rrows, NULL);
- 			planeinfo[newplane].cols = (short)strtod(rcols, NULL);
- 			planeinfo[newplane].xrot = 0;
- 			planeinfo[newplane].yrot = 0;
- 			planeinfo[newplane].zrot = 0;
- 			planeinfo[newplane].rbx = 0;
- 			planeinfo[newplane].rby = 0;
- 			planeinfo[newplane].rbz = 0;
- 			planeinfo[newplane].condensed = FALSE;
- 
- 			selplane = newplane;
- 			setup_plane(newplane, rettx);
  		} else {
  			allegro_message("Unable to Process Request");
--- 164,196 ----
  		if (strlen(rbasex) > 0 && strlen(rbasey) > 0 && strlen(rbasez) > 0 && strlen(rendx) > 0 && strlen(rendy) > 0 && strlen(rendz) > 0 && strlen(rheight) > 0 && strlen(rcols) > 0 && strlen(rrows) > 0)
  		{
! 			int p;
! 			for	(p = 0; p < max_planes; p++)
  			{
! 				if (planeinfo[p].active == FALSE)
! 				{
! 					planeinfo[p].active = TRUE;
! 					planeinfo[p].basex = strtod(rbasex, NULL);
! 					planeinfo[p].basey = strtod(rbasey, NULL);
! 					planeinfo[p].basez = strtod(rbasez, NULL);
! 					planeinfo[p].endx = strtod(rendx, NULL);
! 					planeinfo[p].endy = strtod(rendy, NULL);
! 					planeinfo[p].endz = strtod(rendz, NULL);
! 					planeinfo[p].height = strtod(rheight, NULL);
! 					planeinfo[p].rows = (short)strtod(rrows, NULL);
! 					planeinfo[p].cols = (short)strtod(rcols, NULL);
! 					planeinfo[p].xrot = 0;
! 					planeinfo[p].yrot = 0;
! 					planeinfo[p].zrot = 0;
! 					planeinfo[p].rbx = 0;
! 					planeinfo[p].rby = 0;
! 					planeinfo[p].rbz = 0;
! 					planeinfo[p].condensed = FALSE;
! 					
! 					selplane = p;
! 					setup_plane(p, rettx);
! 
! 					break;
  				}
  			}
  		} else {
  			allegro_message("Unable to Process Request");
***************
*** 324,328 ****
  
  	char rnumber[20];
! 	int p = planeinfo[selplane].pointinfo[(short)selpoint[0][3]][9] - 1;
  
  	length = 256;  
--- 323,327 ----
  
  	char rnumber[20];
! 	int p = int(planeinfo[selplane].pointinfo[(short)selpoint[0][3]][9]) - 1;
  
  	length = 256;  
***************
*** 408,412 ****
  
  	char rstrength[20];
! 	int p = planeinfo[selplane].pointinfo[(short)selpoint[0][3]][9] - 1;
  
  	length = 256;  
--- 407,411 ----
  
  	char rstrength[20];
! 	int p = int(planeinfo[selplane].pointinfo[(short)selpoint[0][3]][9]) - 1;
  
  	length = 256;  
***************
*** 831,835 ****
  	height = 12 * 3 + 5;
  
! 	int p = selpoint[0][3];
  
  	gtop = ycenter - height / 2;
--- 830,834 ----
  	height = 12 * 3 + 5;
  
! 	int p = int(selpoint[0][3]);
  
  	gtop = ycenter - height / 2;
***************
*** 1170,1174 ****
  }
  
! void textbox(short x1, short y1, short x2, short y2, short length, char* basestr)
  {
  	long redc = makecol(64,64,64), whitec = makecol(192,192,192), greyc = makecol(96, 96, 96);
--- 1169,1173 ----
  }
  
! void textbox(short x1, short y1, short x2, short y2, unsigned short length, char* basestr)
  {
  	long redc = makecol(64,64,64), whitec = makecol(192,192,192), greyc = makecol(96, 96, 96);
***************
*** 1178,1182 ****
  }
  
! char* editbox(short x1, short y1, short x2, short y2, short length, char* basestr)
  {	
  	int greenc = makecol(0, 255, 0);
--- 1177,1181 ----
  }
  
! char* editbox(short x1, short y1, short x2, short y2, unsigned short length, char* basestr)
  {	
  	int greenc = makecol(0, 255, 0);
***************
*** 1191,1195 ****
  	
  	short last, set;
! 	long redc = makecol(192,192,192), whitec = makecol(192,192,192), greyc = makecol(72,72,72);
  
  	sprintf(str, "%s", basestr);
--- 1190,1194 ----
  	
  	short last, set;
! 	long redc = makecol(192,192,192);
  
  	sprintf(str, "%s", basestr);

Index: mapeditgui.h
===================================================================
RCS file: /cvsroot/qb2c/goengine/src/editor/mapeditgui.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mapeditgui.h	20 Jan 2004 02:48:43 -0000	1.4
--- mapeditgui.h	20 Jan 2004 18:19:27 -0000	1.5
***************
*** 30,35 ****
  void gui_system_save(int mode);
  
! char* editbox(short x1, short y1, short x2, short y2, short length, char* basestr);
! void textbox(short x1, short y1, short x2, short y2, short length, char* basestr);
  
  
--- 30,35 ----
  void gui_system_save(int mode);
  
! char* editbox(short x1, short y1, short x2, short y2, unsigned short length, char* basestr);
! void textbox(short x1, short y1, short x2, short y2, unsigned short length, char* basestr);