Fixed various issues found with gcc.

skyjake · Nov 17, 2009 · bfdcbb1 · bfdcbb1
1 parent 6f1c063
commit bfdcbb1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/doomsday/engine/portable/src/dam_file.c b/doomsday/engine/portable/src/dam_file.c
@@ -387,7 +387,7 @@ static void writeLine(const gamemap_t *map, uint idx)
     writeFloat(l->length);
     writeLong((long) l->angle);
     for(i = 0; i < DDMAXPLAYERS; ++i)
-        writeByte(l->mapped[DDMAXPLAYERS]? 1 : 0);
+        writeByte(l->mapped[i]? 1 : 0);
 }
 
 static void readLine(const gamemap_t *map, uint idx)

diff --git a/doomsday/plugins/common/src/hu_menu.c b/doomsday/plugins/common/src/hu_menu.c
@@ -2612,7 +2612,7 @@ void M_DrawClassMenu(void)
         // Number of user-selectable classes.
         pClass = (menuTime / 5) % (menu->itemCount - 1);
     }
-    
+
     R_GetSpriteInfo(STATES[PCLASS_INFO(pClass)->normalState].sprite,
                     ((menuTime >> 3) & 3), &sprInfo);
 
@@ -2653,7 +2653,7 @@ void M_DrawEpisode(void)
 
         M_WriteText3(160 - M_StringWidth(str, GF_FONTA) / 2,
                      200 - M_StringHeight(str, GF_FONTA) - 2, str, GF_FONTA,
-                     cfg.menuColor2[0], cfg.menuColor2[1], cfg.menuColor2[3],
+                     cfg.menuColor2[0], cfg.menuColor2[1], cfg.menuColor2[2],
                      menuAlpha, true, true, 0);
     }
 #else // __JDOOM__
@@ -3090,7 +3090,7 @@ void M_DrawWeaponMenu(void)
 
         M_WriteText3(160 - M_StringWidth(str, GF_FONTA) / 2,
                      200 - M_StringHeight(str, GF_FONTA) - 2, str, GF_FONTA,
-                     cfg.menuColor2[0], cfg.menuColor2[1], cfg.menuColor2[3],
+                     cfg.menuColor2[0], cfg.menuColor2[1], cfg.menuColor2[2],
                      menuAlpha, true, true, 0);
     }
 

diff --git a/doomsday/plugins/common/src/hu_stuff.c b/doomsday/plugins/common/src/hu_stuff.c
@@ -893,9 +893,9 @@ void HU_DrawText(const char* str, gamefontid_t font, float x, float y,
             if(!c)
                 break;
 
-            if(!gFonts[font].chars[c].patch.lump)
+            if(!gFonts[font].chars[(byte) c].patch.lump)
                 continue;
-            p = &gFonts[font].chars[c].patch;
+            p = &gFonts[font].chars[(byte) c].patch;
 
             x -= p->width * scale;
         }
@@ -918,9 +918,9 @@ void HU_DrawText(const char* str, gamefontid_t font, float x, float y,
         if(!c)
             break;
 
-        if(!gFonts[font].chars[c].patch.lump)
+        if(!gFonts[font].chars[(byte) c].patch.lump)
             continue;
-        p = &gFonts[font].chars[c].patch;
+        p = &gFonts[font].chars[(byte) c].patch;
 
         w = p->width;
         h = p->height;