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.
|