r2127 - branches/nexuiz-2.0/data branches/nexuiz-2.0/data/qcsrc/menu/custom trunk/data trunk/data/qcsrc/menu/custom

[DONOTREPLY at icculus.org]

Author: esteel
Date: 2007-01-17 13:36:45 -0500 (Wed, 17 Jan 2007)
New Revision: 2127

Modified:
   branches/nexuiz-2.0/data/default.cfg
   branches/nexuiz-2.0/data/qcsrc/menu/custom/campaign.qc
   trunk/data/default.cfg
   trunk/data/qcsrc/menu/custom/campaign.qc
Log:
fixed a warning in data/qcsrc/menu/custom/campaign.qc and changed team_say binds a bit


Modified: branches/nexuiz-2.0/data/default.cfg
===================================================================
--- branches/nexuiz-2.0/data/default.cfg	2007-01-16 22:12:26 UTC (rev 2126)
+++ branches/nexuiz-2.0/data/default.cfg	2007-01-17 18:36:45 UTC (rev 2127)
@@ -673,17 +673,17 @@
 // team say
 bind kp_ins messagemode
 bind kp_del messagemode2
-bind kp_end "say_team quad soon (h:%h a:%a w:%w l:%l)"
-bind kp_downarrow "say_team item free x:%x (h:%h a:%a w:%w l:%l)"
-bind kp_pgdn "say_team took item (h:%h a:%a w:%w l:%l)"
-bind kp_leftarrow "say_team negative (h:%h a:%a w:%w l:%l)"
-bind kp_5 "say_team help me (h:%h a:%a w:%w l:%l)"
-bind kp_rightarrow "say_team incoming (h:%h a:%a w:%w l:%l)"
-bind kp_home "say_team defending (h:%h a:%a w:%w l:%l)"
-bind kp_uparrow "say_team roaming (h:%h a:%a w:%w l:%l)"
-bind kp_pgup "say_team attacking (h:%h a:%a w:%w l:%l)"
-bind kp_multiply "say_team killed flagcarrier (h:%h a:%a w:%w l:%l)"
-bind kp_slash "say_team dropped flag (h:%h a:%a w:%w l:%l)"
+bind kp_end "say_team quad soon (l:%l h:%h a:%a w:%w)"
+bind kp_downarrow "say_team item free x:%x (l:%l h:%h a:%a w:%w)"
+bind kp_pgdn "say_team took item (l:%l h:%h a:%a w:%w)"
+bind kp_leftarrow "say_team negative (l:%l h:%h a:%a w:%w)"
+bind kp_5 "say_team help me (l:%l h:%h a:%a w:%w)"
+bind kp_rightarrow "say_team enemy seen (l:%l h:%h a:%a w:%w)"
+bind kp_home "say_team defending (l:%l h:%h a:%a w:%w)"
+bind kp_uparrow "say_team roaming (l:%l h:%h a:%a w:%w)"
+bind kp_pgup "say_team attacking (l:%l h:%h a:%a w:%w)"
+bind kp_multiply "say_team killed flagcarrier (l:%l h:%h a:%a w:%w)"
+bind kp_slash "say_team dropped flag (l:%l h:%h a:%a w:%w)"
 bind kp_enter "say :-) / nice one"
 bind kp_plus "say good game"
 bind kp_minus "say hi / good luck and have fun"

Modified: branches/nexuiz-2.0/data/qcsrc/menu/custom/campaign.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/custom/campaign.qc	2007-01-16 22:12:26 UTC (rev 2126)
+++ branches/nexuiz-2.0/data/qcsrc/menu/custom/campaign.qc	2007-01-17 18:36:45 UTC (rev 2127)
@@ -71,7 +71,7 @@
 
 	handle = fopen(strcat("maps/campaign", campaign_name, ".txt"), FILE_READ);
 	if(handle >= 0) {
-		while (line = fgets(handle)) {
+		while ((line = fgets(handle))) {
 			if(substring(line, 0, 12) == "\"//campaign:") {
 				desc = substring(line, 12, (strlen(line) - (12 + 1)));
 				break;

Modified: trunk/data/default.cfg
===================================================================
--- trunk/data/default.cfg	2007-01-16 22:12:26 UTC (rev 2126)
+++ trunk/data/default.cfg	2007-01-17 18:36:45 UTC (rev 2127)
@@ -690,17 +690,17 @@
 // team say
 bind kp_ins messagemode
 bind kp_del messagemode2
-bind kp_end "say_team quad soon (h:%h a:%a w:%w l:%l)"
-bind kp_downarrow "say_team item free x:%x (h:%h a:%a w:%w l:%l)"
-bind kp_pgdn "say_team took item (h:%h a:%a w:%w l:%l)"
-bind kp_leftarrow "say_team negative (h:%h a:%a w:%w l:%l)"
-bind kp_5 "say_team help me (h:%h a:%a w:%w l:%l)"
-bind kp_rightarrow "say_team incoming (h:%h a:%a w:%w l:%l)"
-bind kp_home "say_team defending (h:%h a:%a w:%w l:%l)"
-bind kp_uparrow "say_team roaming (h:%h a:%a w:%w l:%l)"
-bind kp_pgup "say_team attacking (h:%h a:%a w:%w l:%l)"
-bind kp_multiply "say_team killed flagcarrier (h:%h a:%a w:%w l:%l)"
-bind kp_slash "say_team dropped flag (h:%h a:%a w:%w l:%l)"
+bind kp_end "say_team quad soon (l:%l h:%h a:%a w:%w)"
+bind kp_downarrow "say_team item free x:%x (l:%l h:%h a:%a w:%w)"
+bind kp_pgdn "say_team took item (l:%l h:%h a:%a w:%w)"
+bind kp_leftarrow "say_team negative (l:%l h:%h a:%a w:%w)"
+bind kp_5 "say_team help me (l:%l h:%h a:%a w:%w)"
+bind kp_rightarrow "say_team enemy seen (l:%l h:%h a:%a w:%w)"
+bind kp_home "say_team defending (l:%l h:%h a:%a w:%w)"
+bind kp_uparrow "say_team roaming (l:%l h:%h a:%a w:%w)"
+bind kp_pgup "say_team attacking (l:%l h:%h a:%a w:%w)"
+bind kp_multiply "say_team killed flagcarrier (l:%l h:%h a:%a w:%w)"
+bind kp_slash "say_team dropped flag (l:%l h:%h a:%a w:%w)"
 bind kp_enter "say :-) / nice one"
 bind kp_plus "say good game"
 bind kp_minus "say hi / good luck and have fun"

Modified: trunk/data/qcsrc/menu/custom/campaign.qc
===================================================================
--- trunk/data/qcsrc/menu/custom/campaign.qc	2007-01-16 22:12:26 UTC (rev 2126)
+++ trunk/data/qcsrc/menu/custom/campaign.qc	2007-01-17 18:36:45 UTC (rev 2127)
@@ -71,7 +71,7 @@
 
 	handle = fopen(strcat("maps/campaign", campaign_name, ".txt"), FILE_READ);
 	if(handle >= 0) {
-		while (line = fgets(handle)) {
+		while ((line = fgets(handle))) {
 			if(substring(line, 0, 12) == "\"//campaign:") {
 				desc = substring(line, 12, (strlen(line) - (12 + 1)));
 				break;