git-svn-id: https://svn.eduke32.com/eduke32@308 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/build/src/mdsprite.c

@@ -198,6 +198,8 @@ mdmodel *mdload (const char *);
 int mddraw (spritetype *);
 void mdfree (mdmodel *);
 
+extern int timerticspersec;
+
 static void freeallmodels ()
 {
     int i;
@@ -839,14 +841,13 @@ if (!anim) { m->interpol = 0; return; }
         return;
     }
 
-    i = (mdtims-spriteext[tspr->owner].mdanimtims)*anim->fpssc;
+    i = (mdtims-spriteext[tspr->owner].mdanimtims)*anim->fpssc*timerticspersec/120;
     j = ((anim->endframe+1-anim->startframe)<<16);
-
     //Just in case you play the game for a VERY long time...
     if (i < 0) { i = 0; spriteext[tspr->owner].mdanimtims = mdtims; }
     //compare with j*2 instead of j to ensure i stays > j-65536 for MDANIM_ONESHOT
-    if ((i >= j+j) && (anim->fpssc)) //Keep mdanimtims close to mdtims to avoid the use of MOD
-        spriteext[tspr->owner].mdanimtims += j/anim->fpssc;
+    if ((i >= j+j) && (anim->fpssc)*timerticspersec/120) //Keep mdanimtims close to mdtims to avoid the use of MOD
+        spriteext[tspr->owner].mdanimtims += j/anim->fpssc*timerticspersec/120;
 
     if (anim->flags&MDANIM_ONESHOT)
     { if (i > j-65536) i = j-65536; }

polymer/build/src/sdlayer.c

@@ -546,7 +546,7 @@ void releaseallbuttons(void)
 
 static Uint32 timerfreq=0;
 static Uint32 timerlastsample=0;
-static Uint32 timerticspersec=0;
+Uint32 timerticspersec=0;
 static void (*usertimercallback)(void) = NULL;
 
 //
@@ -556,7 +556,7 @@ int inittimer(int tickspersecond)
 {
     if (timerfreq) return 0;	// already installed
 
-    initprintf("Initialising timer\n");
+//    initprintf("Initialising timer\n");
 
     timerfreq = 1000;
     timerticspersec = tickspersecond;

polymer/build/src/winlayer.c

@@ -1541,7 +1541,7 @@ static const char * GetDInputError(HRESULT code)
 
 static int64 timerfreq=0;
 static long timerlastsample=0;
-static int timerticspersec=0;
+int timerticspersec=0;
 static void (*usertimercallback)(void) = NULL;
 
 //  This timer stuff is all Ken's idea.
@@ -1569,7 +1569,7 @@ int inittimer(int tickspersecond)
 
     if (timerfreq) return 0;	// already installed
 
-    initprintf("Initialising timer\n");
+//    initprintf("Initialising timer\n");
 
     // OpenWatcom seems to want us to query the value into a local variable
     // instead of the global 'timerfreq' or else it gets pissed with an

polymer/eduke32/source/config.c

@@ -47,17 +47,17 @@ int32 FXDevice;
 int32 MusicDevice;
 int32 FXVolume;
 int32 MusicVolume;
-int32 SoundToggle;
-int32 MusicToggle;
-int32 VoiceToggle;
-int32 AmbienceToggle;
+int32 SoundToggle = 1;
+int32 MusicToggle = 1;
+int32 VoiceToggle = 2;
+int32 AmbienceToggle = 1;
 //fx_blaster_config BlasterConfig;
-int32 NumVoices;
-int32 NumChannels;
-int32 NumBits;
-int32 MixRate;
+int32 NumVoices = 32;
+int32 NumChannels = 2;
+int32 NumBits = 16;
+int32 MixRate = 44100;
 //int32 MidiPort;
-int32 ReverseStereo;
+int32 ReverseStereo = 0;
 
 int32 UseJoystick = 0, UseMouse = 1;
 int32 RunMode;

polymer/eduke32/source/game.c

@@ -2087,7 +2087,7 @@ void tics(void)
     i = totalclock;
     if (i != frameval[framecnt])
     {
-        j=(TICRATE*AVERAGEFRAMES)/(i-frameval[framecnt]);
+        j=(timer*AVERAGEFRAMES)/(i-frameval[framecnt]);
         if (ud.tickrate && !(ps[myconnectindex].gm&MODE_MENU))
         {
             int k = 1;
@@ -2099,7 +2099,7 @@ void tics(void)
                     k += 8;
             }
             Bsprintf(b,"%ld",j>0?j:0);
-            minitext(320-strlen(b)*4,k,b,(TICRATE*AVERAGEFRAMES)/(i-frameval[framecnt]) < 40?2:0,26);
+            minitext(320-strlen(b)*4,k,b,(timer*AVERAGEFRAMES)/(i-frameval[framecnt]) < 40?2:0,26);
         }
         framerate = j;
         frameval[framecnt] = i;

polymer/eduke32/source/player.c

@@ -5002,7 +5002,7 @@ SHOOTINCODE:
                             if(*kb == aplWeaponFireDelay[p->curr_weapon][snum])
                             {
                                 DoFire(p);
-                                DoSpawn(p);
+//                                DoSpawn(p);
                             }
                         }
                         if(aplWeaponFlags[p->curr_weapon][snum] & WEAPON_FLAG_RESET &&
@@ -5025,7 +5025,7 @@ SHOOTINCODE:
                             if(*kb == aplWeaponFireDelay[p->curr_weapon][snum])
                             {
                                 DoFire(p);
-                                DoSpawn(p);
+//                                DoSpawn(p);
                             }
                         }
                     }