X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2FMain.qc;h=2ba4130db2a126bfdcf81120ba136957fbbb29b2;hb=3963522332921529abee38a3d676c4878e6a5529;hp=6126d3d628d02aa90321d1dce22a41565558fb6f;hpb=bb29630965bcc25011715e4cbb8152d3ec076ae1;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index 6126d3d62..2ba4130db 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -5,7 +5,7 @@ entity clearentity_ent; void clearentity(entity e) { - if not(clearentity_ent) + if (!clearentity_ent) { clearentity_ent = spawn(); clearentity_ent.classname = "clearentity"; @@ -32,55 +32,6 @@ void menu_sub_null() float __engine_check; #endif -void precache_playermodel(string m) -{ - string f; - - if(substring(m, -9,5) == "_lod1") - return; - if(substring(m, -9,5) == "_lod2") - return; - precache_model(m); - f = strcat(substring(m, 0, -5), "_lod1", substring(m, -4, -1)); - if(fexists(f)) - precache_model(f); - f = strcat(substring(m, 0, -5), "_lod2", substring(m, -4, -1)); - if(fexists(f)) - precache_model(f); - - /* - float globhandle, i, n; - globhandle = search_begin(strcat(m, "_*.sounds"), TRUE, FALSE); - if (globhandle < 0) - return; - n = search_getsize(globhandle); - for (i = 0; i < n; ++i) - { - //print(search_getfilename(globhandle, i), "\n"); - f = search_getfilename(globhandle, i); - PrecachePlayerSounds(f); - } - search_end(globhandle); - */ -} -void precache_all_playermodels(string pattern) -{ - float globhandle, i, n; - string f; - - globhandle = search_begin(pattern, TRUE, FALSE); - if (globhandle < 0) - return; - n = search_getsize(globhandle); - for (i = 0; i < n; ++i) - { - //print(search_getfilename(globhandle, i), "\n"); - f = search_getfilename(globhandle, i); - precache_playermodel(f); - } - search_end(globhandle); -} - string forcefog; void WaypointSprite_Load(); void ConsoleCommand_macro_init(); @@ -102,7 +53,7 @@ void CSQC_Init(void) check_unacceptable_compiler_bugs(); #ifdef WATERMARK - print(sprintf(_("^4CSQC Build information: ^1%s\n"), WATERMARK)); + printf(_("^4CSQC Build information: ^1%s\n"), WATERMARK); #endif float i; @@ -130,7 +81,7 @@ void CSQC_Init(void) //registercommand("hud_configure"); //registercommand("hud_save"); //registercommand("menu_action"); - + ConsoleCommand_macro_init(); registercvar("hud_usecsqc", "1"); @@ -149,11 +100,15 @@ void CSQC_Init(void) teams = Sort_Spawn(); players = Sort_Spawn(); - GetTeam(COLOR_SPECTATOR, true); // add specs first + GetTeam(NUM_SPECTATOR, true); // add specs first // needs to be done so early because of the constants they create CALL_ACCUMULATED_FUNCTION(RegisterWeapons); + CALL_ACCUMULATED_FUNCTION(RegisterMonsters); CALL_ACCUMULATED_FUNCTION(RegisterGametypes); + CALL_ACCUMULATED_FUNCTION(RegisterNotifications); + CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes); + CALL_ACCUMULATED_FUNCTION(RegisterHUD_Panels); WaypointSprite_Load(); @@ -161,14 +116,6 @@ void CSQC_Init(void) precache_model("null"); precache_sound("misc/hit.wav"); precache_sound("misc/typehit.wav"); - if (autocvar_cl_precacheplayermodels) - { - precache_all_playermodels("models/player/*.zym"); - precache_all_playermodels("models/player/*.dpm"); - precache_all_playermodels("models/player/*.md3"); - precache_all_playermodels("models/player/*.psk"); - precache_all_playermodels("models/player/*.iqm"); - } Projectile_Precache(); Hook_Precache(); @@ -177,16 +124,15 @@ void CSQC_Init(void) DamageInfo_Precache(); Vehicles_Precache(); turrets_precache(); - Announcer_Precache(); Tuba_Precache(); CSQCPlayer_Precache(); - + if(autocvar_cl_reticle) { if(autocvar_cl_reticle_item_normal) { precache_pic("gfx/reticle_normal"); } if(autocvar_cl_reticle_item_nex) { precache_pic("gfx/reticle_nex"); } } - + get_mi_min_max_texcoords(1); // try the CLEVER way first minimapname = strcat("gfx/", mi_shortname, "_radar.tga"); shortmapname = mi_shortname; @@ -209,7 +155,6 @@ void CSQC_Init(void) hud_skin_path = strzone(strcat("gfx/hud/", autocvar_hud_skin)); hud_configure_prev = -1; - tab_panel = -1; draw_currentSkin = strzone(strcat("gfx/menu/", cvar_string("menu_skin"))); } @@ -243,11 +188,11 @@ void Shutdown(void) if(autocvar_chase_active < 0) cvar_set("chase_active", "0"); - if not(isdemo()) + if (!isdemo()) { - if not(calledhooks & HOOK_START) + if (!(calledhooks & HOOK_START)) localcmd("\n_cl_hook_gamestart nop\n"); - if not(calledhooks & HOOK_END) + if (!(calledhooks & HOOK_END)) localcmd("\ncl_hook_gameend\n"); } } @@ -261,16 +206,16 @@ float SetTeam(entity o, float Team) switch(Team) { case -1: - case COLOR_TEAM1: - case COLOR_TEAM2: - case COLOR_TEAM3: - case COLOR_TEAM4: + case NUM_TEAM_1: + case NUM_TEAM_2: + case NUM_TEAM_3: + case NUM_TEAM_4: break; default: if(GetTeam(Team, false) == world) { - print(sprintf(_("trying to switch to unsupported team %d\n"), Team)); - Team = COLOR_SPECTATOR; + printf(_("trying to switch to unsupported team %d\n"), Team); + Team = NUM_SPECTATOR; } break; } @@ -285,8 +230,8 @@ float SetTeam(entity o, float Team) default: if(GetTeam(Team, false) == world) { - print(sprintf(_("trying to switch to unsupported team %d\n"), Team)); - Team = COLOR_SPECTATOR; + printf(_("trying to switch to unsupported team %d\n"), Team); + Team = NUM_SPECTATOR; } break; } @@ -303,7 +248,7 @@ float SetTeam(entity o, float Team) } else { - if not(o.has_team) + if (!o.has_team) { o.team = Team; tm = GetTeam(Team, true); @@ -344,10 +289,10 @@ void Playerchecker_Think() } else { - if not(e.sort_prev) + if (!e.sort_prev) { // player connected - if not(e) + if (!e) playerslots[i] = e = spawn(); e.sv_entnum = i; e.ping = 0; @@ -445,6 +390,7 @@ void Ent_ReadEntCS() entcs_receiver[self.sv_entnum] = self; self.entremove = Ent_RemoveEntCS; + self.iflags |= IFLAG_ORIGIN; InterpolateOrigin_Note(); } @@ -478,8 +424,8 @@ void Ent_ReadPlayerScore() #ifdef DP_CSQC_ENTITY_REMOVE_IS_B0RKED if(!isNew && n != self.sv_entnum) { - //print(_("A CSQC entity changed its owner!\n")); - print(sprintf(_("A CSQC entity changed its owner! (edict: %d, classname: %s)\n"), num_for_edict(self), self.classname)); + //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); isNew = true; Ent_Remove(); self.enttype = ENT_CLIENT_SCORES; @@ -488,13 +434,13 @@ void Ent_ReadPlayerScore() self.sv_entnum = n; - if not(playerslots[self.sv_entnum]) + if (!(playerslots[self.sv_entnum])) playerslots[self.sv_entnum] = spawn(); o = self.owner = playerslots[self.sv_entnum]; o.sv_entnum = self.sv_entnum; o.gotscores = 1; - //if not(o.sort_prev) + //if (!o.sort_prev) // RegisterPlayer(o); //playerchecker will do this for us later, if it has not already done so @@ -643,7 +589,7 @@ void Ent_Nagger() { f = ReadByte(); for(j = i-1, b = 1; b < 256; b *= 2, ++j) - if not(f & b) + if (!(f & b)) if(playerslots[j]) playerslots[j].ready = 0; } @@ -694,6 +640,108 @@ void Ent_ReadAccuracy(void) } } +void Spawn_Draw(void) +{ + 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 +{ + float teamnum = (ReadByte() - 1); + vector spn_origin; + spn_origin_x = ReadShort(); + spn_origin_y = ReadShort(); + spn_origin_z = ReadShort(); + + if(is_new) + { + self.origin = spn_origin; + setsize(self, PL_MIN, PL_MAX); + droptofloor(); + + /*if(autocvar_cl_spawn_point_model) // needs a model first + { + self.mdl = "models/spawnpoint.md3"; + self.colormod = Team_ColorRGB(teamnum); + precache_model(self.mdl); + setmodel(self, self.mdl); + self.drawmask = MASK_NORMAL; + //self.movetype = MOVETYPE_NOCLIP; + //self.draw = Spawn_Draw; + }*/ + if(autocvar_cl_spawn_point_particles) + { + if((serverflags & SERVERFLAG_TEAMPLAY)) + { + 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; + } + } + else { self.cnt = particleeffectnum("spawn_point_neutral"); } + + self.draw = Spawn_Draw; + } + } + + //printf("Ent_ReadSpawnPoint(is_new = %d); origin = %s, team = %d, effect = %d\n", is_new, vtos(self.origin), teamnum, self.cnt); +} + +void Ent_ReadSpawnEvent(float is_new) +{ + // 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. + float entnum = ReadByte(); + + if(entnum) + { + self.origin_x = ReadShort(); + self.origin_y = ReadShort(); + self.origin_z = ReadShort(); + + if(is_new) + { + float teamnum = GetPlayerColor(entnum - 1); + + if(autocvar_cl_spawn_event_particles) + { + 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; + } + } + if(autocvar_cl_spawn_event_sound) + { + sound(self, CH_TRIGGER, "misc/spawn.wav", VOL_BASE, ATTEN_NORM); + } + } + } + + // local spawn actions + if(is_new && (!entnum || (entnum == player_localentnum))) + { + zoomin_effect = 1; + current_viewzoom = (1 / bound(1, autocvar_cl_spawnzoom_factor, 16)); + + if(autocvar_cl_unpress_zoom_on_spawn) + { + localcmd("-zoom\n"); + button_zoom = FALSE; + } + } + + //printf("Ent_ReadSpawnEvent(is_new = %d); origin = %s, entnum = %d, localentnum = %d\n", is_new, vtos(self.origin), entnum, player_localentnum); +} + // CSQC_Ent_Update : Called every frame that the server has indicated an update to the SSQC / CSQC entity has occured. // The only parameter reflects if the entity is "new" to the client, meaning it just came into the client's PVS. void Ent_RadarLink(); @@ -706,7 +754,7 @@ void CSQC_Ent_Update(float bIsNewEntity) t = ReadByte(); if(autocvar_developer_csqcentities) - print(sprintf("CSQC_Ent_Update(%d) with self=%i self.entnum=%d self.enttype=%d t=%d\n", bIsNewEntity, self, self.entnum, self.enttype, t)); + printf("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; @@ -726,8 +774,8 @@ void CSQC_Ent_Update(float bIsNewEntity) { if(t != self.enttype || bIsNewEntity) { - //print(_("A CSQC entity changed its type!\n")); - print(sprintf(_("A CSQC entity changed its type! (edict: %d, server: %d, type: %d -> %d)\n"), num_for_edict(self), self.entnum, self.enttype, t)); + //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); Ent_Remove(); clearentity(self); bIsNewEntity = 1; @@ -737,7 +785,7 @@ void CSQC_Ent_Update(float bIsNewEntity) { if(!bIsNewEntity) { - print(sprintf(_("A CSQC entity appeared out of nowhere! (edict: %d, server: %d, type: %d)\n"), num_for_edict(self), self.entnum, t)); + printf("A CSQC entity appeared out of nowhere! (edict: %d, server: %d, type: %d)\n", num_for_edict(self), self.entnum, t); bIsNewEntity = 1; } } @@ -775,10 +823,14 @@ void CSQC_Ent_Update(float bIsNewEntity) case ENT_CLIENT_GAUNTLET: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_GAUNTLET); break; 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_TURRET: ent_turret(); 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_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; + default: //error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype)); error(sprintf(_("Unknown entity type in CSQC_Ent_Update (enttype: %d, edict: %d, classname: %s)\n"), self.enttype, num_for_edict(self), self.classname)); @@ -817,7 +869,7 @@ void Ent_Remove() void CSQC_Ent_Remove() { if(autocvar_developer_csqcentities) - print(sprintf("CSQC_Ent_Remove() with self=%i self.entnum=%d self.enttype=%d\n", self, self.entnum, self.enttype)); + printf("CSQC_Ent_Remove() with self=%i self.entnum=%d self.enttype=%d\n", self, self.entnum, self.enttype); if(wasfreed(self)) { @@ -831,7 +883,7 @@ void CSQC_Ent_Remove() void Gamemode_Init() { - if not(isdemo()) + if (!isdemo()) { if(!(calledhooks & HOOK_START)) localcmd("\n_cl_hook_gamestart ", MapInfo_Type_ToString(gametype), "\n"); @@ -842,7 +894,7 @@ void Gamemode_Init() void CSQC_Parse_StuffCmd(string strMessage) { if(autocvar_developer_csqcentities) - print(sprintf("CSQC_Parse_StuffCmd(\"%s\")\n", strMessage)); + printf("CSQC_Parse_StuffCmd(\"%s\")\n", strMessage); localcmd(strMessage); } @@ -850,7 +902,7 @@ void CSQC_Parse_StuffCmd(string strMessage) void CSQC_Parse_Print(string strMessage) { if(autocvar_developer_csqcentities) - print(sprintf("CSQC_Parse_Print(\"%s\")\n", strMessage)); + printf("CSQC_Parse_Print(\"%s\")\n", strMessage); print(ColorTranslateRGB(strMessage)); } @@ -859,7 +911,7 @@ void CSQC_Parse_Print(string strMessage) void CSQC_Parse_CenterPrint(string strMessage) { if(autocvar_developer_csqcentities) - print(sprintf("CSQC_Parse_CenterPrint(\"%s\")\n", strMessage)); + printf("CSQC_Parse_CenterPrint(\"%s\")\n", strMessage); centerprint_hud(strMessage); } @@ -870,8 +922,10 @@ void Fog_Force() { // TODO somehow thwart prvm_globalset client ... - if(forcefog != "") - localcmd(strcat(notranslate_fogcmd1, forcefog, notranslate_fogcmd2)); + if(autocvar_cl_orthoview && autocvar_cl_orthoview_nofog) + { localcmd("\nr_drawfog 0\n"); } + else if(forcefog != "") + { localcmd(strcat(notranslate_fogcmd1, forcefog, notranslate_fogcmd2)); } } void Gamemode_Init(); @@ -919,8 +973,6 @@ void Ent_Init() armorblockpercent = ReadByte() / 255.0; - g_weaponswitchdelay = ReadByte() / 255.0; - g_balance_grenadelauncher_bouncefactor = ReadCoord(); g_balance_grenadelauncher_bouncestop = ReadCoord(); g_balance_electro_secondary_bouncefactor = ReadCoord(); @@ -1098,12 +1150,6 @@ void Net_ReadRace() } } -void Net_ReadSpawn() -{ - zoomin_effect = 1; - current_viewzoom = 0.6; -} - void Net_TeamNagger() { teamnagger = 1; @@ -1116,14 +1162,15 @@ void Net_ReadPingPLReport() pi = ReadShort(); pl = ReadByte(); ml = ReadByte(); - if not(playerslots[e]) + if (!(playerslots[e])) return; playerslots[e].ping = pi; playerslots[e].ping_packetloss = pl / 255.0; playerslots[e].ping_movementloss = ml / 255.0; } -void Net_WeaponComplain() { +void Net_WeaponComplain() +{ complain_weapon = ReadByte(); if(complain_weapon_name) @@ -1134,6 +1181,13 @@ void Net_WeaponComplain() { complain_weapon_time = time; weapontime = time; // ping the weapon panel + + switch(complain_weapon_type) + { + case 0: Local_Notification(MSG_MULTI, ITEM_WEAPON_NOAMMO, complain_weapon); break; + case 1: Local_Notification(MSG_MULTI, ITEM_WEAPON_DONTHAVE, complain_weapon); break; + default: Local_Notification(MSG_MULTI, ITEM_WEAPON_UNAVAILABLE, complain_weapon); break; + } } // CSQC_Parse_TempEntity : Handles all temporary entity network data in the CSQC layer. @@ -1148,7 +1202,7 @@ float CSQC_Parse_TempEntity() nTEID = ReadByte(); if(autocvar_developer_csqcentities) - print(sprintf("CSQC_Parse_TempEntity() with nTEID=%d\n", nTEID)); + printf("CSQC_Parse_TempEntity() with nTEID=%d\n", nTEID); // NOTE: Could just do return instead of break... switch(nTEID) @@ -1165,14 +1219,6 @@ float CSQC_Parse_TempEntity() Net_ReadRace(); bHandled = true; break; - case TE_CSQC_SPAWN: - Net_ReadSpawn(); - bHandled = true; - break; - case TE_CSQC_ZCURVEPARTICLES: - Net_ReadZCurveParticles(); - bHandled = true; - break; case TE_CSQC_NEXGUNBEAMPARTICLE: Net_ReadNexgunBeamParticle(); bHandled = true; @@ -1189,29 +1235,6 @@ float CSQC_Parse_TempEntity() Net_ReadPingPLReport(); bHandled = true; break; - case TE_CSQC_ANNOUNCE: - Announcer_Play(ReadString()); - bHandled = true; - break; - case TE_CSQC_KILLNOTIFY: - HUD_KillNotify(ReadString(), ReadString(), ReadString(), ReadShort(), ReadByte()); - bHandled = true; - break; - case TE_CSQC_KILLCENTERPRINT: - HUD_KillCenterprint(ReadString(), ReadString(), ReadShort(), ReadByte()); - bHandled = true; - break; - case TE_CSQC_CENTERPRINT_GENERIC: - float id; - string s; - id = ReadByte(); - s = ReadString(); - if (id != 0 && s != "") - centerprint_generic(id, s, ReadByte(), ReadByte()); - else - centerprint_generic(id, s, 0, 0); - bHandled = true; - break; case TE_CSQC_WEAPONCOMPLAIN: Net_WeaponComplain(); bHandled = true;