git-svn-id: https://svn.eduke32.com/eduke32@1015 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/build/src/osd.c

@@ -126,7 +126,7 @@ const char *stripcolorcodes(const char *in, char *out)
 {
     char *ptr = out;
 
-    while (*in)
+    do
     {
         if (*in == '^' && isdigit(*(in+1)))
         {
@@ -146,7 +146,8 @@ const char *stripcolorcodes(const char *in, char *out)
             continue;
         }
         *(out++) = *(in++);
-    }
+    } while (*in);
+
     *out = '\0';
     return(ptr);
 }
@@ -1248,7 +1249,7 @@ void OSD_ResizeDisplay(int w, int h)
     k = min(newcols, osdcols);
 
     memset(newtext, 32, TEXTSIZE);
-    for (i=0;i<j;i++)
+    for (i=j-1;i>=0;i--)
     {
         memcpy(newtext+newcols*i, osdtext+osdcols*i, k);
         memcpy(newfmt+newcols*i, osdfmt+osdcols*i, k);
@@ -1364,7 +1365,7 @@ void OSD_Draw(void)
     if (osdeditshift) drawosdchar(1,osdrowscur,'H',osdpromptshade,osdpromptpal);
 
     len = min(osdcols-1-3, osdeditlen-osdeditwinstart);
-    for (x=0; x<len; x++)
+    for (x=len-1; x>=0; x--)
         drawosdchar(3+x,osdrowscur,osdeditbuf[osdeditwinstart+x],osdeditshade<<1,osdeditpal);
 
     drawosdcursor(3+osdeditcursor-osdeditwinstart,osdrowscur,osdovertype,keytime);
@@ -1424,9 +1425,24 @@ void OSD_Printf(const char *fmt, ...)
         linecnt=logcutoff+1;
     }
 
-    for (chp = tmpstr; *chp; chp++)
+    chp = tmpstr;
+    do
     {
-        if (*chp == '^' && isdigit(*(chp+1)))
+        if (*chp == '\n')
+        {
+            osdpos=0;
+            linecnt++;
+            linefeed();
+            continue;
+        }
+        if (*chp == '\r')
+        {
+            osdpos=0;
+            continue;
+        }
+        if (*chp == '^')
+        {
+            if (isdigit(*(chp+1)))
             {
                 char smallbuf[4];
                 chp++;
@@ -1443,28 +1459,23 @@ void OSD_Printf(const char *fmt, ...)
                     smallbuf[1] = '\0';
                     p = atol(smallbuf);
                 }
+                continue;
             }
-        else if (*chp == '^' && Btoupper(*(chp+1)) == 'S')
+            if (Btoupper(*(chp+1)) == 'S')
             {
                 chp++;
                 if (isdigit(*(++chp)))
                     s = *chp;
+                continue;
             }
-        else if (*chp == '^' && Btoupper(*(chp+1)) == 'O')
+            if (Btoupper(*(chp+1)) == 'O')
             {
                 chp++;
                 p = osdtextpal;
                 s = osdtextshade;
+                continue;
             }
-        else if (*chp == '\r') osdpos=0;
-        else if (*chp == '\n')
-        {
-            osdpos=0;
-            linecnt++;
-            linefeed();
         }
-        else
-        {
         osdtext[osdpos] = *chp;
         osdfmt[osdpos++] = p+(s<<5);
         if (osdpos == osdcols)
@@ -1472,8 +1483,7 @@ void OSD_Printf(const char *fmt, ...)
             osdpos = 0;
             linefeed();
         }
-        }
+    } while (*(++chp));
-    }
 }
 
 

polymer/eduke32/source/jmact/control.c

@@ -425,14 +425,6 @@ void CONTROL_MapDigitalAxis(int32 whichaxis, int32 whichfunction, int32 directio
     }
 }
 
-void CONTROL_ClearFlags(void)
-{
-    int32 i;
-
-    for (i=0;i<CONTROL_NUM_FLAGS;i++)
-        CONTROL_Flags[i].used = false;
-}
-
 void CONTROL_ClearAssignments(void)
 {
     int32 i;
@@ -462,9 +454,9 @@ static void DoGetDeviceButtons(
     byte  *ButtonClickedCount
 )
 {
-    int32 i, bs;
+    int32 i=NumButtons-1, bs;
 
-    for (i=0;i<NumButtons;i++)
+    for (;i>=0;i--)
     {
         bs = (buttons >> i) & 1;
 
@@ -493,16 +485,14 @@ static void DoGetDeviceButtons(
             {
                 ButtonClickedState[i] = true;
             }
+            continue;
         }
-        else
-        {
         if (ButtonClickedCount[i] == 2)
             ButtonClickedCount[i] = 0;
 
         ButtonClicked[i] = false;
     }
 }
-}
 
 void CONTROL_GetDeviceButtons(void)
 {