X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=982056fcbb13f363cac97a3dfc4bc00f787ac122;hb=d9b16a719396d1afe1a767dd35e8cc5de779a22d;hp=13f9545faab60a7c944d4d45b192dc6e16ca8a46;hpb=ea48961feb50159e05ef56f38b7fd0ebc15cc64e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 13f9545fa..982056fcb 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -1,21 +1,51 @@
+#include "main.qh"
+#include "_all.qh"
+
+#include "casings.qh"
+#include "csqcmodel_hooks.qh"
+#include "damage.qh"
+#include "effects.qh"
+#include "gibs.qh"
+#include "hook.qh"
+#include "hud.qh"
+#include "hud_config.qh"
+#include "laser.qh"
 #include "mapvoting.qh"
 #include "modeleffects.qh"
 #include "particles.qh"
+#include "prandom.qh"
 #include "scoreboard.qh"
 #include "shownames.qh"
-#include "target_music.qh"
+#include "sortlist.qh"
 #include "tturrets.qh"
 #include "tuba.qh"
+#include "t_items.qh"
 #include "wall.qh"
 #include "waypointsprites.qh"
 
-#include "vehicles/vehicles.qh"
+#include "vehicles/bumblebee.qh"
+#include "vehicles/all.qh"
 
-#include "../server/vehicles/bumblebee.qh"
+#include "weapons/projectile.qh"
 
+#include "../common/buffs.qh"
+#include "../common/deathtypes.qh"
+#include "../common/mapinfo.qh"
+#include "../common/monsters/all.qh"
+#include "../common/nades.qh"
 #include "../common/net_notice.qh"
+#include "../common/notifications.qh"
+#include "../common/stats.qh"
+#include "../common/teams.qh"
 
-#include "../common/monsters/monsters.qh"
+#include "../common/items/all.qh"
+
+#include "../common/weapons/all.qh"
+
+#include "../csqcmodellib/cl_model.qh"
+#include "../csqcmodellib/interpolate.qh"
+
+#include "../common/triggers/include.qh"
 
 #include "../warpzonelib/client.qh"
 
@@ -109,6 +139,7 @@ void CSQC_Init(void)
 	// needs to be done so early because of the constants they create
 	CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
 	CALL_ACCUMULATED_FUNCTION(RegisterMonsters);
+	CALL_ACCUMULATED_FUNCTION(RegisterItems);
 	CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
 	CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
 	CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
@@ -158,8 +189,6 @@ void CSQC_Init(void)
 	WarpZone_Init();
 
 	hud_skin_path = strzone(strcat("gfx/hud/", autocvar_hud_skin));
-	hud_configure_prev = -1;
-
 	draw_currentSkin = strzone(strcat("gfx/menu/", cvar_string("menu_skin")));
 }
 
@@ -350,6 +379,7 @@ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
 
 // --------------------------------------------------------------------------
 // BEGIN OPTIONAL CSQC FUNCTIONS
+
 void Ent_RemoveEntCS()
 {
 	entcs_receiver[self.sv_entnum] = world;
@@ -667,7 +697,7 @@ void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint
 	if(is_new)
 	{
 		self.origin = spn_origin;
-		setsize(self, PL_MIN, PL_MAX);
+		setsize(self, PL_MIN_CONST, PL_MAX_CONST);
 		droptofloor();
 
 		/*if(autocvar_cl_spawn_point_model) // needs a model first
@@ -831,6 +861,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_INVENTORY: Inventory_Read(self); 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;
@@ -842,6 +873,17 @@ void CSQC_Ent_Update(float bIsNewEntity)
 		case ENT_CLIENT_SPAWNEVENT: Ent_ReadSpawnEvent(bIsNewEntity); break;
 		case ENT_CLIENT_NOTIFICATION: Read_Notification(bIsNewEntity); break;
 		case ENT_CLIENT_HEALING_ORB: ent_healer(); break;
+		case ENT_CLIENT_LADDER: ent_func_ladder(); break;
+		case ENT_CLIENT_TRIGGER_PUSH: ent_trigger_push(); break;
+		case ENT_CLIENT_TARGET_PUSH: ent_target_push(); break;
+		case ENT_CLIENT_CONVEYOR: ent_conveyor(); break;
+		case ENT_CLIENT_DOOR: ent_door(); break;
+		case ENT_CLIENT_PLAT: ent_plat(); break;
+		case ENT_CLIENT_SWAMP: ent_swamp(); break;
+		case ENT_CLIENT_CORNER: ent_corner(); break;
+		case ENT_CLIENT_KEYLOCK: ent_keylock(); break;
+		case ENT_CLIENT_TRAIN: ent_train(); break;
+		case ENT_CLIENT_TRIGGER_IMPULSE: ent_trigger_impulse(); break;
 
 		default:
 			//error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype));