shithub: choc

Info  •  Files  •  Log  •  Branches

+ Updating pagetics in D_DoAdvanceDemo to ticrates

Subversion-branch: /branches/strife-branch
Subversion-revision: 2078

--- a/src/strife/d_main.c

+++ b/src/strife/d_main.c

@@ -578,6 +578,7 @@

     paused = false;

     gameaction = ga_nothing;

+    // villsa 09/12/10: [STRIFE] converted pagetics to ticrate

     switch (demosequence)

     {

     case -5: // exit the game

@@ -585,7 +586,7 @@

         return;

     case -4: // show exit screen

         menuactive = false;

-        pagetic = 105;

+        pagetic = (3*TICRATE);

         gamestate = GS_DEMOSCREEN;

         pagename = DEH_String("PANEL7");

         S_StartMusic(mus_fast);

@@ -595,13 +596,13 @@

             demosequence = -5; // exit

         return;

     case -3: // show Velocity logo for demo version

-        pagetic = 210;

+        pagetic = (6*TICRATE);

         gamestate = GS_DEMOSCREEN;

         pagename = DEH_String("vellogo");

         demosequence = -5; // exit

         return;

     case -2: // title screen

-        pagetic = 210;

+        pagetic = (6*TICRATE);

         gamestate = GS_DEMOSCREEN;

         pagename = DEH_String("TITLEPIC");

         S_StartMusic(mus_logo);

@@ -615,13 +616,13 @@

         wipegamestate = -1;

         break;

     case 0: // Rogue logo

-        pagetic = 140;

+        pagetic = (4*TICRATE);

         gamestate = GS_DEMOSCREEN;

         pagename = DEH_String("RGELOGO");

         wipegamestate = -1;

         break;

     case 1:

-        pagetic = 245;                    // The comet struck our planet without

+        pagetic = (7*TICRATE);            // The comet struck our planet without

         gamestate = GS_DEMOSCREEN;        // warning.We lost our paradise in a 

         pagename = DEH_String("PANEL1");  // single, violent stroke.

         I_StartVoice(DEH_String("pro1")); 

@@ -628,37 +629,37 @@

         S_StartMusic(mus_intro);

         break;

     case 2:

-        pagetic = 315;                    // The impact released a virus which 

+        pagetic = (9*TICRATE);            // The impact released a virus which 

         gamestate = GS_DEMOSCREEN;        // swept through the land and killed 

         pagename = DEH_String("PANEL2");  // millions. They turned out to be 

         I_StartVoice(DEH_String("pro2")); // the lucky ones...

         break;

     case 3:

-        pagetic = 420;                    // For those that did not die became 

+        pagetic = (12*TICRATE);           // For those that did not die became 

         gamestate = GS_DEMOSCREEN;        // mutations of humanity. Some became

         pagename = DEH_String("PANEL3");  // fanatics who heard the voice of a

         I_StartVoice(DEH_String("pro3")); // malignant God in their heads, and 

         break;                            // called themselves the Order.

     case 4:

-        pagetic = 385;                    // Those of us who were deaf to this

+        pagetic = (11*TICRATE);           // Those of us who were deaf to this

         pagename = DEH_String("PANEL4");  // voice suffer horribly and are 

         gamestate = GS_DEMOSCREEN;        // forced to serve these ruthless

         I_StartVoice(DEH_String("pro4")); // psychotics, who wield weapons more

         break;                            // powerful than anything we can muster.

     case 5:

-        pagetic = 350;                    // They destroy our women and children,

+        pagetic = (10*TICRATE);           // They destroy our women and children,

         gamestate = GS_DEMOSCREEN;        // so that we must hide them underground,

         pagename = DEH_String("PANEL5");  // and live like animals in constant

         I_StartVoice(DEH_String("pro5")); // fear for our lives.

         break;

     case 6:                               // But there are whispers of discontent.

-        pagetic = 560;                    // If we organize, can we defeat our

+        pagetic = (16*TICRATE);           // If we organize, can we defeat our

         gamestate = GS_DEMOSCREEN;        // masters? Weapons are being stolen,

         pagename = DEH_String("PANEL6");  // soldiers are being trained. A 

         I_StartVoice(DEH_String("pro6")); // Movement is born! Born of lifelong 

         break;                            // STRIFE!

     case 7: // titlepic again - unused...

-        pagetic = 315;

+        pagetic = (9*TICRATE);

         gamestate = GS_DEMOSCREEN;

         pagename = DEH_String("TITLEPIC");

         wipegamestate = -1;

@@ -665,11 +666,11 @@

         break;

     case 8: // demo

         //ClearTmp();  STRIFE-TODO

-        pagetic = 315;

+        pagetic = (9*TICRATE);

         G_DeferedPlayDemo(DEH_String("demo1"));

         break;

     case 9: // velocity logo? - unused...

-        pagetic = 210;

+        pagetic = (6*TICRATE);

         gamestate = GS_DEMOSCREEN;

         pagename = DEH_String("vellogo");

         wipegamestate = -1;

@@ -676,7 +677,7 @@

         break;

     case 10: // credits

         gamestate = GS_DEMOSCREEN;

-        pagetic = 420;

+        pagetic = (12*TICRATE);

         pagename = DEH_String("CREDIT");

         wipegamestate = -1;

         break;