From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 14 May 2011 12:37:33 +0000 (+0200)
Subject: Merge commit '683672ff5de2463c9c29cd27bc96b658e61bac98'
X-Git-Tag: xonotic-v0.5.0~263^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=032028bc6b28d76c43210256a5dadd0d3f71b4a1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit '683672ff5de2463c9c29cd27bc96b658e61bac98'
---

032028bc6b28d76c43210256a5dadd0d3f71b4a1
diff --cc qcsrc/client/Main.qc
index 3fe3bf2c2,ddace6382..03cbd528a
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -943,9 -1020,9 +991,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_SHOWNAMES: Ent_ShowNames(); 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 b6e928f61,53eb9eed3..507cff85a
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -629,9 -634,7 +636,8 @@@ float WR_RELOAD         = 9; // (SVQC) 
  float WR_RESETPLAYER    = 10; // (SVQC) does not need to do anything
  float WR_IMPACTEFFECT	= 11; // (CSQC) impact effect
  float WR_SWITCHABLE	= 12; // (CSQC) impact effect
 +float WR_PLAYERDEATH    = 13; // (SVQC) does not need to do anything
  
- 
  float HUD_PANEL_WEAPONS		= 0;
  float HUD_PANEL_AMMO		= 1;
  float HUD_PANEL_POWERUPS	= 2;