[Atsoft-commit] CVS: dcgen/main ui-kos.c,1.8,1.9

[Mike D. <at...@us...>]

Update of /cvsroot/atsoft/dcgen/main
In directory usw-pr-cvs1:/tmp/cvs-serv11545

Modified Files:
	ui-kos.c 
Log Message:
ui-kos.c: Added code to move ui_err from doing a printf to dump to screen
instead.  could add the printf again later if needed/desired.


Index: ui-kos.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/ui-kos.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ui-kos.c	18 Feb 2002 16:02:29 -0000	1.8
--- ui-kos.c	21 Feb 2002 06:46:36 -0000	1.9
***************
*** 18,22 ****
  #define USE_64_BIT_TXR_XFER 1
  //#undef USE_64_BIT_TXR_XFER
- // the USE_64_BIT_TXR_XFER is broken right now. Will be fixed shortly.
  
  // Do not use a twiddled txr as it is really slow.
--- 18,21 ----
***************
*** 26,29 ****
--- 25,29 ----
  char *ui_initload = NULL;
  uint8 ui_vdpsimple = 0;
+ uint8 ui_err_exit = 0;
  pvr_ptr_t txr_base;
  pvr_ptr_t txr_base_ex;
***************
*** 217,225 ****
  #else
  		pals[i] = 0x8000 | (r << 11) | (g << 6) | (b << 1);
! 		pals[i + 64] = 0x8000 | (r << 10) | (g << 5) | (b) | 0x510;
  		pals[i + 128] = 0x8000 | (r << 10) | (g << 5) | (b);
  		vdp_cramf[i] = 0;
  #endif
- 		
  	}
  	if(ui_rendermode != PALETTED_TXR) return;
--- 217,224 ----
  #else
  		pals[i] = 0x8000 | (r << 11) | (g << 6) | (b << 1);
! 		pals[i + 64] = 0x8000 | (r << 10) | (g << 5) | (b) | (16 << 10) | (16 << 6) | 16;
  		pals[i + 128] = 0x8000 | (r << 10) | (g << 5) | (b);
  		vdp_cramf[i] = 0;
  #endif
  	}
  	if(ui_rendermode != PALETTED_TXR) return;
***************
*** 523,528 ****
    vsprintf((char *)msg, text, ap);
    va_end(ap);
!   printf("ERROR: %s\n", msg);
!   arch_exit(1);
  }
  
--- 522,539 ----
    vsprintf((char *)msg, text, ap);
    va_end(ap);
!   while(!ui_check_cond(CONT_B))
!   {
! 	pvr_wait_ready();
! 	pvr_scene_begin();
! 	pvr_list_begin(PVR_LIST_OP_POLY);
! 	pvr_dummy_poly(PVR_LIST_OP_POLY);
! 	pvr_list_finish();
! 	pvr_list_begin(PVR_LIST_TR_POLY);
! 	draw_poly_strf(40.0f, 224.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "%s",msg);
! 	draw_poly_strf(40.0f, 400.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "PRESS B TO RETURN TO MENU.");
! 	pvr_list_finish();
! 	pvr_scene_finish();
!   }
!   gen_quit = 1;
  }