changed cshifts[] to use floats instead of ints, this reduces framerate dependence...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6270 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/client.h b/client.h
index 6c12f5e3abc8a337ff12fee87e24db90b0dd7b1b..223d61a70487b93e01ca85b40ccb5774846d7ed2 100644 (file)
--- a/client.h
+++ b/client.h
@@ -366,8 +366,8 @@ typedef struct scoreboard_s
 
 typedef struct cshift_s
 {
-       int             destcolor[3];
-       int             percent;                // 0-256
+       float   destcolor[3];
+       float   percent;                // 0-256
 } cshift_t;
 
 #define        CSHIFT_CONTENTS 0

diff --git a/todo b/todo
index b36fb97c1c0e36e7fda5bdfeb56c41df98b118e2..12b11b78c9eecdbc86e1944be9f8a2239b3fa52a 100644 (file)
--- a/todo
+++ b/todo
@@ -35,8 +35,6 @@
 -d (yummyluv) feature darkplaces protocol: add buttons 9-16 (yummyluv)
 -f (James D) bug darkplaces server: losing runes on episode completion, completing episode 1 then 2 then 3 causes it to forget 1, then 4 causes it to forget 2 and 3, making it impossible to open the boss gate (James D)
 -f (Wazat) bug darkplaces: client's slowmo detection (measuring packet times and comparing to game time changes) may be making the game unpleasant (Wazat)
-0 bug dpmod: go through http://www.inside3d.com/qip/q1/bugsmap.htm and fix map bugs by using replacement .ent files (Lardarse)
-0 bug dpmod: the id1 map e2m4 has a bug where 4 scrags don't spawn in normal/hard skills because of a mislinked trigger, the Quake Done Quick team figured this out and a trigger_relay with target "t58" should be changed to target "t66" (Lardarse)
 0 bug darkplaces client/server: viewzoom values above 1 are not working properly
 0 bug darkplaces client: GAME_NEHAHRA: make sure cutscenes and movies work, got a report of seeing a black screen (NightFright)
 0 bug darkplaces client: fix cl_bobmodel bug which momentarily jolts the gun when you pass through a trigger, pick up an item, etc, Sajt thinks this is related to console prints as well as centerprint (Sajt)
@@ -66,12 +64,14 @@
 0 bug dpmod: chthon stops attacking in coop if shot enough
 0 bug dpmod: crash when dog attacks you in dpdm2 deathmatch 7 with bots present (Zombie13)
 0 bug dpmod: figure out what's wrong with the bots
+0 bug dpmod: go through http://www.inside3d.com/qip/q1/bugsmap.htm and fix map bugs by using replacement .ent files (Lardarse)
 0 bug dpmod: identify what could cause huge angles values (1187488512.0000) on a dog entity, may be related to anglemod, FacingIdeal, ai_run, or dog_run2 (Zombie13)
 0 bug dpmod: impulse 102 isn't removing the bots (Sajt)
 0 bug dpmod: monsters falling out of level? (Sajt)
 0 bug dpmod: monsters shouldn't constantly do sightsounds on a slain player, it's annoying and silly
 0 bug dpmod: monsters that spawn underwater shouldn't drown, just because it somewhat breaks the intended behavior of maps
 0 bug dpmod: test for any unnamed death messages that might be happening
+0 bug dpmod: the id1 map e2m4 has a bug where 4 scrags don't spawn in normal/hard skills because of a mislinked trigger, the Quake Done Quick team figured this out and a trigger_relay with target "t58" should be changed to target "t66" (Lardarse)
 0 bug hmap2 -qbsp: errors still occur in mrinsane's newmap.map file, tyrqbsp does not have these problems (mrinsane)
 0 bug hmap2 -qbsp: portal clipped away errors and a crash occur in vaccui (Epicenter)
 0 bug hmap2 -qbsp: various errors still occur for Predator's Transfusion maps (Predator)
@@ -114,9 +114,11 @@
 0 feature darkplaces dpv playback: when video ends, execute a console command, perhaps "endvideo", this could be an alias set by a mod before it began playing the video (SavageX, motorsep)
 0 feature darkplaces editlights: add r_editlights_edit commands for turn/turnx/turny/turnz to allow angle adjustments using binds (Kedhrin)
 0 feature darkplaces editlights: split rtlight drawshadows option into drawworldshadows and drawentityshadows options, this allows combinations like no world shadows (for speed) but still having entity shadows (Mitchell, romi, Kedhrin)
+0 feature darkplaces filesystem: gamedir command to switch between mods, should be able to take multiple parameters to load multiple mods ontop of eachother like the -game commandline option can
 0 feature darkplaces loader: add hud_clearprecache and hud_precachepic commands to preload pics by name, these get reloaded by r_restart as well, mods can put a lot of these commands in their default.cfg to precache needed hud art (Tomaz)
 0 feature darkplaces loader: load .vis files produced by hmap2
 0 feature darkplaces menu: add r_shadow_glsl_offsetmapping cvars to menu (Kedhrin)
+0 feature darkplaces menu: map selection menu for singleplayer
 0 feature darkplaces protocol: add DP_GFX_QUAKE3MODELTAGS_ATTACHMENTTYPE extension to allow attachments to affect only origin or only orientation, and enable/disable client camera turning while attached (Urre)
 0 feature darkplaces protocol: add DP_SENSITIVITYSCALE extension which scales sensitivity on client like viewzoom does, but without affecting fov, note if this is non-zero it overrides viewzoom sensitivity entirely, it does not scale it (Urre)
 0 feature darkplaces protocol: add DP_TE_BUBBLES to make a burst of bubbles underwater (Supa, shadowalker)
@@ -363,6 +365,7 @@
 3 bug darkplaces compatibility: targetquake does not work, figure out why
 3 bug darkplaces menu: find a way to prevent display of savegames from id1 in mods (WodahsEht)
 3 bug darkplaces renderer: add stainmaps to realtime lighting mode
+3 bug darkplaces renderer: crash when using rtworld mode and reloading a map that has been modified and now has less surfaces, this means the map name is the same, but the surface indices/pointers are no longer valid
 3 bug dpmodel: add support for unnamed bones (Mitchell)
 3 bug dpmodel: fix dpmodel to compile v_HKmp5-sd (tell Riot)
 3 change darkplaces client: GAME_NEXUIZ: implement new hud and scoreboard based on http://www.quirkybastards.net/qmods/scoreboard.jpg except with deaths instead of lives, and map name instead of "be the last one alive" and remove the time string and map string at the bottom, instead showing the hud (Vermeulen)

diff --git a/view.c b/view.c
index 72806f5901428acaf07d285eb907467e0ecc3cd7..7d690e9a987b1ef58cfa268e4e6ddb0231c7e5d5 100644 (file)
--- a/view.c
+++ b/view.c
@@ -230,7 +230,7 @@ void V_ParseDamage (void)
 
        cl.faceanimtime = cl.time + 0.2;                // put sbar face into pain frame
 
-       cl.cshifts[CSHIFT_DAMAGE].percent += (int)(3*count);
+       cl.cshifts[CSHIFT_DAMAGE].percent += 3*count;
        if (cl.cshifts[CSHIFT_DAMAGE].percent < 0)
                cl.cshifts[CSHIFT_DAMAGE].percent = 0;
        if (cl.cshifts[CSHIFT_DAMAGE].percent > 150)
@@ -276,10 +276,10 @@ V_cshift_f
 */
 static void V_cshift_f (void)
 {
-       v_cshift.destcolor[0] = atoi(Cmd_Argv(1));
-       v_cshift.destcolor[1] = atoi(Cmd_Argv(2));
-       v_cshift.destcolor[2] = atoi(Cmd_Argv(3));
-       v_cshift.percent = atoi(Cmd_Argv(4));
+       v_cshift.destcolor[0] = atof(Cmd_Argv(1));
+       v_cshift.destcolor[1] = atof(Cmd_Argv(2));
+       v_cshift.destcolor[2] = atof(Cmd_Argv(3));
+       v_cshift.percent = atof(Cmd_Argv(4));
 }
 
 
@@ -511,11 +511,11 @@ void V_CalcRefdef (void)
 void V_FadeViewFlashs(void)
 {
        // drop the damage value
-       cl.cshifts[CSHIFT_DAMAGE].percent -= (int)((cl.time - cl.oldtime)*150);
+       cl.cshifts[CSHIFT_DAMAGE].percent -= (cl.time - cl.oldtime)*150;
        if (cl.cshifts[CSHIFT_DAMAGE].percent <= 0)
                cl.cshifts[CSHIFT_DAMAGE].percent = 0;
        // drop the bonus value
-       cl.cshifts[CSHIFT_BONUS].percent -= (int)((cl.time - cl.oldtime)*100);
+       cl.cshifts[CSHIFT_BONUS].percent -= (cl.time - cl.oldtime)*100;
        if (cl.cshifts[CSHIFT_BONUS].percent <= 0)
                cl.cshifts[CSHIFT_BONUS].percent = 0;
 }
@@ -559,7 +559,7 @@ void V_CalcViewBlend(void)
                                cl.cshifts[CSHIFT_CONTENTS].destcolor[1] = 80;
                                cl.cshifts[CSHIFT_CONTENTS].destcolor[2] = 50;
                        }
-                       cl.cshifts[CSHIFT_CONTENTS].percent = 150 >> 1;
+                       cl.cshifts[CSHIFT_CONTENTS].percent = 150 * 0.5;
                }
                else
                {