From 3bf75f68adc670421cb33005b1750870c426997b Mon Sep 17 00:00:00 2001 From: kadaverjack Date: Sat, 8 Apr 2006 18:48:56 +0000 Subject: [PATCH] - removed cl_particles menuswitch - deluxemapping switch is now on/off - updated cvar names in default.cfg - item flags for healthpacks/armor to remove some stringchecks and hardcoded armor/health values git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1255 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/default.cfg | 5 ++-- data/menu/data/effects.menu | 13 +++------- data/menu/options/effects.menu | 5 ---- data/qcsrc/server/gamec/constants.h | 8 +++++-- data/qcsrc/server/gamec/t_items.c | 28 ++++++++++++---------- data/qcsrc/server/gamec/urrebot_ai_goals.c | 10 ++++---- 6 files changed, 32 insertions(+), 37 deletions(-) diff --git a/data/default.cfg b/data/default.cfg index 61366450b..35d5df2c5 100644 --- a/data/default.cfg +++ b/data/default.cfg @@ -482,8 +482,9 @@ r_dynamic 1 r_shadow_bumpscale_basetexture 5 r_shadow_realtime_world 0 r_shadow_realtime_world_lightmaps 1 -seta r_shadow_glsl 1 -r_shadow_glsl_offsetmapping 0 +seta r_glsl 1 +seta r_glsl_deluxemapping 2 +r_glsl_offsetmapping 0 r_shadow_realtime_world_shadows 0 r_shadow_realtime_dlight_shadows 0 r_shadow_realtime_world_dlightshadows 0 diff --git a/data/menu/data/effects.menu b/data/menu/data/effects.menu index de1ac413b..cd5c0c45d 100644 --- a/data/menu/data/effects.menu +++ b/data/menu/data/effects.menu @@ -4,13 +4,6 @@ Item DataContainer Effects { - Item Data_Cvar Particles - { - cvarName "cl_particles" - defValue 1 - - [DataLink_OnOffSwitch] - } Item Data_Cvar ParticleQuality { cvarName "cl_particles_quality" @@ -47,12 +40,12 @@ Item DataContainer Effects Item Data_Cvar DeluxeMapping { cvarName "r_glsl_deluxemapping" - defValue "1" + defValue "2" Item DataLink_TextSwitch Switch { - valueList "'0' '1' '2'" - descList "'Off' 'On' 'Forced'" + valueList "'0' '2'" + descList "'Off' 'On' 'Custom'" link "##up" } } diff --git a/data/menu/options/effects.menu b/data/menu/options/effects.menu index 664b3f718..f31685ded 100644 --- a/data/menu/options/effects.menu +++ b/data/menu/options/effects.menu @@ -18,11 +18,6 @@ Item Window Effects alignment [AlignFirst] direction [Nex_DefaultVertDirection] - Derive Nex_Option_Switch Particles - { - text "Particles" - target "::Data::Effects::Particles::Switch" - } Derive Nex_Option_Slider ParticleQuality { text "Particle Quality" diff --git a/data/qcsrc/server/gamec/constants.h b/data/qcsrc/server/gamec/constants.h index 7c5a96347..827eb9884 100644 --- a/data/qcsrc/server/gamec/constants.h +++ b/data/qcsrc/server/gamec/constants.h @@ -165,12 +165,16 @@ float IT_CELLS = 2048; float IT_STRENGTH = 8192; float IT_INVINCIBLE = 16384; -//float IT_SPEED = 32768; -//float IT_SLOWMO = 65536; +float IT_HEALTH = 32768; float IT_KEY1 = 131072; float IT_KEY2 = 262144; +float IT_5HP = 524288; +float IT_25HP = 1048576; +float IT_ARMOR_SHARD = 2097152; +float IT_ARMOR = 4194304; + vector PL_VIEW_OFS = '0 0 35'; vector PL_MIN = '-16 -16 -24'; vector PL_MAX = '16 16 45'; diff --git a/data/qcsrc/server/gamec/t_items.c b/data/qcsrc/server/gamec/t_items.c index d1a9b8430..15d1a2274 100644 --- a/data/qcsrc/server/gamec/t_items.c +++ b/data/qcsrc/server/gamec/t_items.c @@ -179,7 +179,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, org = self.origin; if (!(cvar("g_pickup_items") && !cvar("g_nixnex")) && !cvar("g_minstagib") && - itemid != IT_STRENGTH && itemid != IT_INVINCIBLE && itemname != "100 Health") + itemid != IT_STRENGTH && itemid != IT_INVINCIBLE && itemid != IT_HEALTH) { remove (self); return; @@ -219,7 +219,9 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, } } - if(itemid & (IT_STRENGTH | IT_INVINCIBLE | IT_KEY1 | IT_KEY2 | IT_ROCKET_LAUNCHER | IT_HAGAR | IT_NEX | IT_CRYLINK | IT_ELECTRO | IT_GRENADE_LAUNCHER | IT_UZI | IT_SHOTGUN | IT_LASER) || itemname == "100 Health" || itemname == "Armor") + if(itemid & (IT_STRENGTH | IT_INVINCIBLE | IT_HEALTH | IT_ARMOR | IT_KEY1 | IT_KEY2 | + IT_ROCKET_LAUNCHER | IT_HAGAR | IT_NEX | IT_CRYLINK | IT_ELECTRO | + IT_GRENADE_LAUNCHER | IT_UZI | IT_SHOTGUN | IT_LASER)) { self.target = "###item###"; // for finding the nearest item using find() } @@ -263,15 +265,15 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, z_offset = '0 0 1'; if (itemid == IT_SHELLS) - z_offset = '0 0 1' * 4; + z_offset = '0 0 4'; else if (itemid == IT_ROCKETS) - z_offset = '0 0 1' * 4; + z_offset = '0 0 4'; else if (itemid == IT_NAILS) z_offset = '0 0 0'; - else if (self.max_health == 25) - z_offset = '0 0 1' * 5; - else if (self.armorvalue == 100) - z_offset = '0 0 1' * 3; + else if (itemid == IT_25HP) + z_offset = '0 0 5'; + else if (itemid == IT_ARMOR) + z_offset = '0 0 3'; self.movetype = MOVETYPE_NONE; setorigin(self, find_floor(org) + z_offset); @@ -426,22 +428,22 @@ void item_shells (void) { void item_armor1 (void) { self.armorvalue = 5; - StartItem ("models/items/g_a1.md3", "misc/armor1.wav", 15, "Armor Shard", 0, 0); + StartItem ("models/items/g_a1.md3", "misc/armor1.wav", 15, "Armor Shard", IT_ARMOR_SHARD, 0); } void item_armor25 (void) { self.armorvalue = 100; - StartItem ("models/items/g_a25.md3", "misc/armor25.wav", 30, "Armor", 0, 0); + StartItem ("models/items/g_a25.md3", "misc/armor25.wav", 30, "Armor", IT_ARMOR, 0); } void item_health1 (void) { self.max_health = 5; - StartItem ("models/items/g_h1.md3", "misc/minihealth.ogg", 15, "5 Health", 0, 0); + StartItem ("models/items/g_h1.md3", "misc/minihealth.ogg", 15, "5 Health", IT_5HP, 0); } void item_health25 (void) { self.max_health = 25; - StartItem ("models/items/g_h25.md3", "misc/mediumhealth.ogg", 15, "25 Health", 0, 0); + StartItem ("models/items/g_h25.md3", "misc/mediumhealth.ogg", 15, "25 Health", IT_25HP, 0); } void item_health100 (void) { @@ -452,7 +454,7 @@ void item_health100 (void) { minstagib_items(IT_NAILS); } else { self.max_health = 100; - StartItem ("models/items/g_h100.md3", "misc/megahealth.ogg", 30, "100 Health", 0, 0); + StartItem ("models/items/g_h100.md3", "misc/megahealth.ogg", 30, "100 Health", IT_HEALTH, 0); } } diff --git a/data/qcsrc/server/gamec/urrebot_ai_goals.c b/data/qcsrc/server/gamec/urrebot_ai_goals.c index 5d29a5360..d9b03aa7d 100644 --- a/data/qcsrc/server/gamec/urrebot_ai_goals.c +++ b/data/qcsrc/server/gamec/urrebot_ai_goals.c @@ -231,15 +231,15 @@ void() ItemEvals = e.evalfunc = RocketsEval; else if (e.items & IT_CELLS) e.evalfunc = CellsEval; - else if (e.max_health == 5) + else if (e.items & IT_5HP) e.evalfunc = Health5Eval; - else if (e.max_health == 25) + else if (e.items & IT_25HP) e.evalfunc = Health25Eval; - else if (e.max_health & 100) + else if (e.items & IT_HEALTH) e.evalfunc = Health100Eval; - else if (e.armorvalue == 5) + else if (e.items & IT_ARMOR_SHARD) e.evalfunc = Armor5Eval; - else if (e.armorvalue == 100) + else if (e.items & IT_ARMOR) e.evalfunc = Armor100Eval; else if (e.items & IT_UZI) e.evalfunc = UEval; -- 2.39.2