X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=6f40c3970d5b902156abc73521b10dc62e091dd2;hb=b677a7c0f83f029472e6787a09d3821b855a5d12;hp=a544e4fbd5ba3cd3e1ee3d3afc042602911047fe;hpb=fcf4579b494a225ae17c64ccb3acf802c841245c;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index a544e4fbd..6f40c3970 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -1,10 +1,11 @@ #include "main.qh" #include "_all.qh" -#include "casings.qh" +#include "controlpoint.qh" #include "csqcmodel_hooks.qh" #include "damage.qh" #include "effects.qh" +#include "generator.qh" #include "gibs.qh" #include "hook.qh" #include "hud.qh" @@ -13,23 +14,21 @@ #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/deathtypes.qh" +#include "../common/effects.qh" #include "../common/mapinfo.qh" #include "../common/monsters/all.qh" #include "../common/nades.qh" @@ -40,6 +39,8 @@ #include "../common/items/all.qh" +#include "../common/mutators/base.qh" + #include "../common/weapons/all.qh" #include "../csqcmodellib/cl_model.qh" @@ -47,6 +48,9 @@ #include "../common/triggers/include.qh" +#include "../common/turrets/cl_turrets.qh" +#include "../common/turrets/turrets.qh" + #include "../warpzonelib/client.qh" // -------------------------------------------------------------------------- @@ -80,14 +84,13 @@ void menu_sub_null() } string forcefog; -void WaypointSprite_Load(); void ConsoleCommand_macro_init(); void CSQC_Init(void) { prvm_language = 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; @@ -141,27 +144,22 @@ 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(RegisterMonsters); - CALL_ACCUMULATED_FUNCTION(RegisterGametypes); + CALL_ACCUMULATED_FUNCTION(RegisterTurrets); CALL_ACCUMULATED_FUNCTION(RegisterNotifications); CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes); CALL_ACCUMULATED_FUNCTION(RegisterHUD_Panels); - CALL_ACCUMULATED_FUNCTION(RegisterBuffs); - WaypointSprite_Load(); + initialize_minigames(); // precaches precache_model("null"); precache_sound("misc/hit.wav"); precache_sound("misc/typehit.wav"); + generator_precache(); Projectile_Precache(); Hook_Precache(); GibSplash_Precache(); - Casings_Precache(); - Vehicles_Precache(); - turrets_precache(); Tuba_Precache(); CSQCPlayer_Precache(); @@ -224,6 +222,9 @@ void Shutdown(void) if (!(calledhooks & HOOK_END)) localcmd("\ncl_hook_gameend\n"); } + + deactivate_minigame(); + HUD_MinigameMenu_Close(); } .float has_team; @@ -243,7 +244,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; @@ -259,7 +260,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; @@ -367,9 +368,15 @@ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary) if (HUD_Panel_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; @@ -449,7 +456,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; @@ -719,14 +726,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; } @@ -756,11 +763,11 @@ 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) @@ -782,7 +789,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); } @@ -798,7 +805,7 @@ void CSQC_Ent_Update(float bIsNewEntity) 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; @@ -819,7 +826,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; @@ -829,7 +836,7 @@ 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; } } @@ -837,6 +844,12 @@ void CSQC_Ent_Update(float bIsNewEntity) self.enttype = t; 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; @@ -845,12 +858,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; @@ -869,6 +880,8 @@ 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; @@ -876,6 +889,7 @@ 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_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; @@ -889,6 +903,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)); @@ -928,11 +943,11 @@ void Ent_Remove() void CSQC_Ent_Remove() { 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) @@ -953,7 +968,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); } @@ -961,16 +976,16 @@ 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)); + LOG_INFO(ColorTranslateRGB(strMessage)); } // CSQC_Parse_CenterPrint : Provides the centerprint_hud string in the first parameter that the server provided. 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); } @@ -1255,69 +1270,55 @@ void Net_WeaponComplain() // 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() { - 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) + 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)