*** dlg_box.cpp	Tue Aug  7 23:33:43 2001
--- i/dlg_box.cpp	Tue Aug  7 23:51:32 2001
***************
*** 3,16 ****
  */
  
  
! //     $Id: dlg_box.cpp,v 1.57 2001/08/07 15:58:09 mbickel Exp $
  //
  //     $Log: dlg_box.cpp,v $
- //     Revision 1.57  2001/08/07 15:58:09  mbickel
- //      Fixed crash in mail list
- //      Fixed crash in weapon info with mines
- //      Fixed cancel Button in object construction
- //
  //     Revision 1.56  2001/07/30 17:43:13  mbickel
  //      Added Microsoft Visual Studio .net project files
  //      Fixed some warnings
--- 3,11 ----
  */
  
  
! //     $Id: dlg_box.cpp,v 1.56 2001/07/30 17:43:13 mbickel Exp $
  //
  //     $Log: dlg_box.cpp,v $
  //     Revision 1.56  2001/07/30 17:43:13  mbickel
  //      Added Microsoft Visual Studio .net project files
  //      Fixed some warnings
***************
*** 1237,1248 ****
       word* pw2 =(word*) pb->data2; 
       rahmen(true,x1 + pb->x1,y1 + pb->y1,x1 + pb->x2,y1 + pb->y2); 
  
       paintsurface2(x1 + pb->x1 + 1,y1 + pb->y1 + 1,x1 + pb->x2 - 1,y1 + pb->y2 - 1 );
  
      // if (pb->max <= *pw2) {
         int l = pb->y2 - pb->y1 - 2;
!        rahmen(false, x1 + pb->x1 + 1, y1 + pb->y1 + 1 + l * *pw / *pw2,
!                      x1 + pb->x2 - 1, y1 + pb->y1 + 1 + l * (*pw + pb->max) / *pw2);
      // }
      // else
      //   rahmen(true,x1 + pb->x1 + 1,y1 + pb->y1 + 1,x1 + pb->x2 - 1,y1 + pb->y2 - 1);
--- 1232,1244 ----
       word* pw2 =(word*) pb->data2; 
       rahmen(true,x1 + pb->x1,y1 + pb->y1,x1 + pb->x2,y1 + pb->y2); 
  
+      // waitretrace();
+ 
       paintsurface2(x1 + pb->x1 + 1,y1 + pb->y1 + 1,x1 + pb->x2 - 1,y1 + pb->y2 - 1 );
  
      // if (pb->max <= *pw2) {
         int l = pb->y2 - pb->y1 - 2;
!        rahmen(false,x1 + pb->x1 + 1,y1 + pb->y1 + 1 + l * *pw / *pw2,x1 + pb->x2 - 1,y1 + pb->y1 + 1 + l * (*pw + pb->max) / *pw2);
      // }
      // else
      //   rahmen(true,x1 + pb->x1 + 1,y1 + pb->y1 + 1,x1 + pb->x2 - 1,y1 + pb->y2 - 1);
***************
*** 2186,2192 ****
     #endif
    #endif
  
!    if ( strlen ( s ) > max )
        max = strlen ( s );
  
     activefontsettings.justify = lefttext;
--- 2182,2189 ----
     #endif
    #endif
  
!    ////////******** typecast dazugefgt
!    if ( (int)strlen ( s ) > max )
        max = strlen ( s );
  
     activefontsettings.justify = lefttext;
***************
*** 2288,2295 ****
              case ct_left:   if (position >= 1)
                             position--;
              break; 
!             
!             case ct_right:  if (position < strlen ( ss ) )
                           position++;
              break; 
              
--- 2285,2292 ----
              case ct_left:   if (position >= 1)
                             position--;
              break; 
!                ////////******** typecast dazugefgt
!             case ct_right:  if (position < (int)strlen ( ss ) )
                           position++;
              break; 
              
***************
*** 2315,2321 ****
                         }
              break; 
              
!             case ct_right + ct_stp:  if ( position < strlen ( ss ) ) {
                          do { 
                             position++;
                          }  while ( (ss[ position ] != ' ') && ( ss[ position ] != 0 ) );
--- 2312,2318 ----
                         }
              break; 
              
!             case ct_right + ct_stp:  if ( position < (int)strlen ( ss ) ) {   ////////******** typecast dazugefgt
                          do { 
                             position++;
                          }  while ( (ss[ position ] != ' ') && ( ss[ position ] != 0 ) );
***************
*** 2332,2339 ****
  #endif
  
           lne(x1,y1,ss,position,einfuegen);
! 
!          if ( ( cc > 31 ) && ( cc < 256 ) && (strlen(ss) < max ) ) {       // plain ascii
              i=0;
              while ( (ss[i] != 0) && ( i < position ) ) {
                 ss2[i] = ss[i];
--- 2329,2336 ----
  #endif
  
           lne(x1,y1,ss,position,einfuegen);
!    ////////******** typecast!!
!          if ( ( cc > 31 ) && ( cc < 256 ) && ((int) strlen(ss) < max ) ) {       // plain ascii
              i=0;
              while ( (ss[i] != 0) && ( i < position ) ) {
                 ss2[i] = ss[i];
***************
*** 2557,2563 ****
                                 position--;
                  break;
  
!                 case ct_right:  if (position < strlen ( ss ) )
                               position++;
                  break;
  
--- 2554,2560 ----
                                 position--;
                  break;
  
!                 case ct_right:  if (position < (int) strlen ( ss ) )   ////////******** typecast
                               position++;
                  break;
  
***************
*** 2582,2589 ****
                               dispeditstring (ss,x1,y1); /* ? */
                             }
                  break;
! 
!                 case ct_right + ct_stp:  if ( position < strlen ( ss ) ) {
                              do {
                                 position++;
                              }  while ( (ss[ position ] != ' ') && ( ss[ position ] != 0 ) );
--- 2579,2586 ----
                               dispeditstring (ss,x1,y1); /* ? */
                             }
                  break;
! 								////////******** typecast:
!                 case ct_right + ct_stp:  if ( position < (int) strlen ( ss ) ) {
                              do {
                                 position++;
                              }  while ( (ss[ position ] != ' ') && ( ss[ position ] != 0 ) );
***************
*** 2598,2604 ****
                  break;
               }
  #endif
!              if ( (( cc >=  '0' &&  cc <= '9' ) || ( cc == '-' && !position)) && (strlen(ss) < ml-1 ) ) {
                  i=0;
                  while ( (ss[i] != 0) && ( i < position ) ) {
                     ss2[i] = ss[i];
--- 2595,2602 ----
                  break;
               }
  #endif
! ////////******** typecast:
!              if ( (( cc >=  '0' &&  cc <= '9' ) || ( cc == '-' && !position)) && ((int) strlen(ss) < ml-1 ) ) {
                  i=0;
                  while ( (ss[i] != 0) && ( i < position ) ) {
                     ss2[i] = ss[i];
***************
*** 2654,2660 ****
        lne(x1,y1,ss,position,einfuegen);
        if (cc != cto_esc ) {
          j = strtol ( ss, &ss3, 10 );
!         if ((ss3 != NULL) && ( (ss3 - ss ) < strlen ( ss ) )) {
  
             position = (ss3 - ss );
             lne(x1,y1,ss,position,einfuegen);
--- 2652,2659 ----
        lne(x1,y1,ss,position,einfuegen);
        if (cc != cto_esc ) {
          j = strtol ( ss, &ss3, 10 );
! ////////******** typecast:
!         if ((ss3 != NULL) && ( (ss3 - ss ) < (int) strlen ( ss ) )) {
  
             position = (ss3 - ss );
             lne(x1,y1,ss,position,einfuegen);
