X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmiscfunctions.qc;h=d38b7c9ba0d4837de902f2b86a4d5bb6e2111d92;hb=dcaa708cee1093798a651369d9fd46ad5074121e;hp=b37e209a569bbd74faa991ea2b75b35f21bc334a;hpb=0f02d3eb79f101556b60b5e98fa5e75877fbdb82;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index b37e209a5..d38b7c9ba 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -8,7 +8,7 @@ void serverAnnouncer() // check for pending announcement, play it and remove it if(announce_snd != "") { - sound(world, CHAN_AUTO, strcat("announcer/", cvar_string("cl_announcer"), "/", announce_snd, ".wav"), VOL_BASEVOICE, ATTN_NONE); + sound(world, CHAN_AUTO, strcat("announcer/", autocvar_cl_announcer, "/", announce_snd, ".wav"), VOL_BASEVOICE, ATTN_NONE); strunzone(announce_snd); announce_snd = ""; } @@ -20,9 +20,9 @@ void restartAnnouncer_Think() { countdown_rounded = floor(0.5 + countdown); if(countdown <= 0) { if (!spectatee_status) //do cprint only for players - centerprint("^1Begin!"); + centerprint(_("^1Begin!")); - sound(world, CHAN_AUTO, strcat("announcer/", cvar_string("cl_announcer"), "/begin.wav"), VOL_BASEVOICE, ATTN_NONE); + sound(world, CHAN_AUTO, strcat("announcer/", autocvar_cl_announcer, "/begin.wav"), VOL_BASEVOICE, ATTN_NONE); //reset maptime announcers now as well announcer_5min = announcer_1min = FALSE; @@ -31,10 +31,10 @@ void restartAnnouncer_Think() { } else { if (!spectatee_status) //do cprint only for players - centerprint(strcat("^1Game starts in ", ftos(countdown_rounded), " seconds")); + centerprint(sprintf(_("^1Game starts in %d seconds"), countdown_rounded)); if(countdown_rounded <= 3 && countdown_rounded >= 1) { - sound(world, CHAN_AUTO, strcat("announcer/", cvar_string("cl_announcer"), "/", ftos(countdown_rounded), ".wav"), VOL_BASEVOICE, ATTN_NONE); + sound(world, CHAN_AUTO, strcat("announcer/", autocvar_cl_announcer, "/", ftos(countdown_rounded), ".wav"), VOL_BASEVOICE, ATTN_NONE); } self.nextthink = getstatf(STAT_GAMESTARTTIME) - (countdown - 1); @@ -53,14 +53,14 @@ void maptimeAnnouncer() { float warmuplimit; float warmuptimeleft; if(warmup_stage) { - warmuplimit = cvar("g_warmup_limit"); + warmuplimit = autocvar_g_warmup_limit; if(warmuplimit > 0) { warmuptimeleft = max(0, warmuplimit + getstatf(STAT_GAMESTARTTIME) - time); } } //5 minute check - if (cvar("cl_sound_maptime_warning") >= 2) { + if (autocvar_cl_sound_maptime_warning >= 2) { //make sure that after connect (and e.g. 4 minutes left) we will not get a wrong sound if(announcer_5min) { @@ -71,13 +71,12 @@ void maptimeAnnouncer() { //if we're in warmup mode, check whether there's a warmup timelimit if not (warmuplimit == -1 && warmup_stage) { announcer_5min = TRUE; - //dprint("i will play the sound, I promise!\n"); - sound(world, CHAN_AUTO, strcat("announcer/", cvar_string("cl_announcer"), "/5minutesremain.wav"), VOL_BASEVOICE, ATTN_NONE); + sound(world, CHAN_AUTO, strcat("announcer/", autocvar_cl_announcer, "/5minutesremain.wav"), VOL_BASEVOICE, ATTN_NONE); } } //1 minute check - if (cvar("cl_sound_maptime_warning") == 1 || cvar("cl_sound_maptime_warning") == 3) { + if (autocvar_cl_sound_maptime_warning == 1 || autocvar_cl_sound_maptime_warning == 3) { if (announcer_1min) { if(((!warmup_stage || warmuplimit == 0) && timeleft > 60) || (warmup_stage && warmuplimit > 0 && warmuptimeleft > 60)) @@ -87,7 +86,7 @@ void maptimeAnnouncer() { //if we're in warmup mode, check whether there's a warmup timelimit if not (warmuplimit == -1 && warmup_stage) { announcer_1min = TRUE; - sound(world, CHAN_AUTO, strcat("announcer/", cvar_string("cl_announcer"), "/1minuteremains.wav"), VOL_BASEVOICE, ATTN_NONE); + sound(world, CHAN_AUTO, strcat("announcer/", autocvar_cl_announcer, "/1minuteremains.wav"), VOL_BASEVOICE, ATTN_NONE); } } } @@ -102,7 +101,7 @@ void carrierAnnouncer() { float pickup; string item; - if not(cvar("cl_notify_carried_items")) + if not(autocvar_cl_notify_carried_items) return; stat_items = getstati(STAT_ITEMS); @@ -111,24 +110,24 @@ void carrierAnnouncer() { blueflag = (stat_items/IT_BLUE_FLAG_TAKEN) & 3; if (redflag == 3 && redflag != redflag_prev) { - item = "^1RED^7 flag"; + item = _("^1RED^7 flag"); pickup = (redflag_prev == 2); } if (blueflag == 3 && blueflag != blueflag_prev) { - item = "^4BLUE^7 flag"; + item = _("^4BLUE^7 flag"); pickup = (blueflag_prev == 2); } if (item) { if (pickup) { - if (cvar("cl_notify_carried_items") & 2) - centerprint(strcat("You picked up the ", item, "!")); + if (autocvar_cl_notify_carried_items & 2) + centerprint(sprintf(_("You picked up the %s!"), item)); } else { - if (cvar("cl_notify_carried_items") & 1) - centerprint(strcat("You got the ", item, "!")); + if (autocvar_cl_notify_carried_items & 1) + centerprint(sprintf(_("You got the %s!"), item)); } } @@ -141,50 +140,50 @@ void carrierAnnouncer() { * TODO: announcer queues */ void Announcer_Precache () { - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/1minuteremains.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/5minutesremain.wav")); - - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/electrobitch.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/airshot.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/03kills.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/05kills.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/10kills.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/15kills.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/20kills.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/25kills.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/30kills.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/botlike.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/yoda.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/amazing.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/awesome.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/headshot.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/impressive.wav")); - - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/prepareforbattle.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/begin.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/timeoutcalled.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/1fragleft.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/2fragsleft.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/3fragsleft.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/terminated.wav")); - - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/1.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/2.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/3.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/4.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/5.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/6.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/7.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/8.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/9.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/10.wav")); - - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/lastsecond.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/narrowly.wav")); - - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/voteaccept.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/votecall.wav")); - precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/votefail.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/1minuteremains.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/5minutesremain.wav")); + + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/electrobitch.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/airshot.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/03kills.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/05kills.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/10kills.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/15kills.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/20kills.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/25kills.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/30kills.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/botlike.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/yoda.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/amazing.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/awesome.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/headshot.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/impressive.wav")); + + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/prepareforbattle.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/begin.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/timeoutcalled.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/1fragleft.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/2fragsleft.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/3fragsleft.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/terminated.wav")); + + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/1.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/2.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/3.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/4.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/5.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/6.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/7.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/8.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/9.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/10.wav")); + + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/lastsecond.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/narrowly.wav")); + + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/voteaccept.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/votecall.wav")); + precache_sound (strcat("announcer/", autocvar_cl_announcer, "/votefail.wav")); } void AuditLists() @@ -281,7 +280,7 @@ void RemoveTeam(entity Team) if(!tm) { - print("Trying to remove a team which is not in the teamlist!"); + print(_("Trying to remove a team which is not in the teamlist!")); return; } parent.sort_next = Team.sort_next; @@ -306,12 +305,6 @@ entity GetTeam(float Team, float add) return tm; } -void CSQC_CheckEngine() -{ - hud_font = FONT_USER+1; - hud_bigfont = FONT_USER+2; -} - vector HUD_GetFontsize(string cvarname) { vector v; @@ -329,7 +322,7 @@ float PreviewExists(string name) float f; string file; - if(cvar("cl_readpicture_force")) + if(autocvar_cl_readpicture_force) return false; file = strcat(name, ".tga");