From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 21 May 2011 12:14:28 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/damage_effects
X-Git-Tag: xonotic-v0.6.0~110^2^2~102
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dd1c17f2775c0249509992ee85edb71020fa09e9;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mirceakitsune/damage_effects
---

dd1c17f2775c0249509992ee85edb71020fa09e9
diff --cc qcsrc/client/Main.qc
index 1328147c7,bac1fdaef..211191bc7
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -945,9 -977,9 +977,10 @@@ void(float bIsNewEntity) CSQC_Ent_Updat
  		case ENT_CLIENT_LGBEAM: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_LGBEAM); break;
  		case ENT_CLIENT_GAUNTLET: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_GAUNTLET); break;
  		case ENT_CLIENT_ACCURACY: Ent_ReadAccuracy(); break;
 +		case ENT_CLIENT_DAMAGEEFFECT: Ent_DamageEffect(); break;
  		default:
- 			error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype));
+ 			//error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype));
+ 			error(sprintf(_("Unknown entity type in CSQC_Ent_Update (enttype: %d, edict: %d, classname: %s)\n"), self.enttype, num_for_edict(self), self.classname));
  			break;
  	}
  
diff --cc qcsrc/common/constants.qh
index 96757d257,507cff85a..6d8591237
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -114,8 -114,8 +114,9 @@@ const float ENT_CLIENT_HOOK = 27
  const float ENT_CLIENT_LGBEAM = 28;
  const float ENT_CLIENT_GAUNTLET = 29;
  const float ENT_CLIENT_ACCURACY = 30;
- const float ENT_CLIENT_WARPZONE_TELEPORTED = 31;
- const float ENT_CLIENT_DAMAGEEFFECT = 32;
+ const float ENT_CLIENT_SHOWNAMES = 31;
+ const float ENT_CLIENT_WARPZONE_TELEPORTED = 32;
++const float ENT_CLIENT_DAMAGEEFFECT = 33;
  
  const float ENT_CLIENT_TURRET = 40;