X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=d494050f060b025bb8fc6838ba16a0bf3d98096a;hp=b56887878d392b9651ed518a19d3f4f2f8f65135;hb=784ed7e054583264723e7638b3f6817a87cf3de7;hpb=0b7855b8e65e0220238a08cdcdd2ca7386e3d06e diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index b56887878d..d494050f06 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -1,10 +1,10 @@ #include "main.qh" #include "_all.qh" -#include "casings.qh" -#include "csqcmodel_hooks.qh" +#include "controlpoint.qh" #include "damage.qh" #include "effects.qh" +#include "generator.qh" #include "gibs.qh" #include "hook.qh" #include "hud.qh" @@ -13,26 +13,24 @@ #include "mapvoting.qh" #include "modeleffects.qh" #include "particles.qh" -#include "prandom.qh" #include "scoreboard.qh" #include "shownames.qh" -#include "sortlist.qh" -#include "tturrets.qh" #include "tuba.qh" #include "t_items.qh" #include "wall.qh" -#include "waypointsprites.qh" -#include "vehicles/bumblebee.qh" -#include "vehicles/all.qh" +#include "../common/vehicles/all.qh" + +#include "mutators/events.qh" #include "weapons/projectile.qh" -#include "../common/buffs.qh" +#include "../common/buffs/all.qh" #include "../common/deathtypes.qh" +#include "../common/effects/effects.qh" #include "../common/mapinfo.qh" #include "../common/monsters/all.qh" -#include "../common/nades.qh" +#include "../common/nades/all.qh" #include "../common/net_notice.qh" #include "../common/notifications.qh" #include "../common/stats.qh" @@ -40,6 +38,8 @@ #include "../common/items/all.qh" +#include "../common/mutators/base.qh" + #include "../common/weapons/all.qh" #include "../csqcmodellib/cl_model.qh" @@ -47,6 +47,8 @@ #include "../common/triggers/include.qh" +#include "../common/turrets/cl_turrets.qh" + #include "../warpzonelib/client.qh" // -------------------------------------------------------------------------- @@ -80,14 +82,13 @@ void menu_sub_null() } string forcefog; -void WaypointSprite_Load(); void ConsoleCommand_macro_init(); void CSQC_Init(void) { - prvm_language = cvar_string("prvm_language"); + prvm_language = strzone(cvar_string("prvm_language")); #ifdef WATERMARK - dprintf("^4CSQC Build information: ^1%s\n", WATERMARK); + LOG_TRACEF("^4CSQC Build information: ^1%s\n", WATERMARK); #endif int i; @@ -122,6 +123,10 @@ void CSQC_Init(void) registercvar("cl_jumpspeedcap_min", ""); registercvar("cl_jumpspeedcap_max", ""); + registercvar("cl_multijump", "0"); + + registercvar("cl_spawn_near_teammate", "1"); + gametype = 0; // hud_fields uses strunzone on the titles! @@ -141,26 +146,14 @@ void CSQC_Init(void) // needs to be done so early because of the constants they create static_init(); - CALL_ACCUMULATED_FUNCTION(RegisterWeapons); CALL_ACCUMULATED_FUNCTION(RegisterNotifications); CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes); CALL_ACCUMULATED_FUNCTION(RegisterHUD_Panels); - WaypointSprite_Load(); - // precaches - precache_model("null"); - precache_sound("misc/hit.wav"); - precache_sound("misc/typehit.wav"); Projectile_Precache(); - Hook_Precache(); - GibSplash_Precache(); - Casings_Precache(); - Vehicles_Precache(); - turrets_precache(); Tuba_Precache(); - CSQCPlayer_Precache(); if(autocvar_cl_reticle) { @@ -221,6 +214,9 @@ void Shutdown(void) if (!(calledhooks & HOOK_END)) localcmd("\ncl_hook_gameend\n"); } + + deactivate_minigame(); + HUD_MinigameMenu_Close(); } .float has_team; @@ -240,7 +236,7 @@ float SetTeam(entity o, int Team) default: if(GetTeam(Team, false) == world) { - dprintf("trying to switch to unsupported team %d\n", Team); + LOG_TRACEF("trying to switch to unsupported team %d\n", Team); Team = NUM_SPECTATOR; } break; @@ -256,7 +252,7 @@ float SetTeam(entity o, int Team) default: if(GetTeam(Team, false) == world) { - dprintf("trying to switch to unsupported team %d\n", Team); + LOG_TRACEF("trying to switch to unsupported team %d\n", Team); Team = NUM_SPECTATOR; } break; @@ -296,7 +292,7 @@ float SetTeam(entity o, int Team) } void Playerchecker_Think() -{ +{SELFPARAM(); int i; entity e; for(i = 0; i < maxclients; ++i) @@ -364,9 +360,18 @@ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary) if (HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary)) return true; + if (QuickMenu_InputEvent(bInputType, nPrimary, nSecondary)) + return true; + + if ( HUD_Radar_InputEvent(bInputType, nPrimary, nSecondary) ) + return true; + if (MapVote_InputEvent(bInputType, nPrimary, nSecondary)) return true; + if (HUD_Minigame_InputEvent(bInputType, nPrimary, nSecondary)) + return true; + if(menu_visible && menu_action) if(menu_action(bInputType, nPrimary, nSecondary)) return true; @@ -381,11 +386,11 @@ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary) // BEGIN OPTIONAL CSQC FUNCTIONS void Ent_RemoveEntCS() -{ +{SELFPARAM(); entcs_receiver[self.sv_entnum] = world; } void Ent_ReadEntCS() -{ +{SELFPARAM(); int sf; InterpolateOrigin_Undo(); @@ -421,7 +426,7 @@ void Ent_ReadEntCS() void Ent_Remove(); void Ent_RemovePlayerScore() -{ +{SELFPARAM(); if(self.owner) { SetTeam(self.owner, -1); self.owner.gotscores = 0; @@ -432,7 +437,7 @@ void Ent_RemovePlayerScore() } void Ent_ReadPlayerScore() -{ +{SELFPARAM(); int i, n; bool isNew; entity o; @@ -446,7 +451,7 @@ void Ent_ReadPlayerScore() if(!isNew && n != self.sv_entnum) { //print("A CSQC entity changed its owner!\n"); - printf("A CSQC entity changed its owner! (edict: %d, classname: %s)\n", num_for_edict(self), self.classname); + LOG_INFOF("A CSQC entity changed its owner! (edict: %d, classname: %s)\n", num_for_edict(self), self.classname); isNew = true; Ent_Remove(); self.enttype = ENT_CLIENT_SCORES; @@ -490,7 +495,7 @@ void Ent_ReadPlayerScore() } void Ent_ReadTeamScore() -{ +{SELFPARAM(); int i; entity o; @@ -682,12 +687,12 @@ void Ent_ReadAccuracy(void) } void Spawn_Draw(void) -{ +{SELFPARAM(); pointparticles(self.cnt, self.origin + '0 0 28', '0 0 2', bound(0, frametime, 0.1)); } void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint -{ +{SELFPARAM(); float teamnum = (ReadByte() - 1); vector spn_origin; spn_origin.x = ReadShort(); @@ -716,14 +721,14 @@ void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint { switch(teamnum) { - case NUM_TEAM_1: self.cnt = particleeffectnum("spawn_point_red"); break; - case NUM_TEAM_2: self.cnt = particleeffectnum("spawn_point_blue"); break; - case NUM_TEAM_3: self.cnt = particleeffectnum("spawn_point_yellow"); break; - case NUM_TEAM_4: self.cnt = particleeffectnum("spawn_point_pink"); break; - default: self.cnt = particleeffectnum("spawn_point_neutral"); break; + case NUM_TEAM_1: self.cnt = particleeffectnum(EFFECT_SPAWNPOINT_RED); break; + case NUM_TEAM_2: self.cnt = particleeffectnum(EFFECT_SPAWNPOINT_BLUE); break; + case NUM_TEAM_3: self.cnt = particleeffectnum(EFFECT_SPAWNPOINT_YELLOW); break; + case NUM_TEAM_4: self.cnt = particleeffectnum(EFFECT_SPAWNPOINT_PINK); break; + default: self.cnt = particleeffectnum(EFFECT_SPAWNPOINT_NEUTRAL); break; } } - else { self.cnt = particleeffectnum("spawn_point_neutral"); } + else { self.cnt = particleeffectnum(EFFECT_SPAWNPOINT_NEUTRAL); } self.draw = Spawn_Draw; } @@ -733,7 +738,7 @@ void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint } void Ent_ReadSpawnEvent(float is_new) -{ +{SELFPARAM(); // If entnum is 0, ONLY do the local spawn actions // this way the server can disable the sending of // spawn origin or such to clients if wanted. @@ -753,16 +758,16 @@ void Ent_ReadSpawnEvent(float is_new) { switch(teamnum) { - case NUM_TEAM_1: pointparticles(particleeffectnum("spawn_event_red"), self.origin, '0 0 0', 1); break; - case NUM_TEAM_2: pointparticles(particleeffectnum("spawn_event_blue"), self.origin, '0 0 0', 1); break; - case NUM_TEAM_3: pointparticles(particleeffectnum("spawn_event_yellow"), self.origin, '0 0 0', 1); break; - case NUM_TEAM_4: pointparticles(particleeffectnum("spawn_event_pink"), self.origin, '0 0 0', 1); break; - default: pointparticles(particleeffectnum("spawn_event_neutral"), self.origin, '0 0 0', 1); break; + case NUM_TEAM_1: pointparticles(particleeffectnum(EFFECT_SPAWN_RED), self.origin, '0 0 0', 1); break; + case NUM_TEAM_2: pointparticles(particleeffectnum(EFFECT_SPAWN_BLUE), self.origin, '0 0 0', 1); break; + case NUM_TEAM_3: pointparticles(particleeffectnum(EFFECT_SPAWN_YELLOW), self.origin, '0 0 0', 1); break; + case NUM_TEAM_4: pointparticles(particleeffectnum(EFFECT_SPAWN_PINK), self.origin, '0 0 0', 1); break; + default: pointparticles(particleeffectnum(EFFECT_SPAWN_NEUTRAL), self.origin, '0 0 0', 1); break; } } if(autocvar_cl_spawn_event_sound) { - sound(self, CH_TRIGGER, "misc/spawn.wav", VOL_BASE, ATTEN_NORM); + sound(self, CH_TRIGGER, SND_SPAWN, VOL_BASE, ATTEN_NORM); } } } @@ -779,7 +784,7 @@ void Ent_ReadSpawnEvent(float is_new) button_zoom = false; } } - + HUD_Radar_Hide_Maximized(); //printf("Ent_ReadSpawnEvent(is_new = %d); origin = %s, entnum = %d, localentnum = %d\n", is_new, vtos(self.origin), entnum, player_localentnum); } @@ -789,16 +794,14 @@ void Ent_RadarLink(); void Ent_Init(); void Ent_ScoresInfo(); void CSQC_Ent_Update(float bIsNewEntity) -{ - float t; - float savetime; - t = ReadByte(); +{SELFPARAM(); + int t = ReadByte(); if(autocvar_developer_csqcentities) - printf("CSQC_Ent_Update(%d) with self=%i self.entnum=%d self.enttype=%d t=%d\n", bIsNewEntity, self, self.entnum, self.enttype, t); + LOG_INFOF("CSQC_Ent_Update(%d) with self=%i self.entnum=%d self.enttype=%d t=%d\n", bIsNewEntity, self, self.entnum, self.enttype, t); // set up the "time" global for received entities to be correct for interpolation purposes - savetime = time; + float savetime = time; if(servertime) { time = servertime; @@ -815,8 +818,7 @@ void CSQC_Ent_Update(float bIsNewEntity) { if(t != self.enttype || bIsNewEntity) { - //print("A CSQC entity changed its type!\n"); - printf("A CSQC entity changed its type! (edict: %d, server: %d, type: %d -> %d)\n", num_for_edict(self), self.entnum, self.enttype, t); + LOG_INFOF("A CSQC entity changed its type! (edict: %d, server: %d, type: %d -> %d)\n", num_for_edict(self), self.entnum, self.enttype, t); Ent_Remove(); clearentity(self); bIsNewEntity = 1; @@ -826,14 +828,27 @@ void CSQC_Ent_Update(float bIsNewEntity) { if(!bIsNewEntity) { - printf("A CSQC entity appeared out of nowhere! (edict: %d, server: %d, type: %d)\n", num_for_edict(self), self.entnum, t); + LOG_INFOF("A CSQC entity appeared out of nowhere! (edict: %d, server: %d, type: %d)\n", num_for_edict(self), self.entnum, t); bIsNewEntity = 1; } } #endif self.enttype = t; + bool done = false; + FOREACH(LinkedEntities, it.m_id == t, LAMBDA( + it.m_read(self, bIsNewEntity); + done = true; + break; + )); + if (!done) switch(t) { + case ENT_CLIENT_MUTATOR: { + int mutID = ReadMutator(); + if (!MUTATOR_CALLHOOK(CSQC_Ent_Update, mutID, bIsNewEntity)) + error(sprintf("Unknown mutator type in CSQC_Ent_Update (mutID: %d, edict: %d, classname: %s)\n", mutID, num_for_edict(self), self.classname)); + break; + } case ENT_CLIENT_ENTCS: Ent_ReadEntCS(); break; case ENT_CLIENT_SCORES: Ent_ReadPlayerScore(); break; case ENT_CLIENT_TEAMSCORES: Ent_ReadTeamScore(); break; @@ -842,12 +857,10 @@ void CSQC_Ent_Update(float bIsNewEntity) case ENT_CLIENT_LASER: Ent_Laser(); break; case ENT_CLIENT_NAGGER: Ent_Nagger(); break; case ENT_CLIENT_ELIMINATEDPLAYERS: Ent_EliminatedPlayers(); break; - case ENT_CLIENT_WAYPOINT: Ent_WaypointSprite(); break; case ENT_CLIENT_RADARLINK: Ent_RadarLink(); break; case ENT_CLIENT_PROJECTILE: Ent_Projectile(); break; case ENT_CLIENT_GIBSPLASH: Ent_GibSplash(bIsNewEntity); break; case ENT_CLIENT_DAMAGEINFO: Ent_DamageInfo(bIsNewEntity); break; - case ENT_CLIENT_CASING: Ent_Casing(bIsNewEntity); break; case ENT_CLIENT_INIT: Ent_Init(); break; case ENT_CLIENT_SCORES_INFO: Ent_ScoresInfo(); break; case ENT_CLIENT_MAPVOTE: Ent_MapVote(); break; @@ -866,13 +879,15 @@ void CSQC_Ent_Update(float bIsNewEntity) case ENT_CLIENT_ACCURACY: Ent_ReadAccuracy(); break; case ENT_CLIENT_AUXILIARYXHAIR: Net_AuXair2(bIsNewEntity); break; case ENT_CLIENT_TURRET: ent_turret(); break; + case ENT_CLIENT_GENERATOR: ent_generator(); break; + case ENT_CLIENT_CONTROLPOINT_ICON: ent_cpicon(); break; 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_SPAWNEVENT: Ent_ReadSpawnEvent(bIsNewEntity); break; case ENT_CLIENT_NOTIFICATION: Read_Notification(bIsNewEntity); break; - case ENT_CLIENT_HEALING_ORB: ent_healer(); break; + case ENT_CLIENT_MINIGAME: ent_read_minigame(); break; case ENT_CLIENT_VIEWLOC: ent_viewloc(); break; case ENT_CLIENT_VIEWLOC_TRIGGER: ent_viewloc_trigger(); break; case ENT_CLIENT_LADDER: ent_func_ladder(); break; @@ -886,6 +901,7 @@ void CSQC_Ent_Update(float bIsNewEntity) case ENT_CLIENT_KEYLOCK: ent_keylock(); break; case ENT_CLIENT_TRAIN: ent_train(); break; case ENT_CLIENT_TRIGGER_IMPULSE: ent_trigger_impulse(); break; + case ENT_CLIENT_EFFECT: Read_Effect(bIsNewEntity); break; default: //error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype)); @@ -899,7 +915,7 @@ void CSQC_Ent_Update(float bIsNewEntity) // used when an entity changes its type. For an entity that someone interacts // with others, make sure it can no longer do so. void Ent_Remove() -{ +{SELFPARAM(); if(self.entremove) self.entremove(); @@ -911,7 +927,7 @@ void Ent_Remove() if(self.snd_looping > 0) { - sound(self, self.snd_looping, "misc/null.wav", VOL_BASE, autocvar_g_jetpack_attenuation); + sound(self, self.snd_looping, SND_Null, VOL_BASE, autocvar_g_jetpack_attenuation); self.snd_looping = 0; } @@ -923,13 +939,13 @@ void Ent_Remove() } // CSQC_Ent_Remove : Called when the server requests a SSQC / CSQC entity to be removed. Essentially call remove(self) as well. void CSQC_Ent_Remove() -{ +{SELFPARAM(); if(autocvar_developer_csqcentities) - printf("CSQC_Ent_Remove() with self=%i self.entnum=%d self.enttype=%d\n", self, self.entnum, self.enttype); + LOG_INFOF("CSQC_Ent_Remove() with self=%i self.entnum=%d self.enttype=%d\n", self, self.entnum, self.enttype); if(wasfreed(self)) { - print("WARNING: CSQC_Ent_Remove called for already removed entity. Packet loss?\n"); + LOG_INFO("WARNING: CSQC_Ent_Remove called for already removed entity. Packet loss?\n"); return; } if(self.enttype) @@ -950,7 +966,7 @@ void Gamemode_Init() void CSQC_Parse_StuffCmd(string strMessage) { if(autocvar_developer_csqcentities) - printf("CSQC_Parse_StuffCmd(\"%s\")\n", strMessage); + LOG_INFOF("CSQC_Parse_StuffCmd(\"%s\")\n", strMessage); localcmd(strMessage); } @@ -958,7 +974,7 @@ void CSQC_Parse_StuffCmd(string strMessage) void CSQC_Parse_Print(string strMessage) { if(autocvar_developer_csqcentities) - printf("CSQC_Parse_Print(\"%s\")\n", strMessage); + LOG_INFOF("CSQC_Parse_Print(\"%s\")\n", strMessage); print(ColorTranslateRGB(strMessage)); } @@ -967,7 +983,7 @@ void CSQC_Parse_Print(string strMessage) void CSQC_Parse_CenterPrint(string strMessage) { if(autocvar_developer_csqcentities) - printf("CSQC_Parse_CenterPrint(\"%s\")\n", strMessage); + LOG_INFOF("CSQC_Parse_CenterPrint(\"%s\")\n", strMessage); centerprint_hud(strMessage); } @@ -986,7 +1002,7 @@ void Fog_Force() void Gamemode_Init(); void Ent_ScoresInfo() -{ +{SELFPARAM(); int i; self.classname = "ent_client_scores_info"; gametype = ReadInt24_t(); @@ -1010,7 +1026,7 @@ void Ent_ScoresInfo() } void Ent_Init() -{ +{SELFPARAM(); self.classname = "ent_client_init"; nb_pb_period = ReadByte() / 32; //Accuracy of 1/32th @@ -1250,71 +1266,61 @@ void Net_WeaponComplain() // CSQC_Parse_TempEntity : Handles all temporary entity network data in the CSQC layer. // You must ALWAYS first acquire the temporary ID, which is sent as a byte. // Return value should be 1 if CSQC handled the temporary entity, otherwise return 0 to have the engine process the event. -float CSQC_Parse_TempEntity() +bool CSQC_Parse_TempEntity() { - float bHandled; - bHandled = true; // Acquire TE ID - float nTEID; - nTEID = ReadByte(); + int nTEID = ReadByte(); - if(autocvar_developer_csqcentities) - printf("CSQC_Parse_TempEntity() with nTEID=%d\n", nTEID); + if (autocvar_developer_csqcentities) + LOG_INFOF("CSQC_Parse_TempEntity() with nTEID=%d\n", nTEID); - // NOTE: Could just do return instead of break... - switch(nTEID) + FOREACH(TempEntities, it.m_id == nTEID, LAMBDA( + it.m_read(NULL, true); + return true; + )); + switch (nTEID) { + case TE_CSQC_MUTATOR: + int mutID = ReadMutator(); + if (MUTATOR_CALLHOOK(CSQC_Parse_TempEntity, mutID)) + return true; case TE_CSQC_TARGET_MUSIC: Net_TargetMusic(); - bHandled = true; - break; + return true; case TE_CSQC_PICTURE: Net_MapVote_Picture(); - bHandled = true; - break; + return true; case TE_CSQC_RACE: Net_ReadRace(); - bHandled = true; - break; + return true; case TE_CSQC_VORTEXBEAMPARTICLE: Net_ReadVortexBeamParticle(); - bHandled = true; - break; + return true; case TE_CSQC_TEAMNAGGER: Net_TeamNagger(); - bHandled = true; - break; + return true; case TE_CSQC_ARC: Net_ReadArc(); - bHandled = true; - break; + return true; case TE_CSQC_PINGPLREPORT: Net_ReadPingPLReport(); - bHandled = true; - break; + return true; case TE_CSQC_WEAPONCOMPLAIN: Net_WeaponComplain(); - bHandled = true; - break; + return true; case TE_CSQC_VEHICLESETUP: Net_VehicleSetup(); - bHandled = true; - break; + return true; case TE_CSQC_SVNOTICE: cl_notice_read(); - bHandled = true; - break; + return true; case TE_CSQC_SHOCKWAVEPARTICLE: Net_ReadShockwaveParticle(); - bHandled = true; - break; + return true; default: // No special logic for this temporary entity; return 0 so the engine can handle it - bHandled = false; - break; + return false; } - - return bHandled; } string getcommandkey(string text, string command)