From: Samual Lenks <samual@xonotic.org>
Date: Mon, 29 Apr 2013 18:52:10 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into samual/respawn_improvements
X-Git-Tag: xonotic-v0.7.0~50^2~11
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=fc0e4c6f26156858a71e0ec62eb974fa11eec2f9

Merge remote-tracking branch 'origin/master' into samual/respawn_improvements

Conflicts:
	qcsrc/client/Main.qc
	qcsrc/common/constants.qh
---

fc0e4c6f26156858a71e0ec62eb974fa11eec2f9
diff --cc qcsrc/client/Main.qc
index 8e0689f000,ecc2000d7c..9843033a1d
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -806,7 -781,7 +809,9 @@@ void CSQC_Ent_Update(float bIsNewEntity
  		case ENT_CLIENT_MODEL: CSQCModel_Read(bIsNewEntity); break;
  		case ENT_CLIENT_ITEM: ItemRead(bIsNewEntity); break;  
  		case ENT_CLIENT_BUMBLE_RAYGUN: bumble_raygun_read(bIsNewEntity); break;
 +		case ENT_CLIENT_SPAWNPOINT: Ent_ReadSpawnPoint(bIsNewEntity); break;
+ 		case ENT_CLIENT_NOTIFICATION: Read_Notification(bIsNewEntity); break;
++
  		default:
  			//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));
diff --cc qcsrc/common/constants.qh
index 44c8c14421,ffec62095b..a54a284563
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -99,7 -95,7 +95,8 @@@ const float ENT_CLIENT_WARPZONE_TELEPOR
  const float ENT_CLIENT_MODEL = 33;
  const float ENT_CLIENT_ITEM = 34;
  const float ENT_CLIENT_BUMBLE_RAYGUN = 35;
 -const float ENT_CLIENT_NOTIFICATION = 36;
 +const float ENT_CLIENT_SPAWNPOINT = 36;
++const float ENT_CLIENT_NOTIFICATION = 37;
  
  const float ENT_CLIENT_TURRET = 40;
  const float ENT_CLIENT_AUXILIARYXHAIR = 50;