From 9b74db8b7246c2e03fda6bd4207d1bf30655a7d7 Mon Sep 17 00:00:00 2001
From: Albert Cahalan <albert@users.sourceforge.net>
Date: Mon, 17 Jan 2005 02:16:40 +0000
Subject: [PATCH] moving stuff for faster splash screen display

---
 docs/CHANGES.txt |  7 +++++++
 src/tuxpaint.c   | 19 +++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index dee0bb4a5..ebdfb151e 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -8,6 +8,13 @@ http://www.newbreedsoftware.com/tuxpaint/
 
 
 2005.January.16 (0.9.15)
+
+
+  * uncatagorized and messy:
+    -----------------------
+    * Splash screen appears earlier, along with the version info and cursor.
+
+
   * Stamp tool improvements:
     ------------------------
     * Greatly improved stamp outlining (to avoid empty rows or columns
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 0fabcff8a..1d04b7b2e 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -7396,8 +7396,7 @@ static void setup(int argc, char * argv[])
     }
 
 
-
-  /* Load and display title image: */
+////////// quickly: title image, version, progress bar, and watch cursor
 
   img_title = loadimage(DATA_PREFIX "images/title.png");
   img_progress = loadimage(DATA_PREFIX "images/ui/progress.png");
@@ -7414,7 +7413,6 @@ static void setup(int argc, char * argv[])
 
   SDL_Flip(screen);
 
-
   medium_font = TTF_OpenFont(DATA_PREFIX "fonts/default_font.ttf",
 		      18 - (only_uppercase * 3));
 
@@ -7430,7 +7428,6 @@ static void setup(int argc, char * argv[])
       exit(1);
     }
 
-
   SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 255, 255, 255));
 
   dest.x = (WINDOW_WIDTH - img_title->w) / 2;
@@ -7449,6 +7446,7 @@ static void setup(int argc, char * argv[])
   playsound(0, SND_HARP, 1);
   SDL_FreeSurface(img_title);
 
+
 #if defined(WIN32) && defined(LARGE_CURSOR_FULLSCREEN_BUG)
   if (fullscreen && no_fancy_cursors == 0)
     {
@@ -7469,6 +7467,13 @@ static void setup(int argc, char * argv[])
   scale = 2;
 #endif
 
+  cursor_watch = get_cursor(watch_bits, watch_mask_bits,
+			    watch_width, watch_height,
+			    14 / scale, 14 / scale);
+
+  do_setcursor(cursor_watch);
+
+
   cursor_hand = get_cursor(hand_bits, hand_mask_bits,
 			   hand_width, hand_height,
 			   12 / scale, 1 / scale);
@@ -7493,10 +7498,6 @@ static void setup(int argc, char * argv[])
 		             rotate_width, rotate_height,
 		             15 / scale, 15 / scale);
   
-  cursor_watch = get_cursor(watch_bits, watch_mask_bits,
-			    watch_width, watch_height,
-			    14 / scale, 14 / scale);
-  
   cursor_arrow = get_cursor(arrow_bits, arrow_mask_bits,
 			    arrow_width, arrow_height,
 			    0, 0);
@@ -7513,8 +7514,6 @@ static void setup(int argc, char * argv[])
 			   tiny_width, tiny_height,
 			   3, 3);   /* Exactly the same in SMALL (16x16) size! */
 
-  do_setcursor(cursor_watch);
-  
 
 
   /* Create drawing canvas: */