Changeset 442

Timestamp:

08/04/07 16:15:41 (1 year ago)

Author:

ajps

Message:

Make main-sdl.c C89ish

Files:

• trunk/src/main-sdl.c (modified) (13 diffs)

trunk/src/main-sdl.c

@@ -523 +523 @@
-        TTF_Font *ttf_font;
-        
-        /* Free any old data */
-        if (font->data) sdl_FontFree(font);
-        
-        /* Our temporary glyph will be rendered in white */
-        SDL_Color white = { 255, 255, 255, 0 };
@@ -534 +531 @@
-        /* But we need an extra space to store the total pixel count */
-        int num_pixels = NUM_GLYPHS + 1;
+        
+        /* Free any old data */
+        if (font->data) sdl_FontFree(font);
-        
-        /* Build the path */
@@ -1252 +1252 @@
-        int i;
-        Uint32 colour = SDL_MapRGB(AppWin->format, 160, 160, 60);
-/Uint32 ccolour = SDL_MapRGB(AppWin->format, 160, 40, 40);
+* int32 ccolour = SDL_MapRGB(AppWin->format, 160, 40, 40); */
-        SDL_FillRect(AppWin, NULL, back_colour);
-        
@@ -1271 +1271 @@
-                        SizingSpot.x = win->left + win->width - 10;
-                        SizingSpot.y = win->top + win->height - 10;
-/SDL_FillRect(AppWin, &SizingSpot, ccolour);
+* SDL_FillRect(AppWin, &SizingSpot, ccolour); */
-                        
-                        if (Sizing)
@@ -1384 +1384 @@
-{
-        int i, maxl = 0;
+        int width = maxl * StatusBar.font.width + 20;
+        int height = ANGBAND_TERM_MAX * (StatusBar.font.height + 1);
+
-        for (i = 0; i < ANGBAND_TERM_MAX; i++)
-        {
@@ -1389 +1392 @@
-                if (l > maxl) maxl = l;
-        }
-        int width = maxl * StatusBar.font.width + 20;
-        int height = ANGBAND_TERM_MAX * (StatusBar.font.height + 1);
-        
-        sdl_WindowInit(&PopUp, width, height, AppWin, StatusBar.font.name);
@@ -1471 +1472 @@
-{
-        int i, maxl = 0;
+        int width = maxl * StatusBar.font.width + 20;
+        int height = num_fonts * (StatusBar.font.height + 1);
+
-        for (i = 0; i < num_fonts; i++)
-        {
@@ -1476 +1480 @@
-                if (l > maxl) maxl = l;
-        }
-        int width = maxl * StatusBar.font.width + 20;
-        int height = num_fonts * (StatusBar.font.height + 1);
-        
-        sdl_WindowInit(&PopUp, width, height, AppWin, StatusBar.font.name);
@@ -2272 +2274 @@
-                                        Moving = TRUE;
-                                        
-/BringToTop(idx);
+* BringToTop(idx); */
-                                        
-                                        /* Remember where we started */
@@ -2326 +2328 @@
-                                else if (idx != -1)
-                                {
+                                        int x, y;
-                                        win = &windows[idx];
-                                        
-                                        /* Calculate the 'cell' coords */
-int 
-int 
+
+
-                                        
-                                        /* Bounds check */
@@ -2420 +2423 @@
-        if (key_sym == SDLK_PRINT)
-        {
-/sdl_print_screen();
+* sdl_print_screen();*/
-                return;
-        }
@@ -2817 +2820 @@
-        SDL_Rect rc;
-        
-/if (use_bigtile) n*=2;
+*if (use_bigtile) n*=2;*/
-        /* Build the area to black out */
-        rc.x = col * win->tile_wid;
@@ -3109 +3112 @@
-        char buf[128];
-        sdl_Button *button;
+        int x;
+
-        popped = FALSE;
-        int x;
-        
-        /* Make sure */