X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2FMain.qc;h=809802dff18e629504928ef8b48ea359d2402879;hp=4ea750ce5dbc5c465713037d84ada9ad97b579c0;hb=6032eff39a0f99228ebb247d69d8e4aa53541cb0;hpb=3fa123e5452bc5c746a7df6f7e4c44a6fb3c6d46

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 4ea750ce5..809802dff 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -87,12 +87,17 @@ 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!
 	for(i = 0; i < MAX_HUD_FIELDS; ++i)
 		hud_title[i] = strzone("(null)");
 
+	Cmd_HUD_SetFields(0);
+
 	postinit = false;
 
 	calledhooks = 0;
@@ -109,6 +114,7 @@ void CSQC_Init(void)
 	CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
 	CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
 	CALL_ACCUMULATED_FUNCTION(RegisterHUD_Panels);
+	CALL_ACCUMULATED_FUNCTION(RegisterBuffs);
 
 	WaypointSprite_Load();
 
@@ -312,8 +318,6 @@ void Porto_Init();
 void TrueAim_Init();
 void PostInit(void)
 {
-	localcmd(strcat("\nscoreboard_columns_set ", autocvar_scoreboard_columns, ";\n"));
-
 	entity playerchecker;
 	playerchecker = spawn();
 	playerchecker.think = Playerchecker_Think;
@@ -830,6 +834,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));
@@ -937,11 +942,15 @@ void Ent_ScoresInfo()
 	HUD_ModIcons_SetFunc();
 	for(i = 0; i < MAX_SCORE; ++i)
 	{
+		if(scores_label[i])
+			strunzone(scores_label[i]);
 		scores_label[i] = strzone(ReadString());
 		scores_flags[i] = ReadByte();
 	}
 	for(i = 0; i < MAX_TEAMSCORE; ++i)
 	{
+		if(teamscores_label[i])
+			strunzone(teamscores_label[i]);
 		teamscores_label[i] = strzone(ReadString());
 		teamscores_flags[i] = ReadByte();
 	}