Rename cvars containing healthlarge to healthbig

diff --git a/balance-mario.cfg b/balance-mario.cfg
index 4eaa88e1bce8dd1212515f2f6b55c9604b99aad1..d290be01265d0280de9b1f06955478a641911aa5 100644 (file)
--- a/balance-mario.cfg
+++ b/balance-mario.cfg
@@ -81,9 +81,9 @@ set g_pickup_healthsmall_anyway 1
 set g_pickup_healthmedium 25
 set g_pickup_healthmedium_max 200
 set g_pickup_healthmedium_anyway 1
-set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 200
-set g_pickup_healthlarge_anyway 1
+set g_pickup_healthbig 50
+set g_pickup_healthbig_max 200
+set g_pickup_healthbig_anyway 1
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
 set g_pickup_healthmega_anyway 1

diff --git a/balance-nexuiz25.cfg b/balance-nexuiz25.cfg
index 81c1156789624aa9bb4e2e30f2528d29e3d27452..39405f399881c31eecdc243527b81eec5e3628f5 100644 (file)
--- a/balance-nexuiz25.cfg
+++ b/balance-nexuiz25.cfg
@@ -81,9 +81,9 @@ set g_pickup_healthsmall_anyway 0
 set g_pickup_healthmedium 25
 set g_pickup_healthmedium_max 999
 set g_pickup_healthmedium_anyway 0
-set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 999
-set g_pickup_healthlarge_anyway 0
+set g_pickup_healthbig 50
+set g_pickup_healthbig_max 999
+set g_pickup_healthbig_anyway 0
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 999
 set g_pickup_healthmega_anyway 0

diff --git a/balance-overkill.cfg b/balance-overkill.cfg
index d7b0c5237a7114669d391443acf218db0357f488..da17e0afeb099d8cdd3664890f6cca351d208e43 100644 (file)
--- a/balance-overkill.cfg
+++ b/balance-overkill.cfg
@@ -81,9 +81,9 @@ set g_pickup_healthsmall_anyway 1
 set g_pickup_healthmedium 25
 set g_pickup_healthmedium_max 200
 set g_pickup_healthmedium_anyway 1
-set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 200
-set g_pickup_healthlarge_anyway 1
+set g_pickup_healthbig 50
+set g_pickup_healthbig_max 200
+set g_pickup_healthbig_anyway 1
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
 set g_pickup_healthmega_anyway 0

diff --git a/balance-samual.cfg b/balance-samual.cfg
index a248faba2e6ab41722e76cdae96fbc34cad3ff3b..ad7192227eb4abcf842a2b02f57b1025de46ff27 100644 (file)
--- a/balance-samual.cfg
+++ b/balance-samual.cfg
@@ -81,9 +81,9 @@ set g_pickup_healthsmall_anyway 1
 set g_pickup_healthmedium 25
 set g_pickup_healthmedium_max 200
 set g_pickup_healthmedium_anyway 1
-set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 200
-set g_pickup_healthlarge_anyway 1
+set g_pickup_healthbig 50
+set g_pickup_healthbig_max 200
+set g_pickup_healthbig_anyway 1
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
 set g_pickup_healthmega_anyway 1

diff --git a/balance-xdf.cfg b/balance-xdf.cfg
index 2fcc444117ac9fb6d707419232a7976ab72775e1..79344fda96b597a1ac1b034e3a2755c08bc598d0 100644 (file)
--- a/balance-xdf.cfg
+++ b/balance-xdf.cfg
@@ -81,9 +81,9 @@ set g_pickup_healthsmall_anyway 1
 set g_pickup_healthmedium 25
 set g_pickup_healthmedium_max 200
 set g_pickup_healthmedium_anyway 1
-set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 200
-set g_pickup_healthlarge_anyway 1
+set g_pickup_healthbig 50
+set g_pickup_healthbig_max 200
+set g_pickup_healthbig_anyway 1
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
 set g_pickup_healthmega_anyway 1

diff --git a/balance-xonotic.cfg b/balance-xonotic.cfg
index d413cc684a7bd4ad03c7edbb8ec93735865cee78..f317d2e6b422d1225078fe3fa4d58de4ee128ce4 100644 (file)
--- a/balance-xonotic.cfg
+++ b/balance-xonotic.cfg
@@ -81,9 +81,9 @@ set g_pickup_healthsmall_anyway 1
 set g_pickup_healthmedium 25
 set g_pickup_healthmedium_max 200
 set g_pickup_healthmedium_anyway 1
-set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 200
-set g_pickup_healthlarge_anyway 1
+set g_pickup_healthbig 50
+set g_pickup_healthbig_max 200
+set g_pickup_healthbig_anyway 1
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
 set g_pickup_healthmega_anyway 1

diff --git a/balance-xpm.cfg b/balance-xpm.cfg
index a2c36202cdee9436792eb4bc98e284b159ecc3cb..f5ec29240e97d8b8646c7ba8aabb535037049acd 100644 (file)
--- a/balance-xpm.cfg
+++ b/balance-xpm.cfg
@@ -81,9 +81,9 @@ set g_pickup_healthsmall_anyway 0
 set g_pickup_healthmedium 25
 set g_pickup_healthmedium_max 100
 set g_pickup_healthmedium_anyway 0
-set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 100
-set g_pickup_healthlarge_anyway 0
+set g_pickup_healthbig 50
+set g_pickup_healthbig_max 100
+set g_pickup_healthbig_anyway 0
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
 set g_pickup_healthmega_anyway 0

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index a0e9d638b6515b1b73502d6d7e89093b7bc90e59..24ac65358dde9c0bce1b7eee713433b4eaa5b573 100644 (file)
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -1384,11 +1384,11 @@ spawnfunc(item_health_medium)
 spawnfunc(item_health_large)
 {
        if(!this.max_health)
-               this.max_health = g_pickup_healthlarge_max;
+               this.max_health = g_pickup_healthbig_max;
        if(!this.health)
-               this.health = g_pickup_healthlarge;
+               this.health = g_pickup_healthbig;
        if(!this.pickup_anyway)
-               this.pickup_anyway = g_pickup_healthlarge_anyway;
+               this.pickup_anyway = g_pickup_healthbig_anyway;
        StartItem(this, ITEM_HealthLarge);
 }
 

diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh
index d237c3038b1002e12b19660d9b215cb6fe1c62a2..eb0f3a910a80cb568c57d52212460d37057f2637 100644 (file)
--- a/qcsrc/server/miscfunctions.qh
+++ b/qcsrc/server/miscfunctions.qh
@@ -191,9 +191,9 @@ float g_pickup_healthsmall_anyway;
 float g_pickup_healthmedium;
 float g_pickup_healthmedium_max;
 float g_pickup_healthmedium_anyway;
-float g_pickup_healthlarge;
-float g_pickup_healthlarge_max;
-float g_pickup_healthlarge_anyway;
+float g_pickup_healthbig;
+float g_pickup_healthbig_max;
+float g_pickup_healthbig_anyway;
 float g_pickup_healthmega;
 float g_pickup_healthmega_max;
 float g_pickup_healthmega_anyway;
@@ -321,9 +321,9 @@ void readlevelcvars()
        g_pickup_healthmedium = cvar("g_pickup_healthmedium");
        g_pickup_healthmedium_max = cvar("g_pickup_healthmedium_max");
        g_pickup_healthmedium_anyway = cvar("g_pickup_healthmedium_anyway");
-       g_pickup_healthlarge = cvar("g_pickup_healthlarge");
-       g_pickup_healthlarge_max = cvar("g_pickup_healthlarge_max");
-       g_pickup_healthlarge_anyway = cvar("g_pickup_healthlarge_anyway");
+       g_pickup_healthbig = cvar("g_pickup_healthbig");
+       g_pickup_healthbig_max = cvar("g_pickup_healthbig_max");
+       g_pickup_healthbig_anyway = cvar("g_pickup_healthbig_anyway");
        g_pickup_healthmega = cvar("g_pickup_healthmega");
        g_pickup_healthmega_max = cvar("g_pickup_healthmega_max");
        g_pickup_healthmega_anyway = cvar("g_pickup_healthmega_anyway");