Armagetron Advanced

Revision: 7373
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7373&view=rev
Author:   z-man
Date:     2007-11-11 15:50:44 -0800 (Sun, 11 Nov 2007)

Log Message:
-----------
Whoops, fixed server compilation.

Modified Paths:
--------------
    armagetronad/branches/0.2.8/armagetronad/src/render/rScreen.cpp

Modified: armagetronad/branches/0.2.8/armagetronad/src/render/rScreen.cpp
===================================================================
--- armagetronad/branches/0.2.8/armagetronad/src/render/rScreen.cpp	2007-11-11 23:38:54 UTC (rev 7372)
+++ armagetronad/branches/0.2.8/armagetronad/src/render/rScreen.cpp	2007-11-11 23:50:44 UTC (rev 7373)
@@ -20,7 +20,7 @@
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-  
+
 ***************************************************************************
 
 */
@@ -117,12 +117,16 @@
 
 bool sr_DesktopScreensizeSupported()
 {
+#ifndef DEDICATED
     SDL_version const & sdlVersion = *SDL_Linked_Version();
 
-    return 
+    return
     sdlVersion.major > 1 || sdlVersion.major == 1 &&
     ( sdlVersion.minor > 2 || sdlVersion.minor == 2 &&
       ( sdlVersion.patch >= 10 ) );
+#else
+    return false;
+#endif
 }
 
 static int failed_attempts = 0;
@@ -540,9 +544,9 @@
             // select sane defaults in case the following operation fails
             sr_desktopWidth = 640;
             sr_desktopHeight = 480;
-            
+
             if ( sr_DesktopScreensizeSupported() )
-            { 
+            {
                 sr_screen=SDL_SetVideoMode( 0, 0, CD, attrib );
                 if ( sr_screen )
                 {
@@ -582,12 +586,12 @@
                 				sr_ExitDisplay();
 
                 				if ( (sr_screen=SDL_SetVideoMode
-                					  (sr_screenWidth, sr_screenHeight,   CD, 
+                					  (sr_screenWidth, sr_screenHeight,   CD,
                 					   attrib))
                 					 == NULL)
                 				{
                 					if((sr_screen=SDL_SetVideoMode
-                						(sr_screenWidth, sr_screenHeight,    CD, 
+                						(sr_screenWidth, sr_screenHeight,    CD,
                 						 attrib^SDL_FULLSCREEN))==NULL )
                 					{
                 						lastError.Clear();


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

Revision: 7410
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7410&view=rev
Author:   z-man
Date:     2007-12-14 09:13:25 -0800 (Fri, 14 Dec 2007)

Log Message:
-----------
Calling PumpEvents() while waiting for application to receive focus; only that way, it actually gets noticed.

Modified Paths:
--------------
    armagetronad/branches/0.2.8/armagetronad/src/render/rScreen.cpp

Modified: armagetronad/branches/0.2.8/armagetronad/src/render/rScreen.cpp
===================================================================
--- armagetronad/branches/0.2.8/armagetronad/src/render/rScreen.cpp	2007-12-13 16:59:35 UTC (rev 7409)
+++ armagetronad/branches/0.2.8/armagetronad/src/render/rScreen.cpp	2007-12-14 17:13:25 UTC (rev 7410)
@@ -707,7 +707,10 @@
 
     // wait for activation if we were ALT-Tabbed away:
     while ( (SDL_GetAppState() & SDL_APPACTIVE) == 0)
+    {
         SDL_Delay(100);
+        SDL_PumpEvents();
+    }
 
     if (software_renderer && !last_software_renderer)
         sr_LoadDefaultConfig();
@@ -717,7 +720,10 @@
 
     // wait for activation if we were ALT-Tabbed away:
     while ( (SDL_GetAppState() & SDL_APPACTIVE) == 0)
+    {
         SDL_Delay(100);
+        SDL_PumpEvents();
+    }
 
     sr_ResetRenderState(true);
 


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

Revision: 7814
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7814&view=rev
Author:   z-man
Date:     2008-02-08 14:40:46 -0800 (Fri, 08 Feb 2008)

Log Message:
-----------
Made resolution definition fixed size to avoid errors (there appeared to be one overwrite erorr on OSX already).

Modified Paths:
--------------
    armagetronad/branches/0.2.8/armagetronad/src/render/rScreen.cpp

Modified: armagetronad/branches/0.2.8/armagetronad/src/render/rScreen.cpp
===================================================================
--- armagetronad/branches/0.2.8/armagetronad/src/render/rScreen.cpp	2008-02-08 18:45:41 UTC (rev 7813)
+++ armagetronad/branches/0.2.8/armagetronad/src/render/rScreen.cpp	2008-02-08 22:40:46 UTC (rev 7814)
@@ -72,9 +72,9 @@
 bool sr_ZTrick=false;
 bool sr_useDisplayLists=false;
 
-static int width[]={0,320	,320,400,512,640,800,1024	,1280, 	1280 ,1280	,1600	,1680 ,2048	,800,320};
-static int height[]={0,200,240,300,384,480,600,768	,800, 	854  ,1024	,1200	,1050 ,1572	,600,200};
-static REAL aspect[]={1	,1	,1	,1	,1	,1    ,1	,1	,1    ,1	,1		,1,1	,1};
+static int width[ArmageTron_Custom+2]  = {0, 320, 320, 400, 512, 640, 800, 1024	, 1280, 1280, 1280, 1600, 1680, 2048,800,320};
+static int height[ArmageTron_Custom+2] = {0, 200, 240, 300, 384, 480, 600,  768	,  800,  854, 1024, 1200, 1050, 1572,600,200};
+static REAL aspect[ArmageTron_Custom+2]= {1, 1	, 1  , 1  , 1  , 1  , 1	 , 1	,    1,    1, 1   ,    1,    1,    1,1,  1};
 
 int sr_screenWidth,sr_screenHeight;
 
@@ -222,7 +222,7 @@
 // *******************************************************************************************
 
 rScreenSize::rScreenSize( rResolution r )
-        :res( r )
+        :res( r ), width(0), height(0)
 {
     UpdateSize();
 }


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