From ae3a91cc06a3ebea30eea04f41aa4de611eb5d7e Mon Sep 17 00:00:00 2001 From: terminx Date: Thu, 5 Oct 2006 07:39:37 +0000 Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@308 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/build/src/mdsprite.c | 9 +++++---- polymer/build/src/sdlayer.c | 4 ++-- polymer/build/src/winlayer.c | 4 ++-- polymer/eduke32/rsrc/build_icon.ico | Bin 37894 -> 26694 bytes polymer/eduke32/rsrc/game_icon.ico | Bin 37894 -> 26694 bytes polymer/eduke32/source/config.c | 18 +++++++++--------- polymer/eduke32/source/game.c | 4 ++-- polymer/eduke32/source/player.c | 4 ++-- 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/polymer/build/src/mdsprite.c b/polymer/build/src/mdsprite.c index de9d660b5..4ff05f6e5 100644 --- a/polymer/build/src/mdsprite.c +++ b/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; } diff --git a/polymer/build/src/sdlayer.c b/polymer/build/src/sdlayer.c index f6080207e..97c25e445 100644 --- a/polymer/build/src/sdlayer.c +++ b/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; diff --git a/polymer/build/src/winlayer.c b/polymer/build/src/winlayer.c index b2a5bd2c0..892b7eda0 100644 --- a/polymer/build/src/winlayer.c +++ b/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 diff --git a/polymer/eduke32/rsrc/build_icon.ico b/polymer/eduke32/rsrc/build_icon.ico index b2e6dc75f5cb59bb770ab033b39ef339d3cd27ac..90731ad3775d3626cbe5602f259104aeb5f935db 100644 GIT binary patch delta 3757 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

IcykS`w*Jpq}`ln(OMGmtqiK;~wG%zFtk{}njO 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

IcykS`w*Jpq}`ln(OMGmtqiK;~wG%zFtk{}njO z!d#Gr`5=o5K^hGprDXq&3$DFgBm8ZGwR$R3e0+jJ=jiowLjrsIOyL$X7`;BQ>&Wnk z38Ml7M@`gz6676N+}^Ky$o$bgJ)9j}oEvl>`Dtjc{!0I0AC8{g*UqK3x4*x4t@_S> zv&QxeB0jTQ2G8)WQ?J*&>2v3NGNZ3U9q$<<+s_8*Ibc?w`p(YU_EY@)`u7M8bat-q zGid<*s@`kP2nPpy`$}yhX}-}_o$Xy*hEMJR5UlUvQqA7hqT(36KGMz1*51CJ_uRn% z^JjV1Zsb_b#;mDcKi;NXImhbujmCXU3mDzV!>O{Bb(IAld+FO)n^$tSvk#g|?Sb~4 z{k__@8y;Sv{NVZ84(+^ro4W+e1&A12$A8`^nl!Ru<%v`U&+)4tFb`l_kW2U3-KjyZ z595E`CUvbhY!blO@wGkX`%l;FgBmt$qSsIFHK}H`kl_G9kv;1SoYh*dv$fLL%!uqb z&#!)$seS-Hx{q8OLWT@#V`W*v%sqJ8EW3I^q1q2=#esAB)Tldg#{2J8`j4&SM7?Jn z-#LTnC$ZVB0w;8Ht@WYj2hAH*w{Pz0?4zCDl~kt>Y8^1i*TuoJMYG0E&UNeu>Ggew zDO=XRQ_$QHpH`lYoa`HQ|46SN=x^G}&ZG5uUFh(k!$W5+nCLT0?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; diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c index fd9a9a6c9..13c30f1b6 100644 --- a/polymer/eduke32/source/player.c +++ b/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); } } }