shithub: rott

Info  •  Files  •  Log  •  Branches

cleaning up some stuff before merge with master

--- a/rott/rt_draw.c

+++ b/rott/rt_draw.c

@@ -3372,12 +3372,12 @@

     DisableScreenStretch();

     //STUB_FUNCTION;

-    printf("ROTATE SCREEN FLOAT FUNC: \n");

-    printf("startAngle: %f \n", startAngle);

-    printf("endAngle: %f \n", endAngle);

-    printf("startScale: %f \n", startScale);

-    printf("endScale: %f \n", endScale);

-    printf("time: %d \n", time);

+    //printf("ROTATE SCREEN FLOAT FUNC: \n");

+    //printf("startAngle: %f \n", startAngle);

+    //printf("endAngle: %f \n", endAngle);

+    //printf("startScale: %f \n", startScale);

+    //printf("endScale: %f \n", endScale);

+    //printf("time: %d \n", time);

     float angle = startAngle;

@@ -3387,8 +3387,8 @@

     float anglestep = (endAngle - startAngle)/(time);

-    printf("anglestep: %f \n", anglestep);

-    printf("scalestep: %f \n", scalestep);

+    //printf("anglestep: %f \n", anglestep);

+    //printf("scalestep: %f \n", scalestep);

     //printf("startingScale: %f \n", scale);

     CalcTics();

--- a/rott/rt_game.c

+++ b/rott/rt_game.c

@@ -4676,13 +4676,10 @@

         int rng;

         rng = RandomNumber ("Died",0);

-                

-        //rng = 63;

         //zooms in on screen

         if (pstate->falling==true)

         {

-            //printf("doing death 0 rotate \n");

             //RotateBuffer (0, 0, (FINEANGLES), (FINEANGLES>>6), (VBLCOUNTER*(1+slowrate)));

             //RotateScreen (0, 0, (FINEANGLES), (FINEANGLES>>6), (VBLCOUNTER*(1+slowrate)), 1, true);

             RotateScreenScaleFloat(0, 0, 1.0, 64.0, (VBLCOUNTER*(1+slowrate)), true, false);

@@ -4693,7 +4690,6 @@

         //zooms out w/o spinning

         else if (rng < 64)

         {

-            //printf("doing death 1 rotate \n");

             //RotateBuffer (0, 0, (FINEANGLES>>6), (FINEANGLES), (VBLCOUNTER*(2+slowrate)));

             //RotateScreen (0, 0, (FINEANGLES), (FINEANGLES*64), (VBLCOUNTER*(2+slowrate)), 2, true);

             RotateScreenScaleFloat(0, 0, 1.0, 0.01875, (VBLCOUNTER*(2+slowrate)), true, false);

@@ -4702,7 +4698,6 @@

         //zooms in on screen

         else if (rng < 128)

         {

-            //printf("doing death 2 rotate \n");

             //RotateBuffer (0, 0, (FINEANGLES), (FINEANGLES>>6), (VBLCOUNTER*(1+slowrate)));

             //RotateScreen(0, 0, (FINEANGLES), (FINEANGLES>>6), (VBLCOUNTER*(1+slowrate)), 1, true);

             RotateScreenScaleFloat(0, 0, 1.0, 64.0, (VBLCOUNTER*(1+slowrate)), true, false);

@@ -4711,7 +4706,6 @@

         //zooms out with spinning

         else if (rng < 192)

         {

-            //printf("doing death 3 rotate \n");

             //RotateBuffer(0, (FINEANGLES*4), (FINEANGLES), (FINEANGLES*64), (VBLCOUNTER*(3+slowrate)));

             RotateScreenScaleFloat(0, (360.0*3), 1.0, 0.01875, (VBLCOUNTER*(3+slowrate)), true, false);

         }

@@ -4748,22 +4742,18 @@

         //rng = 63;

         if (rng<64)

         {

-            //printf("GAME OVER SEQUENCE 1 \n");

             //RotateBuffer(0,(FINEANGLES>>1),(FINEANGLES),(FINEANGLES*64),(VBLCOUNTER*(3+slowrate)));

-            //RotateScreen(0,(FINEANGLES>>1),(FINEANGLES),(FINEANGLES*64),(VBLCOUNTER*(3+slowrate)), 2, true);

-            

+            //RotateScreen(0,(FINEANGLES>>1),(FINEANGLES),(FINEANGLES*64),(VBLCOUNTER*(3+slowrate)), 2, true);    

             RotateScreenScaleFloat(0, 360, 1.0, 0.01875, (VBLCOUNTER*(3+slowrate)), true, false);

         }

         else if (rng<128)

         {

-            //printf("GAME OVER SEQUENCE 2 \n");

             VL_FadeToColor (VBLCOUNTER*3, 255, 255, 255);

             VL_FadeOut (0, 255, 0,0,0,VBLCOUNTER>>1);

         }

         else if (rng<192)

         {

-            //printf("GAME OVER SEQUENCE 3 \n");

             //RotateBuffer(0,(FINEANGLES*2),(FINEANGLES),(FINEANGLES*64),(VBLCOUNTER*(3+slowrate)));

             //RotateScreen(0,(FINEANGLES*2),(FINEANGLES),(FINEANGLES*64),(VBLCOUNTER*(3+slowrate)), 2, true);

             RotateScreenScaleFloat(0, 360*2, 1.0, 0.01875, (VBLCOUNTER*(3+slowrate)), true, false);

@@ -4770,7 +4760,6 @@

         }

         else

         {

-            //printf("GAME OVER SEQUENCE 4 \n");

             //RotateBuffer(0,(FINEANGLES*2),(FINEANGLES),(FINEANGLES*64),(VBLCOUNTER*(3+slowrate)));

             //RotateScreen(0,(FINEANGLES*2),(FINEANGLES),(FINEANGLES*64),(VBLCOUNTER*(3+slowrate)), 2, true);

             RotateScreenScaleFloat(0, 360*2, 1.0, 0.01875, (VBLCOUNTER*(3+slowrate)), true, false);