Freedroid

Revision: 1011
          http://freedroid.svn.sourceforge.net/freedroid/?rev=1011&view=rev
Author:   ahuillet
Date:     2008-08-14 10:26:18 +0000 (Thu, 14 Aug 2008)

Log Message:
-----------
mark startup alerts (rc and 640x480 messages) for translation as reported missing by barbatrix

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2008-08-14 10:09:51 UTC (rev 1010)
+++ src/init.c	2008-08-14 10:26:18 UTC (rev 1011)
@@ -2326,9 +2326,9 @@
     ShowStartupPercentage ( 100 ) ; 
 
     if(GameConfig . screen_width == 640)
-	 GiveMouseAlertWindow ( "\nYou are playing in 640x480.\n\nWhile this resolution works correctly and will\ngive you a great gaming experience, its support is\nin the process of being dropped, therefore you will\nwant to consider using 800x600 or 1024x768.\n\nThank you.\n");
+	 GiveMouseAlertWindow ( _("\nYou are playing in 640x480.\n\nWhile this resolution works correctly and will\ngive you a great gaming experience, its support is\nin the process of being dropped, therefore you will\nwant to consider using 800x600 or 1024x768.\n\nThank you.\n"));
     if ( strstr( VERSION, "rc" ) )
-	 GiveMouseAlertWindow ( "\nYou are playing a candidate release.\nMany strange bugs might still be present in the game.\nPlease report anything you may find to #freedroid at irc.freenode.net, or\n by mail to freedroid-discussion at lists.sourceforge.net\nThank you for helping us test the game.\nGood luck!\n");
+	 GiveMouseAlertWindow ( _("\nYou are playing a candidate release.\nMany strange bugs might still be present in the game.\nPlease report anything you may find to #freedroid at irc.freenode.net, or\n by mail to freedroid-discussion at lists.sourceforge.net\nThank you for helping us test the game.\nGood luck!\n"));
 
     
 }; // void InitFreedroid ( void ) 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1075
          http://freedroid.svn.sourceforge.net/freedroid/?rev=1075&view=rev
Author:   ahuillet
Date:     2008-09-05 09:00:03 +0000 (Fri, 05 Sep 2008)

Log Message:
-----------
redraw background loading picture on all platforms now.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2008-09-04 23:23:27 UTC (rev 1074)
+++ src/init.c	2008-09-05 09:00:03 UTC (rev 1075)
@@ -198,10 +198,8 @@
     SDL_Rect Bar_Rect;
     Uint32 FillColor = SDL_MapRGB( Screen->format, 150 , 200 , 225 ) ; 
     
-#if __WIN32__
     if ( use_open_gl)
 	blit_special_background ( FREEDROID_LOADING_PICTURE_CODE );
-#endif
     
     Bar_Rect . x = 200 * GameConfig . screen_width / 640 ;
     Bar_Rect . y = 200 * GameConfig . screen_height / 480 ;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1222
          http://freedroid.svn.sourceforge.net/freedroid/?rev=1222&view=rev
Author:   stedevil
Date:     2008-11-01 21:51:28 +0000 (Sat, 01 Nov 2008)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2008-11-01 21:44:40 UTC (rev 1221)
+++ src/init.c	2008-11-01 21:51:28 UTC (rev 1222)
@@ -704,10 +704,7 @@
 	    ProgramToFill ->  form = PROGRAM_FORM_RADIAL;
 	if ( !strcmp(pform, "self") ) 
 	    ProgramToFill ->  form = PROGRAM_FORM_SELF;
-	if ( !strcmp(pform, "aura") ) 
-	    ProgramToFill ->  form = PROGRAM_FORM_SELF;
 
-
 	free ( pform );
 
 	ReadValueFromStringWithDefault( ProgramPointer , "Base damage=" , "%hd" , "0",


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1250
          http://freedroid.svn.sourceforge.net/freedroid/?rev=1250&view=rev
Author:   ahuillet
Date:     2008-11-05 20:39:33 +0000 (Wed, 05 Nov 2008)

Log Message:
-----------
removed useless GameOver test in ThouHastXXX functions.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2008-11-05 07:09:04 UTC (rev 1249)
+++ src/init.c	2008-11-05 20:39:33 UTC (rev 1250)
@@ -2409,7 +2409,7 @@
     
     GameOver = TRUE;
     
-    while ( ( SDL_GetTicks() - now < 1000 * WAIT_AFTER_KILLED ) && ( GameOver == TRUE ) )
+    while ( ( SDL_GetTicks() - now < 1000 * WAIT_AFTER_KILLED ))
     {
 	StartTakingTimeForFPSCalculation(); 
 	
@@ -2454,7 +2454,7 @@
 
     GameOver = TRUE;
     
-    while ( ( SDL_GetTicks() - now < 1000 * WAIT_AFTER_GAME_WON ) && ( GameOver == TRUE ) )
+    while ( ( SDL_GetTicks() - now < 1000 * WAIT_AFTER_GAME_WON ) )
     {
 	StartTakingTimeForFPSCalculation(); 
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1306
          http://freedroid.svn.sourceforge.net/freedroid/?rev=1306&view=rev
Author:   ahuillet
Date:     2008-11-15 16:45:21 +0000 (Sat, 15 Nov 2008)

Log Message:
-----------
removed -m option

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2008-11-15 14:36:11 UTC (rev 1305)
+++ src/init.c	2008-11-15 16:45:21 UTC (rev 1306)
@@ -1567,7 +1567,6 @@
                  [-s|--sound] [-q|--nosound] \n\
                  [-o|--open_gl] [-n|--no_open_gl]\n\
                  [-f|--fullscreen] [-w|--window]\n\
-                 [-m|--mapcheck] \n\
                  [-d|--debug=LEVEL]\n\
 		 [-r|--resolution=CODE]\n\
 \n\
@@ -1598,7 +1597,6 @@
 	{"debug",       1, 0,  'd'},
 	{"window",      0, 0,  'w'},
 	{"fullscreen",  0, 0,  'f'},
-	{"mapcheck",    0, 0,  'm'},
 	{"resolution",  1, 0,  'r'},	
 	{ 0,            0, 0,    0}
     };
@@ -1607,7 +1605,7 @@
 
     while ( 1 )
     {
-	c = getopt_long ( argc , argv , "vonqst:h?d::r:wfm" , long_options , NULL );
+	c = getopt_long ( argc , argv , "vonqst:h?d::r:wf" , long_options , NULL );
 	if ( c == -1 )
 	    break;
 
@@ -1745,10 +1743,6 @@
 		GameConfig . fullscreen_on = FALSE;
 		break;
 		
-	    case 'm':
-		skip_initial_menus = TRUE;
-		break;
-		
 	    default:
 		printf ("\nOption %c not implemented yet! Ignored.", c);
 		break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1328
          http://freedroid.svn.sourceforge.net/freedroid/?rev=1328&view=rev
Author:   stedevil
Date:     2008-11-25 03:56:37 +0000 (Tue, 25 Nov 2008)

Log Message:
-----------
several updates to init.c console messages

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2008-11-23 23:19:33 UTC (rev 1327)
+++ src/init.c	2008-11-25 03:56:37 UTC (rev 1328)
@@ -1555,26 +1555,29 @@
 
 char copyright[] = "\nCopyright (C) 2004 Johannes Prix, Reinhard Prix\n\
 Copyright (C) 2005-2007 Arthur Huillet, Karol Swietlicki\n\
-Freedroid comes with NO WARRANTY to the extent permitted by law.\n\
-You may redistribute copies of Freedroid\n\
+FreedroidRPG comes with NO WARRANTY to the extent permitted by law.\n\
+You may redistribute copies of FreedroidRPG\n\
 under the terms of the GNU General Public License.\n\
 For more information about these matters, see the file named COPYING.\n";
 
 
 char usage_string[] ="\
-Usage: freedroid [-v|--version] \n\
-                 [-s|--sound] [-q|--nosound] \n\
-                 [-o|--open_gl] [-n|--no_open_gl]\n\
-                 [-f|--fullscreen] [-w|--window]\n\
-                 [-d|--debug=LEVEL]\n\
-		 [-r|--resolution=CODE]\n\
+Usage: freedroidRPG [-h | --help] \n\
+                    [-v | --version] \n\
+                    [-s | --sound] [-q | --nosound] \n\
+                    [-o | --open_gl] [-n | --no_open_gl] \n\
+                    [-f | --fullscreen] [-w | --window] \n\
+                    [-d X | --debug=X]       X = 0-5; default 1 \n\
+                    [-r Y | --resolution=Y]  Y = 99 lists available resolutions. \n\
 \n\
-Please report bugs either by entering them into the bug-tracking\n\
-system on our sourceforge-website via this link:\n\n\
+Please report bugs either by entering them into the bug tracker\n\
+on our sourceforge-website at:\n\n\
 http://sourceforge.net/projects/freedroid/\n\n\
-or EVEN BETTER, report them by sending e-mail to:\n\n\
+or by sending an e-mail to:\n\n\
 freedroid-discussion@...\
-Thanks a lot in advance, the Freedroid dev team.\n\n";
+For more information and know issues please see README.\n\
+Thanks a lot in advance.\n\
+                          / The FreedroidRPG dev team.\n\n";
 
 /* -----------------------------------------------------------------
  *  parse command line arguments and set global switches 
@@ -1727,7 +1730,7 @@
      7 = Unsupported! (1440 x 900) \n\
      8 = Unsupported! (1680 x 1050) \n\
 Anything else will not be accepted right now, but you can send in\n\
-your suggestion to the FreedroidRPG dev team to enable new resolutions.",
+your suggestion to the FreedroidRPG dev team to enable new resolutions.\n",
 						       NO_NEED_TO_INFORM , IS_FATAL );
 			    break;
 		    }
@@ -2135,7 +2138,7 @@
     //
     if ( strstr ( VERSION , "svn" ) != NULL )
     {
-	DebugPrintf ( -4 , "\nThis seems to be a cvs version, so we'll exit on floating point exceptions." );
+	DebugPrintf ( -4 , "\nThis seems to be a development version, so we'll exit on floating point exceptions." );
 	// feenableexcept ( FE_ALL_EXCEPT );
 	// feenableexcept ( FE_INEXACT ) ;
 	// feenableexcept ( FE_UNDERFLOW ) ;
@@ -2227,7 +2230,7 @@
     {
 	DebugPrintf ( 0 , "\n----------------------------------------------------------------------\n\
 You seem not to have the directory %s in your home directory.\n\
-This directory is used by freedroid to store saved games and your personal settings.\n\
+This directory is used by FreedroidRPG to store saved games and your personal settings.\n\
 So I'll try to create it now...\n\
 ----------------------------------------------------------------------\n", our_config_dir );
 #if __WIN32__
@@ -2314,7 +2317,7 @@
     ShowStartupPercentage ( 100 ) ; 
 
     if(GameConfig . screen_width == 640)
-	 GiveMouseAlertWindow ( _("\nYou are playing in 640x480.\n\nWhile this resolution works correctly and will\ngive you a great gaming experience, its support is\nin the process of being dropped, therefore you will\nwant to consider using 800x600 or 1024x768.\n\nThank you.\n"));
+	 GiveMouseAlertWindow ( _("\nYou are playing in 640x480.\n\nWhile this resolution mostly work correctly and will\ngive you a great gaming experience, its support is\nin the process of being dropped, therefore you will\nwant to consider using 800x600 or higher resolution.\n\nThank you.\n"));
     if ( strstr( VERSION, "rc" ) )
 	 GiveMouseAlertWindow ( _("\nYou are playing a candidate release.\nMany strange bugs might still be present in the game.\nPlease report anything you may find to #freedroid at irc.freenode.net, or\n by mail to freedroid-discussion at lists.sourceforge.net\nThank you for helping us test the game.\nGood luck!\n"));
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1388
          http://freedroid.svn.sourceforge.net/freedroid/?rev=1388&view=rev
Author:   stedevil
Date:     2008-12-19 00:47:36 +0000 (Fri, 19 Dec 2008)

Log Message:
-----------
Adding the 1024x600 as unsupported res accessible via commandline

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2008-12-18 20:42:12 UTC (rev 1387)
+++ src/init.c	2008-12-19 00:47:36 UTC (rev 1388)
@@ -1662,59 +1662,65 @@
 		    switch ( resolution_code )
 		    {
 			case 0:
-			    command_line_override_for_screen_resolution = TRUE ;
-			    GameConfig . screen_width = 640 ; 
-			    GameConfig . screen_height = 480 ;
-			    DebugPrintf ( 1 , "\n%s(): Command line argument -r 0 recognized." , __FUNCTION__ );
-			    break;
+				command_line_override_for_screen_resolution = TRUE ;
+				GameConfig . screen_width = 640 ; 
+				GameConfig . screen_height = 480 ;
+				DebugPrintf ( 1 , "\n%s(): Command line argument -r 0 recognized." , __FUNCTION__ );
+				break;
 			case 1:
-			    command_line_override_for_screen_resolution = TRUE ;
-			    GameConfig . screen_width = 800 ; 
-			    GameConfig . screen_height = 600 ;
-			    DebugPrintf ( 1 , "\n%s(): Command line argument -r 1 recognized." , __FUNCTION__ );
-			    break;
+				command_line_override_for_screen_resolution = TRUE ;
+				GameConfig . screen_width = 800 ; 
+				GameConfig . screen_height = 600 ;
+				DebugPrintf ( 1 , "\n%s(): Command line argument -r 1 recognized." , __FUNCTION__ );
+				break;
 			case 2:
-			    command_line_override_for_screen_resolution = TRUE ;
-			    GameConfig . screen_width = 1024 ; 
-			    GameConfig . screen_height = 768 ;
-			    DebugPrintf ( 1 , "\n%s(): Command line argument -r 2 recognized." , __FUNCTION__ );
-			    break;
+				command_line_override_for_screen_resolution = TRUE ;
+				GameConfig . screen_width = 1024 ; 
+				GameConfig . screen_height = 768 ;
+				DebugPrintf ( 1 , "\n%s(): Command line argument -r 2 recognized." , __FUNCTION__ );
+				break;
 			case 3:
-			    command_line_override_for_screen_resolution = TRUE ;
-			    GameConfig . screen_width = 1152 ; 
-			    GameConfig . screen_height = 864 ;
-			    DebugPrintf ( 1 , "\n%s(): Command line argument -r 3 recognized." , __FUNCTION__ );
-			    break;
+				command_line_override_for_screen_resolution = TRUE ;
+				GameConfig . screen_width = 1152 ; 
+				GameConfig . screen_height = 864 ;
+				DebugPrintf ( 1 , "\n%s(): Command line argument -r 3 recognized." , __FUNCTION__ );
+				break;
 			case 4:
-	                    command_line_override_for_screen_resolution = TRUE ;
-                            GameConfig . screen_width = 1280 ;
-                            GameConfig . screen_height = 960 ;
-                            DebugPrintf ( 1 , "\n%s(): Command line argument -r 4 recognized." , __FUNCTION__ );
-                            break;
+				command_line_override_for_screen_resolution = TRUE ;
+				GameConfig . screen_width = 1280 ;
+				GameConfig . screen_height = 960 ;
+				DebugPrintf ( 1 , "\n%s(): Command line argument -r 4 recognized." , __FUNCTION__ );
+				break;
 			case 5:
-                            command_line_override_for_screen_resolution = TRUE ;
-                            GameConfig . screen_width = 1280 ;
-                            GameConfig . screen_height =1024 ;
-                            DebugPrintf ( 1 , "\n%s(): Command line argument -r 5 recognized." , __FUNCTION__ );
-                            break;
+				command_line_override_for_screen_resolution = TRUE ;
+				GameConfig . screen_width = 1280 ;
+				GameConfig . screen_height =1024 ;
+				DebugPrintf ( 1 , "\n%s(): Command line argument -r 5 recognized." , __FUNCTION__ );
+				break;
 			case 6:
-                            command_line_override_for_screen_resolution = TRUE ;
-                            GameConfig . screen_width = 1280 ;
-                            GameConfig . screen_height = 800 ;
-                            DebugPrintf ( 1 , "\n%s(): Command line argument -r 6 recognized." , __FUNCTION__ );
-                            break;
+				command_line_override_for_screen_resolution = TRUE ;
+				GameConfig . screen_width = 1024 ;
+				GameConfig . screen_height = 600 ;
+				DebugPrintf ( 1 , "\n%s(): Command line argument -r 6 recognized." , __FUNCTION__ );
+				break;
 			case 7:
-                            command_line_override_for_screen_resolution = TRUE ;
-                            GameConfig . screen_width = 1440 ;
-                            GameConfig . screen_height =900 ;
-                            DebugPrintf ( 1 , "\n%s(): Command line argument -r 7 recognized." , __FUNCTION__ );
-                            break;
+				command_line_override_for_screen_resolution = TRUE ;
+				GameConfig . screen_width = 1280 ;
+				GameConfig . screen_height = 800 ;
+				DebugPrintf ( 1 , "\n%s(): Command line argument -r 7 recognized." , __FUNCTION__ );
+				break;
 			case 8:
-                            command_line_override_for_screen_resolution = TRUE ;
-                            GameConfig . screen_width = 1680 ;
-                            GameConfig . screen_height =1050 ;
-                            DebugPrintf ( 1 , "\n%s(): Command line argument -r 8 recognized." , __FUNCTION__ );
-                            break;
+				command_line_override_for_screen_resolution = TRUE ;
+				GameConfig . screen_width = 1440 ;
+				GameConfig . screen_height =900 ;
+				DebugPrintf ( 1 , "\n%s(): Command line argument -r 8 recognized." , __FUNCTION__ );
+				break;
+			case 9:
+				command_line_override_for_screen_resolution = TRUE ;
+				GameConfig . screen_width = 1680 ;
+				GameConfig . screen_height =1050 ;
+				DebugPrintf ( 1 , "\n%s(): Command line argument -r 9 recognized." , __FUNCTION__ );
+				break;
 			default:
 			    fprintf( stderr, "\nresolution code received: %d" , resolution_code );
 			    ErrorMessage ( __FUNCTION__  , "\
@@ -1726,9 +1732,10 @@
      3 = 1152 x 864 \n\
      4 = 1280 x 960 \n\
      5 = Unsupported! (1280 x 1024) \n\
-     6 = Unsupported! (1280 x 800) \n\
-     7 = Unsupported! (1440 x 900) \n\
-     8 = Unsupported! (1680 x 1050) \n\
+     6 = Unsupported! (1024 x 600) \n\
+     7 = Unsupported! (1280 x 800) \n\
+     8 = Unsupported! (1440 x 900) \n\
+     9 = Unsupported! (1680 x 1050) \n\
 Anything else will not be accepted right now, but you can send in\n\
 your suggestion to the FreedroidRPG dev team to enable new resolutions.\n",
 						       NO_NEED_TO_INFORM , IS_FATAL );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1396
          http://freedroid.svn.sourceforge.net/freedroid/?rev=1396&view=rev
Author:   ahuillet
Date:     2008-12-24 17:54:42 +0000 (Wed, 24 Dec 2008)

Log Message:
-----------
minor fixes on character descriptions

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2008-12-24 16:31:37 UTC (rev 1395)
+++ src/init.c	2008-12-24 17:54:42 UTC (rev 1396)
@@ -132,7 +132,7 @@
 
     character_descriptions [ PERSON_SORENSON ] = _("You see a legend. Sorenson Clark. One of the best human programmers that have ever lived. Just like Paganini she is said to have sold her soul to the devil for her skill. Whatever is the truth, her code is like magic, and there is no denying that.");
 
-    character_descriptions [ PERSON_KEVIN ] = _("He is either a college student, a drug addict or a hacker. I bet he did not have a warm meal for days, he looks totally malnourished. His body keeps twitching. Must be the caffeine. I hope.");
+    character_descriptions [ PERSON_KEVIN ] = _("He is either a college student, a drug addict or a hacker. You bet he did not have a warm meal for days, he looks totally malnourished. His body keeps twitching. Must be the caffeine. You hope.");
 
     character_descriptions [ PERSON_BENDER ] = _("Don't do steroids or you will be just like him.");
 
@@ -154,7 +154,7 @@
 
     character_descriptions [ PERSON_KEVINS_GUARD ] = _("It looks like a 614. It moves like a 614. It even kills like a 614. Must be a 614 then.");
 
-    character_descriptions [ PERSON_RMS ] = _("He must be the resident scientist. The only thing keeping his body alive is the massive coffee overdose that he takes early in the morning every day. The amount of cafeine that he has in his blood right now would be enough to kill ten humans, but since computer scientists are a different species, he is unharmed.");
+    character_descriptions [ PERSON_RMS ] = _("He must be the resident scientist. The only thing keeping his body alive is the massive coffee overdose that he takes early in the morning every day. The amount of caffeine that he has in his blood right now would be enough to kill ten humans, but since computer scientists are a different species, he is unharmed.");
 
     character_descriptions [ PERSON_DARWIN ] = _("Something about him makes you think of angels. Except angels are usually sane, do not have an urge to kill everything around them and are much better at singing religious songs.");
 
@@ -174,7 +174,7 @@
 
     character_descriptions [ PERSON_MICHELANGELO ] = _("And now you know who is to be blamed for the truly awful food in here. You are in a killing mood. Oh yeah. The cook must die. The cook must die. Ha. Ha. Ha.");
 
-    character_descriptions [ PERSON_SUBDIALOG_DUMMY ] = _("This is a major bug. Please report this incident to the developers. Thank you.");
+    character_descriptions [ PERSON_SUBDIALOG_DUMMY ] = _("This is a minor bug. Please report this incident to the developers. Thank you.");
 
     character_descriptions [ PERSON_STANDARD_BOT_AFTER_TAKEOVER ] = _("Blood. Stone. Cog. The Blood has made the Cog from the Stone. Now the Cog is making more Stone from the Blood. I wonder what is the next step of the cycle...");
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1418
          http://freedroid.svn.sourceforge.net/freedroid/?rev=1418&view=rev
Author:   stedevil
Date:     2009-01-01 08:29:03 +0000 (Thu, 01 Jan 2009)

Log Message:
-----------
adding 1400x1050 4:3 res

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2008-12-30 11:29:57 UTC (rev 1417)
+++ src/init.c	2009-01-01 08:29:03 UTC (rev 1418)
@@ -1307,6 +1307,7 @@
 		{ 1024,  768, "1024 x 768",                      TRUE  },
 		{ 1152,  864, "1152 x 864",                      TRUE  },
 		{ 1280,  960, "1280 x 960",                      TRUE  },
+		{ 1400, 1050, "1400 x 1050",                     TRUE  },
 		{ 1280, 1024, "Unsupported! (1280 x 1024)",      FALSE },
 		{ 1024,  600, "Unsupported! (1024 x 600)",       FALSE },
 		{ 1280,  800, "Unsupported! (1280 x 800)",       FALSE },


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1640
          http://freedroid.svn.sourceforge.net/freedroid/?rev=1640&view=rev
Author:   stedevil
Date:     2009-02-02 03:44:51 +0000 (Mon, 02 Feb 2009)

Log Message:
-----------
Adding jkwoods patch for character descriptions

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2009-02-01 06:39:15 UTC (rev 1639)
+++ src/init.c	2009-02-02 03:44:51 UTC (rev 1640)
@@ -130,31 +130,31 @@
 
     character_descriptions [ PERSON_CHA ] = _("Hmm... This must be the token town sage.");
 
-    character_descriptions [ PERSON_SORENSON ] = _("You see a legend. Sorenson Clark. One of the best human programmers that have ever lived. Just like Paganini she is said to have sold her soul to the devil for her skill. Whatever is the truth, her code is like magic, and there is no denying that.");
+    character_descriptions [ PERSON_SORENSON ] = _("You see a legend. Sorenson Clark. One of the best human programmers that has ever lived. Just like Paganini, she is said to have sold her soul to the devil for her skill. Whatever the truth is, her code is like magic, and there is no denying that.");
 
-    character_descriptions [ PERSON_KEVIN ] = _("He is either a college student, a drug addict or a hacker. You bet he did not have a warm meal for days, he looks totally malnourished. His body keeps twitching. Must be the caffeine. You hope.");
+    character_descriptions [ PERSON_KEVIN ] = _("He is either a college student, a drug addict or a hacker. You bet he has not had a warm meal for days, he looks totally malnourished. His body keeps twitching. Must be the caffeine. You hope.");
 
-    character_descriptions [ PERSON_BENDER ] = _("Don't do steroids or you will be just like him.");
+    character_descriptions [ PERSON_BENDER ] = _("Don't do steroids, or you will be just like him.");
 
     character_descriptions [ PERSON_614 ] = _("There are at least 614 reasons to stay away from the 614 bot battle platform. There are also 614 reasons why a 614 bot battle platform can be your best friend during combat...");
 
-    character_descriptions [ PERSON_FRANCIS ] = _("Francis is not looking so good today. His tattered coat is not looking that much better either. The war is taking its toll on them both.");
+    character_descriptions [ PERSON_FRANCIS ] = _("Francis is not looking so good today. His tattered coat is not looking that much better. The war is taking its toll on them both.");
 
     character_descriptions [ PERSON_DUNCAN ] = _("What a strange person. He does not seem to really fit into this reality. There is something very eerie about him. And frightening.");
 
-    character_descriptions [ PERSON_BRUCE ] = _("This person looks totally defeated. Tattered clothes surround his skeletal form. If there was a fifth raider of the apocalypse, it would be him and his name would be Hard Work.");
+    character_descriptions [ PERSON_BRUCE ] = _("This person looks totally defeated. Tattered clothes surround his skeletal form. If there was a fifth rider of the apocalypse, it would be him and his name would be Hard Work.");
 
-    character_descriptions [ PERSON_SKIPPY ] = _("It seems that even during the end of the world the species known as 'Salesman' is able to survive. Just his presence makes you want to kill all humans.");
+    character_descriptions [ PERSON_SKIPPY ] = _("It seems that even at the end of the world the species known as 'Salesman' is able to survive. Just his presence makes you want to destroy all humans.");
     
     character_descriptions [ PERSON_EWALD ] = _("He looks unexplicably happy.");
 
     character_descriptions [ PERSON_STONE ] = _("In some places of the world there exists a very interesting saying. 'Tough as nails.' However, in every place where the Stone trader family stays for a while, a new saying emerges. 'Tough as the Stones.'");
 
-    character_descriptions [ PERSON_DIXON ] = _("It is very obvious that this is not a normal Red Guard. Most of them do not have oil stains on their armor and smell of alcohol.");
+    character_descriptions [ PERSON_DIXON ] = _("It is very obvious that this is not a normal Red Guard. Most of them do not have oil stains on their armor, or smell of alcohol.");
 
     character_descriptions [ PERSON_KEVINS_GUARD ] = _("It looks like a 614. It moves like a 614. It even kills like a 614. Must be a 614 then.");
 
-    character_descriptions [ PERSON_RMS ] = _("He must be the resident scientist. The only thing keeping his body alive is the massive coffee overdose that he takes early in the morning every day. The amount of caffeine that he has in his blood right now would be enough to kill ten humans, but since computer scientists are a different species, he is unharmed.");
+    character_descriptions [ PERSON_RMS ] = _("He must be the resident scientist. The only thing keeping his body alive is the massive coffee overdose that he takes early every morning. The amount of caffeine that he has in his blood right now would be enough to kill ten humans, but since computer scientists are a different species, he is unharmed.");
 
     character_descriptions [ PERSON_DARWIN ] = _("Something about him makes you think of angels. Except angels are usually sane, do not have an urge to kill everything around them and are much better at singing religious songs.");
 
@@ -164,13 +164,13 @@
 
     character_descriptions [ PERSON_PENDRAGON ] = _("He seems to be the chief of the gate guards. Hard to say anything more, the armor hides his body.");
 
-    character_descriptions [ PERSON_BENJAMIN ] = _("Just an another Red Guard. The armor hides his body.");
+    character_descriptions [ PERSON_BENJAMIN ] = _("Yet another Red Guard, the ranged weapons instructor. The armor hides his body.");
 
     character_descriptions [ PERSON_DOC_MOORE ] = _("Some people say that every doctor is addicted to drugs. You estimate that right now this one is high on at least four different narcotics. Doc Moore seems very happy indeed...");
 
     character_descriptions [ PERSON_BUTCH ] = _("Yet another Red Guard. You cannot say anything more, the armor hides his body.");
 
-    character_descriptions [ PERSON_SPENCER ] = _("He looks taller than most of the Red Guards, but you cannot really say anything more about him, the armor hides his body.");
+    character_descriptions [ PERSON_SPENCER ] = _("He looks taller than most of the Red Guards, but you cannot really determine anything more about him, the armor hides his body.");
 
     character_descriptions [ PERSON_MICHELANGELO ] = _("And now you know who is to be blamed for the truly awful food in here. You are in a killing mood. Oh yeah. The cook must die. The cook must die. Ha. Ha. Ha.");
 
@@ -186,6 +186,16 @@
 
     character_descriptions [ PERSON_MS_FACILITY_GATE_GUARD_LEADER ] = _("The armor hides his body.");
 
+    character_descriptions [ PERSON_JASMINE ] = _("This very well could be the most attractive human you've ever seen. There is something odd about her, though...");
+
+    character_descriptions [ PERSON_TUTORIALTOM ] = _("This is Tom. He will introduce you to the game, and help you throughout this tutorial.");
+
+    character_descriptions [ PERSON_LUKAS ] = _("Keeper of the Red Guard armory.  The armor hides his body.");
+
+    character_descriptions [ PERSON_KOAN ] = _("This must be the guy Duncan told you about. At least, he's the only one around.");
+
+    character_descriptions [ PERSON_TANIA ] = _("A lonely scientist. The months she's spent trapped here seem to have taken their toll on her sanity.");
+
 }; // void init_character_descriptions ( void )
 
 /** 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1711
          http://freedroid.svn.sourceforge.net/freedroid/?rev=1711&view=rev
Author:   ahuillet
Date:     2009-02-09 13:03:43 +0000 (Mon, 09 Feb 2009)

Log Message:
-----------
removing annoying message at startup when playing in 640x480

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2009-02-08 23:57:48 UTC (rev 1710)
+++ src/init.c	2009-02-09 13:03:43 UTC (rev 1711)
@@ -1995,8 +1995,6 @@
  
     ShowStartupPercentage ( 100 ) ; 
 
-    if(GameConfig . screen_width == 640)
-	 GiveMouseAlertWindow ( _("\nYou are playing in 640x480.\n\nWhile this resolution mostly work correctly and will\ngive you a great gaming experience, its support is\nin the process of being dropped, therefore you will\nwant to consider using 800x600 or higher resolution.\n\nThank you.\n"));
     if ( strstr( VERSION, "rc" ) )
 	 GiveMouseAlertWindow ( _("\nYou are playing a candidate release.\nMany strange bugs might still be present in the game.\nPlease report anything you may find to #freedroid at irc.freenode.net, or\n by mail to freedroid-discussion at lists.sourceforge.net\nThank you for helping us test the game.\nGood luck!\n"));
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1785
          http://freedroid.svn.sourceforge.net/freedroid/?rev=1785&view=rev
Author:   ahuillet
Date:     2009-02-16 14:04:55 +0000 (Mon, 16 Feb 2009)

Log Message:
-----------
correct error msg when a title file is missing its terminator

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2009-02-16 14:04:34 UTC (rev 1784)
+++ src/init.c	2009-02-16 14:04:55 UTC (rev 1785)
@@ -286,8 +286,7 @@
 	NextSubsectionStartPointer += strlen ( "*** START OF PURE SCROLLTEXT DATA ***\n" );
 	if ( (TerminationPointer=strstr ( NextSubsectionStartPointer, "\n*** END OF PURE SCROLLTEXT DATA ***")) == NULL)
 	{
-	    DebugPrintf (1, "\n\nvoid PlayATitleFile(...): Unterminated Subsection in Mission briefing....Terminating...");
-	    Terminate(ERR);
+		ErrorMessage(__FUNCTION__, "Unterminated Subsection in Mission briefing....Terminating...\n", PLEASE_INFORM, IS_FATAL);
 	}
 	ThisTextLength=TerminationPointer-NextSubsectionStartPointer;
 	PreparedBriefingText = MyMalloc (ThisTextLength + 10);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1844
          http://freedroid.svn.sourceforge.net/freedroid/?rev=1844&view=rev
Author:   ahuillet
Date:     2009-03-08 21:08:17 +0000 (Sun, 08 Mar 2009)

Log Message:
-----------
Remove useless "Updating tux images" message

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2009-03-08 21:08:00 UTC (rev 1843)
+++ src/init.c	2009-03-08 21:08:17 UTC (rev 1844)
@@ -1712,8 +1712,6 @@
     // take a little time.  Therefore we print some message so the user will not
     // panic and push the reset button :)
     //
-    PutStringFont ( Screen , Menu_BFont , ( GameConfig . screen_width / 2 ) - 180 , ( GameConfig . screen_height / 2 ) - 70 , _("Updating Tux images") );
-    PutStringFont ( Screen , Menu_BFont , ( GameConfig . screen_width / 2 ) - 250 , ( GameConfig . screen_height / 2 ) - 30 , _("(this may take a little while...)") );
     our_SDL_flip_wrapper();
     
     append_new_game_message ( _("Starting new game.") );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1998
          http://freedroid.svn.sourceforge.net/freedroid/?rev=1998&view=rev
Author:   ahuillet
Date:     2009-09-19 12:10:06 +0000 (Sat, 19 Sep 2009)

Log Message:
-----------
free cookies strings when starting a new character

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2009-09-19 10:40:52 UTC (rev 1997)
+++ src/init.c	2009-09-19 12:10:06 UTC (rev 1998)
@@ -1540,6 +1540,9 @@
 	clear_out_intermediate_points(&Me.pos, Me.next_intermediate_point, MAX_INTERMEDIATE_WAYPOINTS_FOR_TUX);
 
 	for (j = 0; j < MAX_COOKIES; j++) {
+		if (Me.cookie_list[j])
+			free(Me.cookie_list[j]);
+
 		Me.cookie_list[j] = NULL;
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2081
          http://freedroid.svn.sourceforge.net/freedroid/?rev=2081&view=rev
Author:   ahuillet
Date:     2009-10-27 12:40:53 +0000 (Tue, 27 Oct 2009)

Log Message:
-----------
Remove unused variable in InitFreedroid()

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2009-10-27 12:40:41 UTC (rev 2080)
+++ src/init.c	2009-10-27 12:40:53 UTC (rev 2081)
@@ -1663,9 +1663,6 @@
  * ----------------------------------------------------------------- */
 void InitFreedroid(int argc, char **argv)
 {
-#ifndef USE_SDL_FRAMERATE
-	struct timeval timestamp;
-#endif
 	struct stat statbuf;
 
 	global_ingame_mode = GLOBAL_INGAME_MODE_NORMAL;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2120
          http://freedroid.svn.sourceforge.net/freedroid/?rev=2120&view=rev
Author:   ahuillet
Date:     2009-12-02 08:58:12 +0000 (Wed, 02 Dec 2009)

Log Message:
-----------
Eat input in ThouHastWon/ThouArtDefeated - fixes "game exits" bug when dying.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2009-12-02 08:57:39 UTC (rev 2119)
+++ src/init.c	2009-12-02 08:58:12 UTC (rev 2120)
@@ -1925,8 +1925,8 @@
 
 	}
 
-	DebugPrintf(2, "\n%s():  Usual end of function reached.", __FUNCTION__);
 
+	input_handle();
 };				// void ThouArtDefeated(void)
 
 /**
@@ -1976,7 +1976,7 @@
 
 	PlayATitleFile("Credits.title");
 
-	DebugPrintf(2, "\n%s():  Usual end of function reached.", __FUNCTION__);
+	input_handle();
 
 };				// void ThouHastWon(void)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2380
          http://freedroid.svn.sourceforge.net/freedroid/?rev=2380&view=rev
Author:   salimiles
Date:     2010-02-05 05:31:53 +0000 (Fri, 05 Feb 2010)

Log Message:
-----------
Fixed compiler complaint for init.c: added string formats.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2010-02-04 16:24:15 UTC (rev 2379)
+++ src/init.c	2010-02-05 05:31:53 UTC (rev 2380)
@@ -1264,13 +1264,13 @@
 			 * following gnu-coding standards for command line interfaces */
 		case 'v':
 			printf("\n%s %s  \n", PACKAGE, VERSION);
-			printf(copyright);
+			printf("%s",copyright);
 			exit(0);
 			break;
 
 		case 'h':
 		case '?':
-			printf(usage_string);
+			printf("%s",usage_string);
 			exit(0);
 			break;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2387
          http://freedroid.svn.sourceforge.net/freedroid/?rev=2387&view=rev
Author:   stedevil
Date:     2010-02-09 12:00:11 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
Making startupbar be 50% wider, more centered and not overlapping bots

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2010-02-07 00:07:35 UTC (rev 2386)
+++ src/init.c	2010-02-09 12:00:11 UTC (rev 2387)
@@ -246,21 +246,21 @@
 	if (use_open_gl)
 		blit_special_background(FREEDROID_LOADING_PICTURE_CODE);
 
-	Bar_Rect.x = 200 * GameConfig.screen_width / 640;
-	Bar_Rect.y = 275 * GameConfig.screen_height / 480;
-	Bar_Rect.w = 2 * Percentage * GameConfig.screen_width / 640;
+	Bar_Rect.x = 160 * GameConfig.screen_width / 640;
+	Bar_Rect.y = 288 * GameConfig.screen_height / 480;
+	Bar_Rect.w = 3 * Percentage * GameConfig.screen_width / 640;
 	Bar_Rect.h = 30 * GameConfig.screen_height / 480;
 	our_SDL_fill_rect_wrapper(Screen, &Bar_Rect, FillColor);
 
-	Bar_Rect.x = (200 + 2 * Percentage) * GameConfig.screen_width / 640;
-	Bar_Rect.y = 275 * GameConfig.screen_height / 480;
-	Bar_Rect.w = (200 - 2 * Percentage) * GameConfig.screen_width / 640;
+	Bar_Rect.x = (160 + 3 * Percentage) * GameConfig.screen_width / 640;
+	Bar_Rect.y = 288 * GameConfig.screen_height / 480;
+	Bar_Rect.w = (300 - 3 * Percentage) * GameConfig.screen_width / 640;
 	Bar_Rect.h = 30 * GameConfig.screen_height / 480;
 	our_SDL_fill_rect_wrapper(Screen, &Bar_Rect, 0);
 
 	SDL_SetClipRect(Screen, NULL);
 
-	PrintString(Screen, 300 * GameConfig.screen_width / 640 - 9, 288 * GameConfig.screen_height / 480 - 7, "%d%%", Percentage);
+	PrintString(Screen, 310 * GameConfig.screen_width / 640 - 9, 301 * GameConfig.screen_height / 480 - 7, "%d%%", Percentage);
 
 	our_SDL_update_rect_wrapper(Screen, 0, 0, Screen->w, Screen->h);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2724
          http://freedroid.svn.sourceforge.net/freedroid/?rev=2724&view=rev
Author:   ahuillet
Date:     2010-05-01 10:46:42 +0000 (Sat, 01 May 2010)

Log Message:
-----------
Remove an unused variable in item data reading

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2010-05-01 10:46:31 UTC (rev 2723)
+++ src/init.c	2010-05-01 10:46:42 UTC (rev 2724)
@@ -342,7 +342,6 @@
 void Get_Bullet_Data(char *DataPointer)
 {
 	char *BulletPointer;
-	char *EndOfBulletData;
 	int i;
 	int BulletIndex = 0;
 
@@ -357,7 +356,6 @@
 #define BULLET_BLAST_TYPE_CAUSED_BEGIN_STRING "Type of blast this bullet causes when crashing e.g. against a wall :"
 
 	BulletPointer = LocateStringInData(DataPointer, BULLET_SECTION_BEGIN_STRING);
-	EndOfBulletData = LocateStringInData(DataPointer, BULLET_SECTION_END_STRING);
 
 	DebugPrintf(1, "\n\nStarting to read bullet data...\n\n");
 	// At first, we must allocate memory for the droid specifications.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2981
          http://freedroid.svn.sourceforge.net/freedroid/?rev=2981&view=rev
Author:   stedevil
Date:     2010-06-16 11:54:34 +0000 (Wed, 16 Jun 2010)

Log Message:
-----------
Editor: Starting from main menu open at center of map (FR 3016941) (RB 226) / Samuel Pitoiset

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2010-06-16 11:50:52 UTC (rev 2980)
+++ src/init.c	2010-06-16 11:54:34 UTC (rev 2981)
@@ -1427,7 +1427,7 @@
 	ResolveMapLabelOnShip(startpos, &StartPosition);
 	reset_visible_levels();
 	if(game_root_mode == ROOT_IS_LVLEDIT && GameConfig.last_edited_level != -1) 
-		Teleport(GameConfig.last_edited_level, 3, 3, FALSE);
+		teleport_to_level_center(GameConfig.last_edited_level);
 	else
 		Teleport(StartPosition.level, StartPosition.x, StartPosition.y, FALSE);
 	clear_active_bullets();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2991
          http://freedroid.svn.sourceforge.net/freedroid/?rev=2991&view=rev
Author:   ahuillet
Date:     2010-06-19 07:38:14 +0000 (Sat, 19 Jun 2010)

Log Message:
-----------
enemies: init factions and npcs *before* loading droids on the ship, so as to be able to call get_npc and get_faction_id when loading droids. Suggested by Miles.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2010-06-19 07:36:35 UTC (rev 2990)
+++ src/init.c	2010-06-19 07:38:14 UTC (rev 2991)
@@ -1419,10 +1419,10 @@
 	Me.TextToBeDisplayed = _("Huh? What?  Where am I?");
 	Me.TextVisibleTime = 0;
 
-	GetCrew("ReturnOfTux.droids");
-
 	init_npcs();
 	init_factions();
+	
+	GetCrew("ReturnOfTux.droids");
 
 	ResolveMapLabelOnShip(startpos, &StartPosition);
 	reset_visible_levels();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3167
          http://freedroid.svn.sourceforge.net/freedroid/?rev=3167&view=rev
Author:   fluzz
Date:     2010-08-16 12:27:48 +0000 (Mon, 16 Aug 2010)

Log Message:
-----------
Check if the last edited level exists, before to open it in the level editor.
Patch by Samuel Pitoiset.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2010-08-16 12:23:32 UTC (rev 3166)
+++ src/init.c	2010-08-16 12:27:48 UTC (rev 3167)
@@ -1418,7 +1418,7 @@
 
 	ResolveMapLabelOnShip(startpos, &StartPosition);
 	reset_visible_levels();
-	if(game_root_mode == ROOT_IS_LVLEDIT && GameConfig.last_edited_level != -1) 
+	if (game_root_mode == ROOT_IS_LVLEDIT && level_exists(GameConfig.last_edited_level))
 		teleport_to_level_center(GameConfig.last_edited_level);
 	else
 		Teleport(StartPosition.level, StartPosition.x, StartPosition.y, FALSE);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3343
          http://freedroid.svn.sourceforge.net/freedroid/?rev=3343&view=rev
Author:   ahuillet
Date:     2010-10-24 15:38:39 +0000 (Sun, 24 Oct 2010)

Log Message:
-----------
Reset quest log button status when creating a new game (the button will not stay red across games any longer).

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2010-10-24 14:25:46 UTC (rev 3342)
+++ src/init.c	2010-10-24 15:38:39 UTC (rev 3343)
@@ -1483,6 +1483,8 @@
 	Me.readied_skill = 0;
 	Me.walk_cycle_phase = 0;
 
+	Me.quest_browser_changed = 0;
+
 	// None of the inventory slots like currently equipped weapons
 	// or the like should be held in hand, like when you take it
 	// 'into your hand' by clicking on it with the mouse button in


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3578
          http://freedroid.svn.sourceforge.net/freedroid/?rev=3578&view=rev
Author:   ahuillet
Date:     2010-12-17 22:06:40 +0000 (Fri, 17 Dec 2010)

Log Message:
-----------
Add commonly used resolutions to list. Patch by Elliot Thomas.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2010-12-17 22:04:58 UTC (rev 3577)
+++ src/init.c	2010-12-17 22:06:40 UTC (rev 3578)
@@ -1140,17 +1140,21 @@
 
 screen_resolution screen_resolutions[] = {
 	// xres,yres, cmdline comment, display in menu
-	{640, 480, "640 x 480 (default with SDL)", TRUE},
-	{800, 600, "800 x 600 (default with OpenGL)", TRUE},
-	{1024, 768, "1024 x 768", TRUE},
-	{1152, 864, "1152 x 864", TRUE},
-	{1280, 960, "1280 x 960", TRUE},
-	{1400, 1050, "1400 x 1050", TRUE},
-	{1280, 1024, "Unsupported! (1280 x 1024)", FALSE},
-	{1024, 600, "Unsupported! (1024 x 600)", FALSE},
-	{1280, 800, "Unsupported! (1280 x 800)", FALSE},
-	{1440, 900, "Unsupported! (1440 x 900)", FALSE},
-	{1680, 1050, "Unsupported! (1680 x 1050)", FALSE},
+	{640, 480, "640 x 480, 4:3 (default with SDL)", TRUE},
+	{800, 600, "800 x 600, 4:3 (default with OpenGL)", TRUE},
+	{1024, 768, "1024 x 768, 4:3", TRUE},
+	{1152, 864, "1152 x 864, 4:3", TRUE},
+	{1280, 960, "1280 x 960, 4:3", TRUE},
+	{1400, 1050, "1400 x 1050, 4:3", TRUE},
+	{1600, 1200, "1600 x 1200, 4:3", TRUE},
+	{1280, 1024, "Unsupported! (1280 x 1024, 5:4)", FALSE},
+	{1024, 600, "Unsupported! (1024 x 600, 128:75)", FALSE},
+	{1280, 800, "Unsupported! (1280 x 800, 16:10)", FALSE},
+	{1440, 900, "Unsupported! (1440 x 900, 16:10)", FALSE},
+	{1680, 1050, "Unsupported! (1680 x 1050, 16:10)", FALSE},
+	{854, 480, "Unsupported! (854 x 480, 16:9)", FALSE},
+	{1280, 720, "Unsupported! (1280 x 720, 16:9)", FALSE},
+	{1920, 1080, "Unsupported! (1920 x 1080, 16:9)", FALSE},
 	// end of list
 	{-1, -1, "", FALSE}
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3721
          http://freedroid.svn.sourceforge.net/freedroid/?rev=3721&view=rev
Author:   skangas
Date:     2011-01-16 16:41:15 +0000 (Sun, 16 Jan 2011)

Log Message:
-----------
Enable fadings by default.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-01-16 16:32:38 UTC (rev 3720)
+++ src/init.c	2011-01-16 16:41:15 UTC (rev 3721)
@@ -1392,6 +1392,7 @@
 	GameConfig.delay_for_big_screen_messages = 6.5;
 	GameConfig.enable_cheatkeys = FALSE;
 	GameConfig.skip_shadow_blitting = FALSE;
+        GameConfig.do_fadings = TRUE;
 	GameConfig.xray_vision_for_tux = FALSE;
 	GameConfig.cheat_running_stamina = FALSE;
 	GameConfig.lazyload = 1;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3751
          http://freedroid.svn.sourceforge.net/freedroid/?rev=3751&view=rev
Author:   matthiaskrgr
Date:     2011-01-22 12:12:37 +0000 (Sat, 22 Jan 2011)

Log Message:
-----------
Remove copyright information from freedroidRPG -v output.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-01-22 12:12:25 UTC (rev 3750)
+++ src/init.c	2011-01-22 12:12:37 UTC (rev 3751)
@@ -1097,9 +1097,7 @@
 
 };				// int Init_Game_Data ( void )
 
-char copyright[] = "\nCopyright (C) 2004 Johannes Prix, Reinhard Prix\n\
-Copyright (C) 2005-2007 Arthur Huillet, Karol Swietlicki\n\
-FreedroidRPG comes with NO WARRANTY to the extent permitted by law.\n\
+char copyright[] = "\nFreedroidRPG comes with NO WARRANTY to the extent permitted by law.\n\
 You may redistribute copies of FreedroidRPG\n\
 under the terms of the GNU General Public License.\n\
 For more information about these matters, see the file named COPYING.\n";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3856
          http://freedroid.svn.sourceforge.net/freedroid/?rev=3856&view=rev
Author:   matthiaskrgr
Date:     2011-02-04 22:59:52 +0000 (Fri, 04 Feb 2011)

Log Message:
-----------
documentation: replace 'cvs' with 'svn' in a code comment of ./src/init.c. Patch by Miles.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-02-04 22:32:40 UTC (rev 3855)
+++ src/init.c	2011-02-04 22:59:52 UTC (rev 3856)
@@ -1281,10 +1281,10 @@
 #ifndef __WIN32__
 
 	// Let's see if we're dealing with a real release or rather if
-	// we're dealing with a cvs version.  The difference is this:
+	// we're dealing with a svn version.  The difference is this:
 	// Releases shouldn't terminate upon a floating point exception
-	// while the current cvs code (for better debugging) should
-	// do so.  Therefore we check for 'cvs' in the current version
+	// while the current svn code (for better debugging) should
+	// do so.  Therefore we check for 'svn' in the current version
 	// string and enable/disable the exceptions accordingly...
 	//
 	if (strstr(VERSION, "svn") != NULL) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4644
          http://freedroid.svn.sourceforge.net/freedroid/?rev=4644&view=rev
Author:   fluzz
Date:     2011-05-22 17:48:27 +0000 (Sun, 22 May 2011)

Log Message:
-----------
Avoid to save a corrupted default configuration file.

In some cases, the game crashes during initialization, before or during the configuration loading. The default configuration is however sometimes saved, with a 0 x 0 screen size. This leads to a 'corrupted' configuration file.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-05-21 17:47:17 UTC (rev 4643)
+++ src/init.c	2011-05-22 17:48:27 UTC (rev 4644)
@@ -1287,6 +1287,9 @@
 	GameConfig.lazyload = 1;
 	GameConfig.show_item_labels = 0;
 	GameConfig.last_edited_level = -1;
+	GameConfig.screen_width = 800;
+	GameConfig.screen_height = 600;
+	GameConfig.fullscreen_on = FALSE;
 }
 
 /** 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4652
          http://freedroid.svn.sourceforge.net/freedroid/?rev=4652&view=rev
Author:   matthiaskrgr
Date:     2011-05-27 18:08:04 +0000 (Fri, 27 May 2011)

Log Message:
-----------
animated bullets: read number of phases and number of phases per second from bullet_archetypes.dat file. Patch by Jozef Kucia.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-05-27 17:59:29 UTC (rev 4651)
+++ src/init.c	2011-05-27 18:08:04 UTC (rev 4652)
@@ -228,6 +228,7 @@
 	int BulletIndex = 0;
 
 #define NEW_BULLET_TYPE_BEGIN_STRING "** Start of new bullet specification subsection **"
+#define NEW_BULLET_TYPE_END_STRING "** End of new bullet specification subsection **"
 
 	DebugPrintf(1, "\n\nStarting to read bullet data...\n\n");
 	// At first, we must allocate memory for the droid specifications.
@@ -257,11 +258,12 @@
 	char *BulletPointer = DataPointer;
 
 	while ((BulletPointer = strstr(BulletPointer, NEW_BULLET_TYPE_BEGIN_STRING)) != NULL) {
+		char *EndBulletSection = LocateStringInData(BulletPointer, NEW_BULLET_TYPE_END_STRING);
 		DebugPrintf(1, "\n\nFound another Bullet specification entry!  Lets add that to the others!");
 		BulletPointer++;	// to avoid doubly taking this entry
 		Bulletmap[BulletIndex].name = ReadAndMallocStringFromData(BulletPointer, "Bullet identification: \"", "\"");
-		Bulletmap[BulletIndex].phases = 1;
-		Bulletmap[BulletIndex].phase_changes_per_second = 1;
+		ReadValueFromStringWithDefault(BulletPointer, "Number of phases: ", "%d", "1", &Bulletmap[BulletIndex].phases, EndBulletSection);
+		ReadValueFromStringWithDefault(BulletPointer, "Phases per second: ", "%lf", "1", &Bulletmap[BulletIndex].phase_changes_per_second, EndBulletSection);
 		Bulletmap[BulletIndex].sound = ReadAndMallocStringFromDataOptional(BulletPointer, "Sound to play: \"", "\"");
 		BulletIndex++;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4715
          http://freedroid.svn.sourceforge.net/freedroid/?rev=4715&view=rev
Author:   ahuillet
Date:     2011-06-18 11:08:02 +0000 (Sat, 18 Jun 2011)

Log Message:
-----------
Limit startup bar to 100%.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-06-18 09:25:50 UTC (rev 4714)
+++ src/init.c	2011-06-18 11:08:02 UTC (rev 4715)
@@ -140,6 +140,8 @@
 #endif
 
 	startup_percent += done;
+	if (startup_percent > 100)
+		startup_percent = 100;
 
 #ifdef STARTUP_PERCENTAGE_COMPUTE
 	long elapsed = SDL_GetTicks() - load_start_time;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4811
          http://freedroid.svn.sourceforge.net/freedroid/?rev=4811&view=rev
Author:   matthiaskrgr
Date:     2011-07-07 16:03:17 +0000 (Thu, 07 Jul 2011)

Log Message:
-----------
re-implement formerly removed hardcoded resolutions -r {x}.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-07-07 07:25:04 UTC (rev 4810)
+++ src/init.c	2011-07-07 16:03:17 UTC (rev 4811)
@@ -1065,7 +1065,12 @@
 screen_resolution hard_resolutions[] = {
 	{640, 480, "640 x 480", TRUE},
 	{800, 600, "800 x 600", TRUE},
-	{1024, 768, "1024 x 768", TRUE}
+	{1024, 768, "1024 x 768", TRUE},
+	{1024, 768, "1024 x 768", TRUE},
+	{1152, 864, "1152 x 864", TRUE},
+	{1280, 960, "1280 x 960", TRUE},
+	{1400, 1050, "1400 x 1050", TRUE},
+	{1600, 1200, "1600 x 1200", TRUE}
 };
 
 /* -----------------------------------------------------------------


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4907
          http://freedroid.svn.sourceforge.net/freedroid/?rev=4907&view=rev
Author:   matthiaskrgr
Date:     2011-08-05 09:56:58 +0000 (Fri, 05 Aug 2011)

Log Message:
-----------
update the -r99 resolution help text. Patch by Miles.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-08-05 09:48:32 UTC (rev 4906)
+++ src/init.c	2011-08-05 09:56:58 UTC (rev 4907)
@@ -1201,8 +1201,8 @@
 						     "\tThe resolution identifier given is not a valid resolution code.\n"
 						     "\tThese codes correspond to the following hardcoded resolutions available:\n",
 						     txt,
-						     "\tAnything else will not be accepted right now, but you can send in\n"
-						     "\tyour suggestion to the FreedroidRPG dev team to enable new resolutions.\n"
+						     "\tAdditional resolutions may be specified by the form 'WxH' e.g. '800x600'\n"
+						     "\tThe in-game menu automatically detects fullscreen modes supported by your hardware.\n"
 						     "----------------------------------------------------------------------\n");
 					free(txt);
 				}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4918
          http://freedroid.svn.sourceforge.net/freedroid/?rev=4918&view=rev
Author:   matthiaskrgr
Date:     2011-08-07 12:57:06 +0000 (Sun, 07 Aug 2011)

Log Message:
-----------
game options: add fail-safe resolutions to the resolution list (fixes #414). Patch by Bryan C.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-08-07 12:53:44 UTC (rev 4917)
+++ src/init.c	2011-08-07 12:57:06 UTC (rev 4918)
@@ -1071,12 +1071,13 @@
 screen_resolution hard_resolutions[] = {
 	{640, 480, "640 x 480", TRUE},
 	{800, 600, "800 x 600", TRUE},
-	{1024, 768, "1024 x 768", TRUE},
-	{1024, 768, "1024 x 768", TRUE},
+	{1024, 768, "1024 x 768", TRUE}
+
+	/* Additional resolutions
 	{1152, 864, "1152 x 864", TRUE},
 	{1280, 960, "1280 x 960", TRUE},
 	{1400, 1050, "1400 x 1050", TRUE},
-	{1600, 1200, "1600 x 1200", TRUE}
+	{1600, 1200, "1600 x 1200", TRUE} */
 };
 
 /* -----------------------------------------------------------------
@@ -1412,23 +1413,19 @@
 static void detect_available_resolutions(void)
 {
 	SDL_Rect **modes;
-	int i;
+	screen_resolution resolution_holder;
+	int i, j, merged_size;
 	char *res[64];
 
 	// Get available fullscreen/hardware modes (reported by SDL)
 	modes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE);
-
-	// Check if our resolution is restricted
-	if (modes == NULL) {
-		// NULL means no resolutions are supported, which is fatal
-		ErrorMessage(__FUNCTION__, "SDL reports no resolutions are supported, terminating\n", PLEASE_INFORM, IS_FATAL);
-	} else if (modes == (SDL_Rect**) -1) {
+	if (modes == (SDL_Rect**) -1) {
 		ErrorMessage(__FUNCTION__,
 			"SDL reports all resolutions are supported in fullscreen mode.\n"
 			"Please use -r WIDTHxHEIGHT to specify any one you like.\n"
 			"Defaulting to a sane one for now\n", NO_NEED_TO_INFORM, IS_WARNING_ONLY);
 			screen_resolutions[0] =	(screen_resolution) {800, 600, "", TRUE};
-			screen_resolutions[1] = (screen_resolution) {-1, -1, "", FALSE};
+			i = 1;
 	} else {
 		// Add resolutions to the screen_resolutions array
 		for (i = 0; modes[i] && i < MAX_RESOLUTIONS; ++i) {
@@ -1436,8 +1433,34 @@
 			sprintf(res[i], "%d x %d", modes[i]->w, modes[i]->h);
 			screen_resolutions[i] = (screen_resolution) {modes[i]->w, modes[i]->h, res[i], TRUE};
 		}
-		screen_resolutions[i] = (screen_resolution) {-1, -1, "", FALSE};
 	}
+
+	// Add hard-coded resolutions to the list
+	for (j = 0; j < sizeof(hard_resolutions) / sizeof(hard_resolutions[0]) && i + j < MAX_RESOLUTIONS; j++) {
+		screen_resolutions[i + j] = hard_resolutions[j];
+	}
+
+	// Sort and prune duplicates
+	merged_size = i + min(sizeof(hard_resolutions) / sizeof(hard_resolutions[0]), j);
+	for (i = 0; i < merged_size; i++) {
+		for (j = 0; j < merged_size - 1; j++) {
+			// Sort in descending order of xres, then yres
+			if (screen_resolutions[j].xres < screen_resolutions[j + 1].xres ||
+					(screen_resolutions[j].xres == screen_resolutions[j + 1].xres &&
+					screen_resolutions[j].yres < screen_resolutions[j +1].yres)) {
+				resolution_holder = screen_resolutions[j + 1];
+				screen_resolutions[j + 1] = screen_resolutions[j];
+				screen_resolutions[j] = resolution_holder;
+
+			// If it's a duplicate we'll set it to a terminator entry and it will be sorted to the end				
+			} else if (screen_resolutions[j].xres == screen_resolutions[j + 1].xres &&
+					screen_resolutions[j].yres == screen_resolutions[j + 1].yres)
+				screen_resolutions[j + 1] = (screen_resolution) {-1, -1, "", FALSE};
+		}
+	}
+
+	// Add our terminator on the end, just in case
+	screen_resolutions[i - 1] = (screen_resolution) {-1, -1, "", FALSE};
 };
 
 /* -----------------------------------------------------------------


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4961
          http://freedroid.svn.sourceforge.net/freedroid/?rev=4961&view=rev
Author:   matthiaskrgr
Date:     2011-08-16 15:37:29 +0000 (Tue, 16 Aug 2011)

Log Message:
-----------
re-implement -r[3-6] command argument resolutions.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-08-16 15:33:41 UTC (rev 4960)
+++ src/init.c	2011-08-16 15:37:29 UTC (rev 4961)
@@ -1068,13 +1068,11 @@
 screen_resolution hard_resolutions[] = {
 	{640, 480, "640 x 480", TRUE},
 	{800, 600, "800 x 600", TRUE},
-	{1024, 768, "1024 x 768", TRUE}
-
-	/* Additional resolutions
+	{1024, 768, "1024 x 768", TRUE},
 	{1152, 864, "1152 x 864", TRUE},
 	{1280, 960, "1280 x 960", TRUE},
 	{1400, 1050, "1400 x 1050", TRUE},
-	{1600, 1200, "1600 x 1200", TRUE} */
+	{1600, 1200, "1600 x 1200", TRUE}
 };
 
 /* -----------------------------------------------------------------


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4975
          http://freedroid.svn.sourceforge.net/freedroid/?rev=4975&view=rev
Author:   matthiaskrgr
Date:     2011-08-19 14:44:47 +0000 (Fri, 19 Aug 2011)

Log Message:
-----------
editor: show all floor layers in the default game configuration. Patch by Jozef Kucia.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-08-19 14:41:09 UTC (rev 4974)
+++ src/init.c	2011-08-19 14:44:47 UTC (rev 4975)
@@ -1351,6 +1351,7 @@
 	GameConfig.lazyload = 1;
 	GameConfig.show_item_labels = 0;
 	GameConfig.last_edited_level = -1;
+	GameConfig.show_all_floor_layers = 1;
 	GameConfig.screen_width = 800;
 	GameConfig.screen_height = 600;
 	GameConfig.fullscreen_on = FALSE;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5048
          http://freedroid.svn.sourceforge.net/freedroid/?rev=5048&view=rev
Author:   fluzz
Date:     2011-10-05 07:24:13 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
Initialize 'next time screen size' to the default screen size.

If the game is aborted due to a "fatal" error, the current game configuration
is saved, and the saved screen size is set to 'next_time screen size.
If for any reason, the game aborts during the very first loading steps, then
the current game configuration is the default one (defined in
ResetGameConfigToDefaultValues()).
The default 'next_time screen size' was not set, thus leading to a (0, 0)
screen size being saved.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-10-03 07:26:27 UTC (rev 5047)
+++ src/init.c	2011-10-05 07:24:13 UTC (rev 5048)
@@ -1351,6 +1351,8 @@
 	GameConfig.show_all_floor_layers = 1;
 	GameConfig.screen_width = DEFAULT_SCREEN_WIDTH;
 	GameConfig.screen_height = DEFAULT_SCREEN_HEIGHT;
+	GameConfig.next_time_width_of_screen = GameConfig.screen_width;
+	GameConfig.next_time_height_of_screen = GameConfig.screen_height;
 	GameConfig.fullscreen_on = FALSE;
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5049
          http://freedroid.svn.sourceforge.net/freedroid/?rev=5049&view=rev
Author:   fluzz
Date:     2011-10-05 07:33:38 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
Load game configuration file before to initialize SDL.

The OpenGL context has to be initialized before to call any OpenGL drawing
primitive. To initialize the OpenGL context, we first need to call SDL_SetVideoMode(),
which needs to know the screen size to use. The screen size is defined in the
config file.
When loading the configuration file, an error can be detected, and ErrorMessage()
is then called to report it. When the game is run in OpenGL mode, ErrorMessage()
calls some OpenGL drawing primitives.
The OpenGL context being not yet initialized at that time, the game crashes...

In ErrorMessage(), we already check if SDL is initialized, and if not we do
not call OpenGL drawing primitives.
So, loading the configuration file *before* to initialize SDL fixes the issue.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-10-05 07:24:13 UTC (rev 5048)
+++ src/init.c	2011-10-05 07:33:38 UTC (rev 5049)
@@ -1526,6 +1526,8 @@
 	input_set_default();
 	init_lua();
 
+	LoadGameConfig();
+
 	if (SDL_Init(SDL_INIT_VIDEO) == -1)
 		ErrorMessage(__FUNCTION__, "Couldn't initialize SDL: %s\n", PLEASE_INFORM, IS_FATAL,  SDL_GetError());
 	// So the video library could be initialized.  So it should also be
@@ -1534,8 +1536,6 @@
 
 	detect_available_resolutions();
 
-	LoadGameConfig();
-
 	ParseCommandLine(argc, argv);
 
 	LightRadiusInit();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5091
          http://freedroid.svn.sourceforge.net/freedroid/?rev=5091&view=rev
Author:   matthiaskrgr
Date:     2011-10-31 07:38:06 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
don't show the  end of game  text when the game is won. Patch by Bryan C.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-10-30 22:34:56 UTC (rev 5090)
+++ src/init.c	2011-10-31 07:38:06 UTC (rev 5091)
@@ -1686,7 +1686,7 @@
 
 	// Now it's time for the end game title file...
 	//
-	PlayATitleFile("EndOfGame.title");
+	//PlayATitleFile("EndOfGame.title");
 
 	PlayATitleFile("Credits.title");
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5096
          http://freedroid.svn.sourceforge.net/freedroid/?rev=5096&view=rev
Author:   ahuillet
Date:     2011-11-01 09:29:03 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
Continue drawing grenades after game won/lost. Patch by Miles.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-11-01 09:28:53 UTC (rev 5095)
+++ src/init.c	2011-11-01 09:29:03 UTC (rev 5096)
@@ -1633,6 +1633,7 @@
 		show_texts_and_banner();
 		animate_blasts();
 		MoveBullets();
+		MoveActiveSpells();
 		move_enemies();
 		animate_obstacles();
 		UpdateCountersForThisFrame();
@@ -1674,6 +1675,7 @@
 		show_texts_and_banner();
 		animate_blasts();
 		MoveBullets();
+		MoveActiveSpells();
 		move_enemies();
 		animate_obstacles();
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5156
          http://freedroid.svn.sourceforge.net/freedroid/?rev=5156&view=rev
Author:   matthiaskrgr
Date:     2011-11-18 11:37:49 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
remove floating point exception special handling. Patch by Catalin Badea.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-11-17 14:25:53 UTC (rev 5155)
+++ src/init.c	2011-11-18 11:37:49 UTC (rev 5156)
@@ -38,12 +38,6 @@
 #include "proto.h"
 #include "widgets/widgets.h"
 
-#ifdef __OpenBSD__
-#include "ieeefp.h"
-#else
-#include "fenv.h"
-#endif
-
 #include "getopt.h"
 
 void Init_Game_Data(void);
@@ -60,29 +54,6 @@
 } difficulty_parameters[3];
 
 /**
- * The following function is NOT 'standard' C but rather a GNU extension
- * to the C standards.  We *DON'T* want to use such things, but in this
- * case it helps debugging purposes of floating point operations just so
- * much, that it's really worth using it (in development versions, not in
- * releases).  But to avoid warnings from GCC (which we always set to not
- * allow gnu extensions to the C standard by default), we declare the
- * prototype of this function here.  If you don't use GCC or this 
- * function should give you portability problems, it's ABSOLUTELY SAFE
- * to just remove all instances of it, since it really only helps 
- * debugging.  Proper documentation can be found in the GNU C Library,
- * section about 'Arithmethic', subsection on floating point control
- * functions.
- */
-#if ! defined __gnu_linux__
-/* turn off these functions where they are not present */
-#define feenableexcept(X) {}
-#define fedisableexcept(X) {}
-#else
-extern int feenableexcept(int excepts);
-extern int fedisableexcept(int TheExceptionFlags);
-#endif
-
-/**
  *
  *
  */
@@ -1350,33 +1321,11 @@
 }
 
 /** 
- * Set signal handlers for SIGSEGV, SIGFPE, and enable floating point exceptions.
+ * Set signal handlers for SIGSEGV and SIGFPE.
  */
 static void set_signal_handlers(void)
 {
-
-
 #ifndef __WIN32__
-
-	// Let's see if we're dealing with a real release or rather if
-	// we're dealing with a svn version.  The difference is this:
-	// Releases shouldn't terminate upon a floating point exception
-	// while the current svn code (for better debugging) should
-	// do so.  Therefore we check for 'svn' in the current version
-	// string and enable/disable the exceptions accordingly...
-	if (strstr(VERSION, "svn")) {
-		DebugPrintf(-4, "\nThis seems to be a development version, so we'll exit on floating point exceptions.");
-		// feenableexcept ( FE_ALL_EXCEPT );
-		// feenableexcept ( FE_INEXACT ) ;
-		// feenableexcept ( FE_UNDERFLOW ) ;
-		// feenableexcept ( FE_OVERFLOW ) ;
-		feenableexcept(FE_INVALID);
-		feenableexcept(FE_DIVBYZERO);
-	} else {
-		DebugPrintf(-4, "\nThis seems to be a 'stable' release, so no exit on floating point exceptions.");
-		fedisableexcept(FE_INVALID);
-		fedisableexcept(FE_DIVBYZERO);
-	}
 #ifndef __APPLE_CC__
 
 	struct sigaction action;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5203
          http://freedroid.svn.sourceforge.net/freedroid/?rev=5203&view=rev
Author:   ahuillet
Date:     2011-11-23 20:48:59 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Shorten "this is a RC please report bugs" message for readability + vertical cutoff problem at low resolutions.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-11-23 19:23:47 UTC (rev 5202)
+++ src/init.c	2011-11-23 20:48:59 UTC (rev 5203)
@@ -1523,7 +1523,7 @@
 
 	next_startup_percentage(100);
 	if (strstr(VERSION, "rc"))
-		alert_window("%s", _("You are playing a Release Candidate.\nStrange bugs might still be present in the game.\nPlease report any issues you find to either of:\n\n#freedroid at irc.freenode.net\nfreedroid-discussion AT lists.sourceforge.net\nhttps://sourceforge.net/apps/phpbb/freedroid\n\nor directly to the bugtracker at http://bugs.freedroid.org\nThank you for helping us test the game.\n\nGood luck!\n"));
+		alert_window("%s", _("You are playing a Release Candidate.\nStrange bugs may still be present in the game.\nPlease report any issues you find to our bugtracker at http://bugs.freedroid.org/\nThank you for helping us test the game.\n\nGood luck!\n"));
 
 };				// void InitFreedroid ( void ) 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5211
          http://freedroid.svn.sourceforge.net/freedroid/?rev=5211&view=rev
Author:   matthiaskrgr
Date:     2011-11-29 16:52:00 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
set difficulty level to NORMAL when resetting the game config (fixes #545). Patch by J?\195?\179zef Kucia.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-11-27 21:37:07 UTC (rev 5210)
+++ src/init.c	2011-11-29 16:52:00 UTC (rev 5211)
@@ -1319,6 +1319,7 @@
 	GameConfig.next_time_width_of_screen = GameConfig.screen_width;
 	GameConfig.next_time_height_of_screen = GameConfig.screen_height;
 	GameConfig.fullscreen_on = FALSE;
+	GameConfig.difficulty_level = DIFFICULTY_NORMAL;
 }
 
 /** 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5302
          http://freedroid.svn.sourceforge.net/freedroid/?rev=5302&view=rev
Author:   matthiaskrgr
Date:     2011-12-25 22:13:17 +0000 (Sun, 25 Dec 2011)
Log Message:
-----------
delay the calculations based on the screen resolution to the moment when the video mode is initialized. Patch by Jozef Kucia.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-12-25 21:50:52 UTC (rev 5301)
+++ src/init.c	2011-12-25 22:13:17 UTC (rev 5302)
@@ -1513,18 +1513,18 @@
 
 	LightRadiusInit();
 
-	// Adapt button positions for the current screen resolution.  (Note: At this
-	// point the command line has been evaluated already, therefore we know if OpenGL
-	// is used or not and also which screen resolution to use.
+	init_timer();
+
+	InitVideo();
+
+	// Adapt button positions for the current screen resolution. Note: At this
+	// point the video mode was already initialized, therefore we know if OpenGL
+	// is used or not and also which screen resolution is used.
 	//
 	adapt_button_positions_to_screen_resolution();
 
 	Copy_Rect(Full_User_Rect, User_Rect);
 
-	init_timer();
-
-	InitVideo();
-
 	next_startup_percentage(0);
 
 	init_keyboard_input_array();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5303
          http://freedroid.svn.sourceforge.net/freedroid/?rev=5303&view=rev
Author:   matthiaskrgr
Date:     2011-12-25 22:13:28 +0000 (Sun, 25 Dec 2011)
Log Message:
-----------
Do not insert the hardcoded screen resolutions in the screen resolutions menu. Patch by Jozef Kucia.

Modified Paths:
--------------
    src/init.c

Modified: src/init.c
===================================================================
--- src/init.c	2011-12-25 22:13:17 UTC (rev 5302)
+++ src/init.c	2011-12-25 22:13:28 UTC (rev 5303)
@@ -1354,7 +1354,7 @@
 {
 	SDL_Rect **modes;
 	screen_resolution resolution_holder;
-	int i, j, merged_size;
+	int i, j, size;
 	char *res[64];
 
 	// Get available fullscreen/hardware modes (reported by SDL)
@@ -1375,15 +1375,10 @@
 		}
 	}
 
-	// Add hard-coded resolutions to the list
-	for (j = 0; j < sizeof(hard_resolutions) / sizeof(hard_resolutions[0]) && i + j < MAX_RESOLUTIONS; j++) {
-		screen_resolutions[i + j] = hard_resolutions[j];
-	}
-
-	// Sort and prune duplicates
-	merged_size = i + min(sizeof(hard_resolutions) / sizeof(hard_resolutions[0]), j);
-	for (i = 0; i < merged_size; i++) {
-		for (j = 0; j < merged_size - 1; j++) {
+	// Sort
+	size = i;
+	for (i = 0; i < size; i++) {
+		for (j = 0; j < size - 1; j++) {
 			// Sort in descending order of xres, then yres
 			if (screen_resolutions[j].xres < screen_resolutions[j + 1].xres ||
 					(screen_resolutions[j].xres == screen_resolutions[j + 1].xres &&
@@ -1391,17 +1386,13 @@
 				resolution_holder = screen_resolutions[j + 1];
 				screen_resolutions[j + 1] = screen_resolutions[j];
 				screen_resolutions[j] = resolution_holder;
-
-			// If it's a duplicate we'll set it to a terminator entry and it will be sorted to the end				
-			} else if (screen_resolutions[j].xres == screen_resolutions[j + 1].xres &&
-					screen_resolutions[j].yres == screen_resolutions[j + 1].yres)
-				screen_resolutions[j + 1] = (screen_resolution) {-1, -1, "", FALSE};
+			}
 		}
 	}
 
 	// Add our terminator on the end, just in case
 	screen_resolutions[i - 1] = (screen_resolution) {-1, -1, "", FALSE};
-};
+}
 
 /* -----------------------------------------------------------------
  * This function initializes the whole FreedroidRPG game.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.