]> git.jsancho.org Git - lugaru.git/commitdiff
Adjust source code formatting
authorCôme BERNIGAUD <come.bernigaud@gmail.com>
Sat, 5 Jun 2010 20:51:18 +0000 (00:51 +0400)
committerCôme BERNIGAUD <come.bernigaud@gmail.com>
Sat, 5 Jun 2010 20:51:18 +0000 (00:51 +0400)
---
 Source/GameDraw.cpp       |    4 ++--
 Source/GameTick.cpp       |   24 ++++++++++--------------
 Source/Globals.cpp        |    2 +-
 Source/OpenGL_Windows.cpp |    6 +++---
 4 files changed, 16 insertions(+), 20 deletions(-)

Source/GameDraw.cpp
Source/GameTick.cpp
Source/Globals.cpp
Source/OpenGL_Windows.cpp

index 58142f313de0a027825fdc0d2b7e9d401ad2aadc..349492e3c4d1892ffd8fd846d2a640d98e5e0655 100644 (file)
@@ -3575,7 +3575,8 @@ int Game::DrawGLScene(StereoSide side)
                                                                                        //if(1-((float)i)/10-(1-selectedlong[j])>0){
                                                                                        glMatrixMode(GL_MODELVIEW);                                                     // Select The Modelview Matrix
                                                                                        glPushMatrix();
-                                                                                               if(mainmenu!=7||j!=0||!entername)text.glPrint(startx[j],starty[j],menustring[j],0,1,640,480);
+                                                                                               if(mainmenu!=7||j!=0||!entername)
+                                                                                                       text.glPrint(startx[j],starty[j],menustring[j],0,1,640,480);
                                                                                                else
                                                                                                {
                                                                                                        if(displayblink){
@@ -3914,7 +3915,6 @@ int Game::DrawGLScene(StereoSide side)
                multiplier=0;
        }
 
-
        //glFlush();
        if ( side == stereoRight || side == stereoCenter ) {
                if(drawmode!=motionblurmode||mainmenu){
index 155ee8ad7edc4c39b8b70af8ad511d5c7acd9e78..909c5033bfe0a31a7997f2ff55ef6e0cc4547b3c 100644 (file)
@@ -46,7 +46,7 @@ extern XYZ viewer;
 extern int environment;
 extern float texscale;
 extern Terrain terrain;
-extern OPENAL_SAMPLE   *samp[100];
+extern OPENAL_SAMPLE *samp[100];
 extern int channels[100];
 extern Sprites sprites;
 extern int kTextureSize;
@@ -829,23 +829,21 @@ static void ch_notindemo(Game *game, const char *args)
 static void ch_type(Game *game, const char *args)
 {
   int i, n = sizeof(editortypenames) / sizeof(editortypenames[0]);
-  for (i = 0; i < n; i++)
-    if (stripfx(args, editortypenames[i]))
-      {
-       editoractive = i;
-       break;
-      }
+       for (i = 0; i < n; i++)
+               if (stripfx(args, editortypenames[i])) {
+                       editoractive = i;
+                       break;
+               }
 }
 
 static void ch_path(Game *game, const char *args)
 {
   int i, n = sizeof(pathtypenames) / sizeof(pathtypenames[0]);
   for (i = 0; i < n; i++)
-    if (stripfx(args, pathtypenames[i]))
-      {
-       editorpathtype = i;
-       break;
-      }
+    if (stripfx(args, pathtypenames[i])) {
+               editorpathtype = i;
+               break;
+    }
 }
 
 static void ch_hs(Game *game, const char *args)
@@ -1195,8 +1193,6 @@ static void cmd_dispatch(Game *game, const char *cmd)
     }
 }
 
-
-
 /********************> Tick() <*****/
 extern void ScreenShot(const char * fname);
 void Screenshot        (void)
index eae0bd07f0590fbda565f78b41bd0c97c2a3068e..6c59eb28b75d06684f52f7e0a908ce472a7016b3 100644 (file)
@@ -272,4 +272,4 @@ bool gamestarted = 0;
 StereoMode stereomode =  stereoNone;
 StereoMode newstereomode = stereoNone;
 float stereoseparation = 0.05;
-bool  stereoreverse = false;
\ No newline at end of file
+bool  stereoreverse = false;
index 618ef4742d4218bfbb9ff5571775816b46fd8c7b..84e9812018289bbbc2242c1af9bade57cc9ce179 100644 (file)
@@ -796,9 +796,9 @@ void DoFrameRate (int update)
                deltaTime /= 1000.0;
 
        multiplier=deltaTime;
-       if(multiplier<.001)multiplier=.001;
-       if(multiplier>10)multiplier=10;
-       if(update)frametime = currTime; // reset for next time interval
+       if(multiplier<.001) multiplier=.001;
+       if(multiplier>10) multiplier=10;
+       if(update) frametime = currTime;        // reset for next time interval
 
        deltaTime = (float) AbsoluteDeltaToDuration (currTime, time);