shithub: rott

Info  •  Files  •  Log  •  Branches

Removing unused but set variables in rt_str.c

--- a/rott/rt_str.c

+++ b/rott/rt_str.c

@@ -132,12 +132,10 @@

     char  c,

           *se;

     char  *s;

-    int   startx;

     strcpy(strbuf, string);

     s = strbuf;

-    startx=x;

     while (*s)

     {

         se = s;

@@ -236,16 +234,11 @@

     byte  pix;

     int   width,step,height,ht;

     byte  *source, *dest, *origdest;

-    int   ch,mask;

+    int   ch;

-

     ht = CurrentFont->height;

     dest = origdest = (byte *)(bufferofs+ylookup[py]+px);

-

-    mask = 1<<(px&3);

-

-

     while ((ch = (unsigned char)*string++)!=0)

     {

         ch -= 31;

@@ -253,8 +246,6 @@

         source = ((byte *)CurrentFont)+CurrentFont->charofs[ch];

         while (width--)

         {

-            VGAMAPMASK(mask);

-

             height = ht;

             while (height--)

             {

@@ -1313,7 +1304,6 @@

     pic_t *Win2;

     pic_t *Win3;

     pic_t *Win4;

-    pic_t *Win5;

     pic_t *Win6;

     pic_t *Win7;

     pic_t *Win8;

@@ -1328,8 +1318,6 @@

     Win3 = (pic_t *) shape;

     shape = W_CacheLumpNum (W_GetNumForName ("window4"), PU_CACHE, Cvt_pic_t, 1);

     Win4 = (pic_t *) shape;

-    shape = W_CacheLumpNum (W_GetNumForName ("window5"), PU_CACHE, Cvt_pic_t, 1);

-    Win5 = (pic_t *) shape;

     shape = W_CacheLumpNum (W_GetNumForName ("window6"), PU_CACHE, Cvt_pic_t, 1);

     Win6 = (pic_t *) shape;

     shape = W_CacheLumpNum (W_GetNumForName ("window7"), PU_CACHE, Cvt_pic_t, 1);

@@ -1430,18 +1418,13 @@

 {

     byte  pix;

-    int   px1,py1;

-    int   width,w1;

-    int   height,h1;

+    int   width;

+    int   height;

     int   ht;

-    byte  *source,*src1;

+    byte  *source;

     byte  *dest;

-    byte  *origdest,*orgdst1;

-    int   mask;

+    byte  *origdest;

-    px1 = px;

-    py1 = py;

-

     ht = IFont->height;

     origdest = ( byte * )( bufferofs + ylookup[ py ] + px );

@@ -1452,13 +1435,9 @@

     width = IFont->width[ (unsigned char)ch ];

     source = ( ( byte * )IFont ) + IFont->charofs[ (unsigned char)ch ];

-    mask = 1 << ( px & 3 );

-

     if ((iGLOBAL_SCREENWIDTH <= 320)||(StretchScreen == true)) {

         while( width-- )

         {

-            VGAMAPMASK( mask );

-

             height = ht;

             while( height-- )

             {

@@ -1477,14 +1456,8 @@

             dest = origdest;

         }

     } else { //strech letter in x any direction

-        w1 = width;

-        h1 = ht;

-        orgdst1 = origdest;

-        src1 = source;

         while( width-- )

         {

-            VGAMAPMASK( mask );

-

             height = ht;

             while( height-- )

             {