X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fcl_minigames.qc;h=b88d219916edc4bd764e085467e1a9a0ec099701;hb=d666ce9b927add9e9c0b4751ca8ac7a9780ea478;hp=83150d7d262df73076e607e5b45ad43fc9499eab;hpb=a240e0309a8ec5837f3ac3d37c168f5262e53d5b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/minigames/cl_minigames.qc b/qcsrc/common/minigames/cl_minigames.qc index 83150d7d2..b88d21991 100644 --- a/qcsrc/common/minigames/cl_minigames.qc +++ b/qcsrc/common/minigames/cl_minigames.qc @@ -4,10 +4,10 @@ void minigame_hud_simpleboard(vector pos, vector mySize, string board_texture) { if(panel.current_panel_bg != "0" && panel.current_panel_bg != "") - draw_BorderPicture(pos - '1 1 0' * panel_bg_border, - panel.current_panel_bg, - mySize + '1 1 0' * 2 * panel_bg_border, - panel_bg_color, panel_bg_alpha, + draw_BorderPicture(pos - '1 1 0' * panel_bg_border, + panel.current_panel_bg, + mySize + '1 1 0' * 2 * panel_bg_border, + panel_bg_color, panel_bg_alpha, '1 1 0' * (panel_bg_border/BORDER_MULTIPLIER)); drawpic(pos, board_texture, mySize, '1 1 1', panel_bg_alpha, DRAWFLAG_NORMAL); } @@ -57,9 +57,9 @@ void initialize_minigames() if ( !last_minig ) minigame_descriptors = minig; \ else last_minig.list_next = minig; \ last_minig = minig; - + REGISTERED_MINIGAMES - + #undef MINIGAME } @@ -139,26 +139,26 @@ void activate_minigame(entity minigame) deactivate_minigame(); return; } - + if ( !minigame.descriptor || minigame.classname != "minigame" ) { LOG_TRACE("Trying to activate unregistered minigame ",minigame.netname," in client\n"); return; } - + if ( minigame == active_minigame ) return; - + if ( active_minigame ) { deactivate_minigame(); } - + if ( minigame_self.owner != minigame ) minigame_self = world; active_minigame = minigame; active_minigame.minigame_event(active_minigame,"activate"); - + if ( HUD_MinigameMenu_IsOpened() ) HUD_MinigameMenu_CurrentButton(); else @@ -207,13 +207,13 @@ void ent_read_minigame() self.classname = msle_classname(ReadShort()); self.netname = ReadString_Zoned(); } - + entity minigame_ent = world; - + if ( self.classname == "minigame" ) { minigame_ent = self; - + if ( sf & MINIG_SF_CREATE ) { self.entremove = minigame_entremove; @@ -236,15 +236,15 @@ void ent_read_minigame() float ent = ReadLong(); self.minigame_playerslot = ent; LOG_TRACE("Player: ",GetPlayerName(ent-1),"\n"); - + activate = (ent == player_localnum+1 && self.owner && self.owner != active_minigame); - + } minigame_ent = self.owner; - + if ( sf & MINIG_SF_UPDATE ) self.team = ReadByte(); - + if ( activate ) { minigame_self = self; @@ -252,7 +252,7 @@ void ent_read_minigame() } } MINIGAME_SIMPLELINKED_ENTITIES - + if ( minigame_ent ) minigame_ent.minigame_event(minigame_ent,"network_receive",self,sf); @@ -283,7 +283,7 @@ string minigame_getWrappedLine(float w, vector theFontSize, textLengthUpToWidth_ } take_until = textLengthUpToWidth(s, w, theFontSize, tw); - + if ( take_until > strlen(s) ) take_until = strlen(s); @@ -294,7 +294,7 @@ string minigame_getWrappedLine(float w, vector theFontSize, textLengthUpToWidth_ skip = 1; break; } - + if ( take_until > 0 || skip > 0 ) { if ( skip == 0 && take_until < strlen(s) ) @@ -309,7 +309,7 @@ string minigame_getWrappedLine(float w, vector theFontSize, textLengthUpToWidth_ skip = 1; } } - + getWrappedLine_remaining = substring(s, take_until+skip, strlen(s) - (take_until+skip)); if(getWrappedLine_remaining == "") getWrappedLine_remaining = string_null; @@ -324,9 +324,9 @@ string minigame_getWrappedLine(float w, vector theFontSize, textLengthUpToWidth_ } } -vector minigame_drawstring_wrapped( float maxwidth, vector pos, string text, +vector minigame_drawstring_wrapped( float maxwidth, vector pos, string text, vector fontsize, vector color, float theAlpha, int drawflags, float align ) -{ +{ getWrappedLine_remaining = text; vector mypos = pos; while ( getWrappedLine_remaining ) @@ -343,7 +343,7 @@ vector minigame_drawstring_wrapped( float maxwidth, vector pos, string text, return mypos; } -vector minigame_drawcolorcodedstring_wrapped( float maxwidth, vector pos, +vector minigame_drawcolorcodedstring_wrapped( float maxwidth, vector pos, string text, vector fontsize, float theAlpha, int drawflags, float align ) { getWrappedLine_remaining = text; @@ -362,21 +362,21 @@ vector minigame_drawcolorcodedstring_wrapped( float maxwidth, vector pos, return mypos; } -void minigame_drawstring_trunc(float maxwidth, vector pos, string text, +void minigame_drawstring_trunc(float maxwidth, vector pos, string text, vector fontsize, vector color, float theAlpha, int drawflags ) { string line = textShortenToWidth(text,maxwidth,fontsize,stringwidth_nocolors); drawstring(pos, line, fontsize, color, theAlpha, drawflags); } -void minigame_drawcolorcodedstring_trunc(float maxwidth, vector pos, string text, +void minigame_drawcolorcodedstring_trunc(float maxwidth, vector pos, string text, vector fontsize, float theAlpha, int drawflags ) { string line = textShortenToWidth(text,maxwidth,fontsize,stringwidth_colors); drawcolorcodedstring(pos, line, fontsize, theAlpha, drawflags); } -void minigame_drawpic_centered( vector pos, string texture, vector sz, +void minigame_drawpic_centered( vector pos, string texture, vector sz, vector color, float thealpha, int drawflags ) { drawpic( pos-sz/2, texture, sz, color, thealpha, drawflags ); @@ -394,7 +394,7 @@ void minigame_cmd_workaround(float dummy, string...cmdargc) localcmd(strcat(cmd,"\n")); } -// Prompt the player to play in the current minigame +// Prompt the player to play in the current minigame // (ie: it's their turn and they should get back to the minigame) void minigame_prompt() {