X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2FMain.qc;h=7ccb8968ffb485c666c17fd4408f5c05e1cb10c6;hb=0a92453278b65a165e83e64a989b5e7de38ccf02;hp=d49616d3124656431742a888dbe6f5aa8d7e1500;hpb=b38e2bae0a50554f26bf5af1fbd0e70b97cc0c71;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index d49616d31..7ccb8968f 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -87,6 +87,9 @@ void CSQC_Init(void)
 	registercvar("hud_usecsqc", "1");
 	registercvar("scoreboard_columns", "default");
 
+	registercvar("cl_nade_type", "3");
+	registercvar("cl_pokenade_type", "zombie");
+
 	gametype = 0;
 
 	// hud_fields uses strunzone on the titles!
@@ -109,6 +112,7 @@ void CSQC_Init(void)
 	CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
 	CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
 	CALL_ACCUMULATED_FUNCTION(RegisterHUD_Panels);
+	CALL_ACCUMULATED_FUNCTION(RegisterBuffs);
 
 	WaypointSprite_Load();
 
@@ -213,7 +217,7 @@ float SetTeam(entity o, float Team)
 			default:
 				if(GetTeam(Team, false) == world)
 				{
-					printf(_("trying to switch to unsupported team %d\n"), Team);
+					dprintf("trying to switch to unsupported team %d\n", Team);
 					Team = NUM_SPECTATOR;
 				}
 				break;
@@ -229,7 +233,7 @@ float SetTeam(entity o, float Team)
 			default:
 				if(GetTeam(Team, false) == world)
 				{
-					printf(_("trying to switch to unsupported team %d\n"), Team);
+					dprintf("trying to switch to unsupported team %d\n", Team);
 					Team = NUM_SPECTATOR;
 				}
 				break;
@@ -818,7 +822,7 @@ void CSQC_Ent_Update(float bIsNewEntity)
 		case ENT_CLIENT_WARPZONE_TELEPORTED: WarpZone_Teleported_Read(bIsNewEntity); break;
 		case ENT_CLIENT_TRIGGER_MUSIC: Ent_ReadTriggerMusic(); break;
 		case ENT_CLIENT_HOOK: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_HOOK); break;
-		case ENT_CLIENT_ARC_BEAM: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_ARC_BEAM); break;
+		case ENT_CLIENT_ARC_BEAM: Ent_ReadArcBeam(bIsNewEntity); break;
 		case ENT_CLIENT_ACCURACY: Ent_ReadAccuracy(); break;
 		case ENT_CLIENT_AUXILIARYXHAIR: Net_AuXair2(bIsNewEntity); break;
 		case ENT_CLIENT_TURRET: ent_turret(); break;
@@ -828,6 +832,7 @@ void CSQC_Ent_Update(float bIsNewEntity)
 		case ENT_CLIENT_SPAWNPOINT: Ent_ReadSpawnPoint(bIsNewEntity); break;
 		case ENT_CLIENT_SPAWNEVENT: Ent_ReadSpawnEvent(bIsNewEntity); break;
 		case ENT_CLIENT_NOTIFICATION: Read_Notification(bIsNewEntity); break;
+		case ENT_CLIENT_HEALING_ORB: ent_healer(); break;
 
 		default:
 			//error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype));
@@ -932,6 +937,7 @@ void Ent_ScoresInfo()
 	float i;
 	self.classname = "ent_client_scores_info";
 	gametype = ReadInt24_t();
+	HUD_ModIcons_SetFunc();
 	for(i = 0; i < MAX_SCORE; ++i)
 	{
 		scores_label[i] = strzone(ReadString());
@@ -967,8 +973,8 @@ void Ent_Init()
 
 	armorblockpercent = ReadByte() / 255.0;
 
-	g_balance_grenadelauncher_bouncefactor = ReadCoord();
-	g_balance_grenadelauncher_bouncestop = ReadCoord();
+	g_balance_mortar_bouncefactor = ReadCoord();
+	g_balance_mortar_bouncestop = ReadCoord();
 	g_balance_electro_secondary_bouncefactor = ReadCoord();
 	g_balance_electro_secondary_bouncestop = ReadCoord();