From: Mario Date: Sat, 25 Apr 2015 15:46:19 +0000 (+1000) Subject: Merge branch 'Melanosuchus/minigames' into Mario/combined_updates X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4f3d027affaac1c01bd22de9b56ea037d826e972;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'Melanosuchus/minigames' into Mario/combined_updates Conflicts: _hud_descriptions.cfg qcsrc/client/command/cl_cmd.qc qcsrc/client/hud.qc qcsrc/client/hud.qh qcsrc/client/main.qc qcsrc/client/view.qc qcsrc/common/constants.qh qcsrc/common/minigames/cl_minigames.qc qcsrc/common/minigames/cl_minigames.qh qcsrc/common/minigames/cl_minigames_hud.qc qcsrc/common/minigames/minigame/all.qh qcsrc/common/minigames/minigame/nmm.qc qcsrc/common/minigames/minigame/ttt.qc qcsrc/common/minigames/minigames.qc qcsrc/common/minigames/minigames.qh qcsrc/common/minigames/sv_minigames.qc qcsrc/common/minigames/sv_minigames.qh qcsrc/common/notifications.qh qcsrc/server/autocvars.qh qcsrc/server/cl_client.qc qcsrc/server/cl_player.qc qcsrc/server/progs.src --- 4f3d027affaac1c01bd22de9b56ea037d826e972 diff --cc _hud_descriptions.cfg index 5cabda2f6,ab53df710..79b89b861 --- a/_hud_descriptions.cfg +++ b/_hud_descriptions.cfg @@@ -310,5 -310,43 +310,45 @@@ seta hud_panel_buffs_bg_color_team "" " seta hud_panel_buffs_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" seta hud_panel_buffs_bg_border "" "if set to something else than \"\" = override default size of border around the background" seta hud_panel_buffs_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" +seta hud_panel_buffs_progressbar "" "use progressbar behind buff names" +seta hud_panel_buffs_progressbar_name "" "name of progressbar to use behind buff names" + + seta hud_panel_minigameboard "" "enable/disable this panel" + seta hud_panel_minigameboard_pos "" "position of this panel" + seta hud_panel_minigameboard_size "" "size of this panel" + seta hud_panel_minigameboard_bg "" "if set to something else than \"\" = override default background" + seta hud_panel_minigameboard_bg_color "" "if set to something else than \"\" = override default panel background color" + seta hud_panel_minigameboard_bg_color_team "" "override panel color with team color in team based games" + seta hud_panel_minigameboard_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" + seta hud_panel_minigameboard_bg_border "" "if set to something else than \"\" = override default size of border around the background" + seta hud_panel_minigameboard_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + + seta hud_panel_minigamestatus "" "enable/disable this panel" + seta hud_panel_minigamestatus_pos "" "position of this panel" + seta hud_panel_minigamestatus_size "" "size of this panel" + seta hud_panel_minigamestatus_bg "" "if set to something else than \"\" = override default background" + seta hud_panel_minigamestatus_bg_color "" "if set to something else than \"\" = override default panel background color" + seta hud_panel_minigamestatus_bg_color_team "" "override panel color with team color in team based games" + seta hud_panel_minigamestatus_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" + seta hud_panel_minigamestatus_bg_border "" "if set to something else than \"\" = override default size of border around the background" + seta hud_panel_minigamestatus_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + + seta hud_panel_minigamehelp "" "enable/disable this panel" + seta hud_panel_minigamehelp_pos "" "position of this panel" + seta hud_panel_minigamehelp_size "" "size of this panel" + seta hud_panel_minigamehelp_bg "" "if set to something else than \"\" = override default background" + seta hud_panel_minigamehelp_bg_color "" "if set to something else than \"\" = override default panel background color" + seta hud_panel_minigamehelp_bg_color_team "" "override panel color with team color in team based games" + seta hud_panel_minigamehelp_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" + seta hud_panel_minigamehelp_bg_border "" "if set to something else than \"\" = override default size of border around the background" + seta hud_panel_minigamehelp_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + + seta hud_panel_minigamemenu "" "enable/disable this panel" + seta hud_panel_minigamemenu_pos "" "position of this panel" + seta hud_panel_minigamemenu_size "" "size of this panel" + seta hud_panel_minigamemenu_bg "" "if set to something else than \"\" = override default background" + seta hud_panel_minigamemenu_bg_color "" "if set to something else than \"\" = override default panel background color" + seta hud_panel_minigamemenu_bg_color_team "" "override panel color with team color in team based games" + seta hud_panel_minigamemenu_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" + seta hud_panel_minigamemenu_bg_border "" "if set to something else than \"\" = override default size of border around the background" + seta hud_panel_minigamemenu_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" diff --cc hud_luma.cfg index ae0b5f0d9,ec4e415f2..896789b5e --- a/hud_luma.cfg +++ b/hud_luma.cfg @@@ -308,7 -308,45 +308,47 @@@ seta hud_panel_buffs_bg_color_team " seta hud_panel_buffs_bg_alpha "" seta hud_panel_buffs_bg_border "" seta hud_panel_buffs_bg_padding "" +seta hud_panel_buffs_progressbar 1 +seta hud_panel_buffs_progressbar_name "progressbar" + seta hud_panel_minigameboard "1" + seta hud_panel_minigameboard_pos "0.22 0.15" + seta hud_panel_minigameboard_size "0.50 0.60" + seta hud_panel_minigameboard_bg "border_small" + seta hud_panel_minigameboard_bg_color "" + seta hud_panel_minigameboard_bg_color_team "" + seta hud_panel_minigameboard_bg_alpha "" + seta hud_panel_minigameboard_bg_border "" + seta hud_panel_minigameboard_bg_padding "" + + seta hud_panel_minigamestatus "1" + seta hud_panel_minigamestatus_pos "0.74 0.15" + seta hud_panel_minigamestatus_size "0.2 0.60" + seta hud_panel_minigamestatus_bg "border_small" + seta hud_panel_minigamestatus_bg_color "" + seta hud_panel_minigamestatus_bg_color_team "" + seta hud_panel_minigamestatus_bg_alpha "" + seta hud_panel_minigamestatus_bg_border "" + seta hud_panel_minigamestatus_bg_padding "" + + seta hud_panel_minigamehelp "1" + seta hud_panel_minigamehelp_pos "0.22 0.78" + seta hud_panel_minigamehelp_size "0.50 0.20" + seta hud_panel_minigamehelp_bg "" + seta hud_panel_minigamehelp_bg_color "" + seta hud_panel_minigamehelp_bg_color_team "" + seta hud_panel_minigamehelp_bg_alpha "" + seta hud_panel_minigamehelp_bg_border "" + seta hud_panel_minigamehelp_bg_padding "" + + seta hud_panel_minigamemenu "0" + seta hud_panel_minigamemenu_pos "0 0.26" + seta hud_panel_minigamemenu_size "0.2 0.49" + seta hud_panel_minigamemenu_bg "border_small" + seta hud_panel_minigamemenu_bg_color "" + seta hud_panel_minigamemenu_bg_color_team "" + seta hud_panel_minigamemenu_bg_alpha "" + seta hud_panel_minigamemenu_bg_border "" + seta hud_panel_minigamemenu_bg_padding "" + menu_sync diff --cc hud_luminos.cfg index 4d95e94f7,d9e3fdfc9..6bd8cf978 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@@ -308,7 -308,45 +308,47 @@@ seta hud_panel_buffs_bg_color_team " seta hud_panel_buffs_bg_alpha "" seta hud_panel_buffs_bg_border "" seta hud_panel_buffs_bg_padding "" +seta hud_panel_buffs_progressbar 1 +seta hud_panel_buffs_progressbar_name "progressbar" + seta hud_panel_minigameboard "1" + seta hud_panel_minigameboard_pos "0.22 0.15" + seta hud_panel_minigameboard_size "0.50 0.60" + seta hud_panel_minigameboard_bg "border_small" + seta hud_panel_minigameboard_bg_color "" + seta hud_panel_minigameboard_bg_color_team "" + seta hud_panel_minigameboard_bg_alpha "" + seta hud_panel_minigameboard_bg_border "" + seta hud_panel_minigameboard_bg_padding "" + + seta hud_panel_minigamestatus "1" + seta hud_panel_minigamestatus_pos "0.74 0.15" + seta hud_panel_minigamestatus_size "0.2 0.60" + seta hud_panel_minigamestatus_bg "border_small" + seta hud_panel_minigamestatus_bg_color "" + seta hud_panel_minigamestatus_bg_color_team "" + seta hud_panel_minigamestatus_bg_alpha "" + seta hud_panel_minigamestatus_bg_border "" + seta hud_panel_minigamestatus_bg_padding "" + + seta hud_panel_minigamehelp "1" + seta hud_panel_minigamehelp_pos "0.22 0.78" + seta hud_panel_minigamehelp_size "0.50 0.20" + seta hud_panel_minigamehelp_bg "" + seta hud_panel_minigamehelp_bg_color "" + seta hud_panel_minigamehelp_bg_color_team "" + seta hud_panel_minigamehelp_bg_alpha "" + seta hud_panel_minigamehelp_bg_border "" + seta hud_panel_minigamehelp_bg_padding "" + + seta hud_panel_minigamemenu "0" + seta hud_panel_minigamemenu_pos "0 0.26" + seta hud_panel_minigamemenu_size "0.2 0.49" + seta hud_panel_minigamemenu_bg "border_small" + seta hud_panel_minigamemenu_bg_color "" + seta hud_panel_minigamemenu_bg_color_team "" + seta hud_panel_minigamemenu_bg_alpha "" + seta hud_panel_minigamemenu_bg_border "" + seta hud_panel_minigamemenu_bg_padding "" + menu_sync diff --cc hud_luminos_minimal.cfg index e0a381c6f,67db42dfd..b44a78862 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@@ -308,7 -308,45 +308,47 @@@ seta hud_panel_buffs_bg_color_team " seta hud_panel_buffs_bg_alpha "" seta hud_panel_buffs_bg_border "" seta hud_panel_buffs_bg_padding "" +seta hud_panel_buffs_progressbar 1 +seta hud_panel_buffs_progressbar_name "progressbar" + seta hud_panel_minigameboard "1" + seta hud_panel_minigameboard_pos "0.22 0.15" + seta hud_panel_minigameboard_size "0.50 0.60" + seta hud_panel_minigameboard_bg "border_small" + seta hud_panel_minigameboard_bg_color "" + seta hud_panel_minigameboard_bg_color_team "" + seta hud_panel_minigameboard_bg_alpha "" + seta hud_panel_minigameboard_bg_border "" + seta hud_panel_minigameboard_bg_padding "" + + seta hud_panel_minigamestatus "1" + seta hud_panel_minigamestatus_pos "0.74 0.15" + seta hud_panel_minigamestatus_size "0.2 0.60" + seta hud_panel_minigamestatus_bg "border_small" + seta hud_panel_minigamestatus_bg_color "" + seta hud_panel_minigamestatus_bg_color_team "" + seta hud_panel_minigamestatus_bg_alpha "" + seta hud_panel_minigamestatus_bg_border "" + seta hud_panel_minigamestatus_bg_padding "" + + seta hud_panel_minigamehelp "1" + seta hud_panel_minigamehelp_pos "0.22 0.78" + seta hud_panel_minigamehelp_size "0.50 0.20" + seta hud_panel_minigamehelp_bg "" + seta hud_panel_minigamehelp_bg_color "" + seta hud_panel_minigamehelp_bg_color_team "" + seta hud_panel_minigamehelp_bg_alpha "" + seta hud_panel_minigamehelp_bg_border "" + seta hud_panel_minigamehelp_bg_padding "" + + seta hud_panel_minigamemenu "0" + seta hud_panel_minigamemenu_pos "0 0.26" + seta hud_panel_minigamemenu_size "0.2 0.49" + seta hud_panel_minigamemenu_bg "border_small" + seta hud_panel_minigamemenu_bg_color "" + seta hud_panel_minigamemenu_bg_color_team "" + seta hud_panel_minigamemenu_bg_alpha "" + seta hud_panel_minigamemenu_bg_border "" + seta hud_panel_minigamemenu_bg_padding "" + menu_sync diff --cc hud_luminos_minimal_xhair.cfg index 2d72b3cd4,f6067e7c5..464f9b07c --- a/hud_luminos_minimal_xhair.cfg +++ b/hud_luminos_minimal_xhair.cfg @@@ -308,7 -308,45 +308,47 @@@ seta hud_panel_buffs_bg_color_team " seta hud_panel_buffs_bg_alpha "" seta hud_panel_buffs_bg_border "" seta hud_panel_buffs_bg_padding "" +seta hud_panel_buffs_progressbar 1 +seta hud_panel_buffs_progressbar_name "progressbar" + seta hud_panel_minigameboard "1" + seta hud_panel_minigameboard_pos "0.22 0.15" + seta hud_panel_minigameboard_size "0.50 0.60" + seta hud_panel_minigameboard_bg "border_small" + seta hud_panel_minigameboard_bg_color "" + seta hud_panel_minigameboard_bg_color_team "" + seta hud_panel_minigameboard_bg_alpha "" + seta hud_panel_minigameboard_bg_border "" + seta hud_panel_minigameboard_bg_padding "" + + seta hud_panel_minigamestatus "1" + seta hud_panel_minigamestatus_pos "0.74 0.15" + seta hud_panel_minigamestatus_size "0.2 0.60" + seta hud_panel_minigamestatus_bg "border_small" + seta hud_panel_minigamestatus_bg_color "" + seta hud_panel_minigamestatus_bg_color_team "" + seta hud_panel_minigamestatus_bg_alpha "" + seta hud_panel_minigamestatus_bg_border "" + seta hud_panel_minigamestatus_bg_padding "" + + seta hud_panel_minigamehelp "1" + seta hud_panel_minigamehelp_pos "0.22 0.78" + seta hud_panel_minigamehelp_size "0.50 0.20" + seta hud_panel_minigamehelp_bg "" + seta hud_panel_minigamehelp_bg_color "" + seta hud_panel_minigamehelp_bg_color_team "" + seta hud_panel_minigamehelp_bg_alpha "" + seta hud_panel_minigamehelp_bg_border "" + seta hud_panel_minigamehelp_bg_padding "" + + seta hud_panel_minigamemenu "0" + seta hud_panel_minigamemenu_pos "0 0.26" + seta hud_panel_minigamemenu_size "0.2 0.49" + seta hud_panel_minigamemenu_bg "border_small" + seta hud_panel_minigamemenu_bg_color "" + seta hud_panel_minigamemenu_bg_color_team "" + seta hud_panel_minigamemenu_bg_alpha "" + seta hud_panel_minigamemenu_bg_border "" + seta hud_panel_minigamemenu_bg_padding "" + menu_sync diff --cc hud_luminos_old.cfg index 88c0d8f41,45c6107c9..8892c72e2 --- a/hud_luminos_old.cfg +++ b/hud_luminos_old.cfg @@@ -308,7 -308,45 +308,47 @@@ seta hud_panel_buffs_bg_color_team " seta hud_panel_buffs_bg_alpha "" seta hud_panel_buffs_bg_border "" seta hud_panel_buffs_bg_padding "" +seta hud_panel_buffs_progressbar 1 +seta hud_panel_buffs_progressbar_name "progressbar" + seta hud_panel_minigameboard "1" + seta hud_panel_minigameboard_pos "0.22 0.15" + seta hud_panel_minigameboard_size "0.50 0.60" + seta hud_panel_minigameboard_bg "border_small" + seta hud_panel_minigameboard_bg_color "" + seta hud_panel_minigameboard_bg_color_team "" + seta hud_panel_minigameboard_bg_alpha "" + seta hud_panel_minigameboard_bg_border "" + seta hud_panel_minigameboard_bg_padding "" + + seta hud_panel_minigamestatus "1" + seta hud_panel_minigamestatus_pos "0.74 0.15" + seta hud_panel_minigamestatus_size "0.2 0.60" + seta hud_panel_minigamestatus_bg "border_small" + seta hud_panel_minigamestatus_bg_color "" + seta hud_panel_minigamestatus_bg_color_team "" + seta hud_panel_minigamestatus_bg_alpha "" + seta hud_panel_minigamestatus_bg_border "" + seta hud_panel_minigamestatus_bg_padding "" + + seta hud_panel_minigamehelp "1" + seta hud_panel_minigamehelp_pos "0.22 0.78" + seta hud_panel_minigamehelp_size "0.50 0.20" + seta hud_panel_minigamehelp_bg "" + seta hud_panel_minigamehelp_bg_color "" + seta hud_panel_minigamehelp_bg_color_team "" + seta hud_panel_minigamehelp_bg_alpha "" + seta hud_panel_minigamehelp_bg_border "" + seta hud_panel_minigamehelp_bg_padding "" + + seta hud_panel_minigamemenu "0" + seta hud_panel_minigamemenu_pos "0 0.26" + seta hud_panel_minigamemenu_size "0.2 0.49" + seta hud_panel_minigamemenu_bg "border_small" + seta hud_panel_minigamemenu_bg_color "" + seta hud_panel_minigamemenu_bg_color_team "" + seta hud_panel_minigamemenu_bg_alpha "" + seta hud_panel_minigamemenu_bg_border "" + seta hud_panel_minigamemenu_bg_padding "" + menu_sync diff --cc hud_nexuiz.cfg index f3d9180be,a5af3c7df..8c5f78cd1 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@@ -308,7 -308,45 +308,47 @@@ seta hud_panel_buffs_bg_color_team " seta hud_panel_buffs_bg_alpha "" seta hud_panel_buffs_bg_border "" seta hud_panel_buffs_bg_padding "" +seta hud_panel_buffs_progressbar 1 +seta hud_panel_buffs_progressbar_name "progressbar" + seta hud_panel_minigameboard "1" + seta hud_panel_minigameboard_pos "0.22 0.15" + seta hud_panel_minigameboard_size "0.50 0.60" + seta hud_panel_minigameboard_bg "border_small" + seta hud_panel_minigameboard_bg_color "" + seta hud_panel_minigameboard_bg_color_team "" + seta hud_panel_minigameboard_bg_alpha "" + seta hud_panel_minigameboard_bg_border "" + seta hud_panel_minigameboard_bg_padding "" + + seta hud_panel_minigamestatus "1" + seta hud_panel_minigamestatus_pos "0.74 0.15" + seta hud_panel_minigamestatus_size "0.2 0.60" + seta hud_panel_minigamestatus_bg "border_small" + seta hud_panel_minigamestatus_bg_color "" + seta hud_panel_minigamestatus_bg_color_team "" + seta hud_panel_minigamestatus_bg_alpha "" + seta hud_panel_minigamestatus_bg_border "" + seta hud_panel_minigamestatus_bg_padding "" + + seta hud_panel_minigamehelp "1" + seta hud_panel_minigamehelp_pos "0.22 0.78" + seta hud_panel_minigamehelp_size "0.50 0.20" + seta hud_panel_minigamehelp_bg "" + seta hud_panel_minigamehelp_bg_color "" + seta hud_panel_minigamehelp_bg_color_team "" + seta hud_panel_minigamehelp_bg_alpha "" + seta hud_panel_minigamehelp_bg_border "" + seta hud_panel_minigamehelp_bg_padding "" + + seta hud_panel_minigamemenu "0" + seta hud_panel_minigamemenu_pos "0 0.26" + seta hud_panel_minigamemenu_size "0.2 0.49" + seta hud_panel_minigamemenu_bg "border_small" + seta hud_panel_minigamemenu_bg_color "" + seta hud_panel_minigamemenu_bg_color_team "" + seta hud_panel_minigamemenu_bg_alpha "" + seta hud_panel_minigamemenu_bg_border "" + seta hud_panel_minigamemenu_bg_padding "" + menu_sync diff --cc qcsrc/client/command/cl_cmd.qc index edb6d366d,ecd05c16f..5ea800de5 --- a/qcsrc/client/command/cl_cmd.qc +++ b/qcsrc/client/command/cl_cmd.qc @@@ -309,7 -294,7 +309,7 @@@ void LocalCommand_hud(int request, int print(" 'configname' is the name to save to for \"save\" action,\n"); print(" 'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action,\n"); print(" and 'layout' is how to organize the scoreboard columns for the set action.\n"); - print(" Full list of commands here: \"configure, quickmenu, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n"); - print(" Full list of commands here: \"configure, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n"); ++ print(" Full list of commands here: \"configure, quickmenu, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n"); return; } } diff --cc qcsrc/client/main.qc index 3398066e8,b21166f81..b63b829e2 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@@ -218,10 -114,9 +218,12 @@@ void CSQC_Init(void CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes); CALL_ACCUMULATED_FUNCTION(RegisterHUD_Panels); CALL_ACCUMULATED_FUNCTION(RegisterBuffs); + CALL_ACCUMULATED_FUNCTION(RegisterEffects); + + initialize_minigames(); + initialize_minigames(); + WaypointSprite_Load(); // precaches diff --cc qcsrc/common/minigames/cl_minigames.qc index f6af765b7,0bac54c67..7ee7fca4c --- a/qcsrc/common/minigames/cl_minigames.qc +++ b/qcsrc/common/minigames/cl_minigames.qc @@@ -104,10 -105,9 +105,10 @@@ void deactivate_minigame( { if ( !active_minigame ) return; - ++ active_minigame.minigame_event(active_minigame,"deactivate"); entity e = world; - while( (e = findentity(e, owner, self)) ) + while( (e = findentity(e, owner, active_minigame)) ) if ( e.minigame_autoclean ) { minigame_autoclean_entity(e); @@@ -251,10 -255,13 +256,13 @@@ void ent_read_minigame( if ( minigame_ent ) minigame_ent.minigame_event(minigame_ent,"network_receive",self,sf); -- - dprint("CL Reading entity: ",ftos(num_for_edict(self)), - " classname:",self.classname," enttype:",ftos(self.enttype) ); - dprint(" sf:",ftos(sf)," netname:",self.netname,"\n\n"); ++ + if ( sf & MINIG_SF_CREATE ) + { + dprint("CL Reading entity: ",ftos(num_for_edict(self)), + " classname:",self.classname," enttype:",ftos(self.enttype) ); + dprint(" sf:",ftos(sf)," netname:",self.netname,"\n\n"); + } } #undef ReadFloat #undef ReadString @@@ -280,9 -287,8 +288,8 @@@ string minigame_getWrappedLine(float w if ( take_until > strlen(s) ) take_until = strlen(s); -- - float i; - for ( i = 0; i < take_until; i++ ) ++ + for ( int i = 0; i < take_until; i++ ) if ( substring(s,i,1) == "\n" ) { take_until = i; diff --cc qcsrc/common/minigames/cl_minigames_hud.qc index 7df760979,4bf4b1b3e..b418eb714 --- a/qcsrc/common/minigames/cl_minigames_hud.qc +++ b/qcsrc/common/minigames/cl_minigames_hud.qc @@@ -479,8 -484,7 +484,7 @@@ void HUD_MinigameMenu ( HUD_MinigameMenu_DrawEntry(panel_pos,_("Minigames"),hud_fontsize*2,'0.25 0.47 0.72'); panel_pos_y += hud_fontsize_y*2; -- - entity e; ++ vector color; vector offset; float itemh; diff --cc qcsrc/common/minigames/minigame/all.qh index ed4ccade0,a63d3335f..2505b142b --- a/qcsrc/common/minigames/minigame/all.qh +++ b/qcsrc/common/minigames/minigame/all.qh @@@ -62,7 -63,7 +63,8 @@@ that .owner is set to the minigame sess #include "nmm.qc" #include "ttt.qc" +//#include "c4.qc" + #include "pong.qc" /** * Registration: @@@ -73,10 -74,9 +75,11 @@@ #define REGISTERED_MINIGAMES \ MINIGAME(nmm, "Nine Men's Morris") \ MINIGAME(ttt, "Tic Tac Toe") \ + MINIGAME(pong, "Pong") \ /*empty line*/ +//MINIGAME(c4, "Connect Four") \ + /** * Set up automatic entity read/write functionality * To ensure that everything is handled automatically, spawn on the server using msle_spawn diff --cc qcsrc/server/cl_client.qc index 067a6e749,e9c9e8615..31547fa69 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@@ -17,23 -17,12 +17,25 @@@ #include "weapons/hitplot.qh" #include "weapons/weaponsystem.qh" +#include "../common/animdecide.qh" + +#include "../common/effects.qh" + #include "../common/net_notice.qh" +#include "../common/physics.qh" + +#include "../common/triggers/subs.qh" +#include "../common/triggers/triggers.qh" +#include "../common/triggers/trigger/secret.qh" + +#include "../common/minigames/sv_minigames.qh" + #include "../common/minigames/sv_minigames.qh" + #include "../common/monsters/sv_monsters.qh" +#include "../common/vehicles/sv_vehicles.qh" + #include "../warpzonelib/server.qh" float c1, c2, c3, c4; @@@ -1584,13 -1388,11 +1586,13 @@@ void UpdateChatBubble( self.chatbubbleentity = spawn(); self.chatbubbleentity.owner = self; self.chatbubbleentity.exteriormodeltoclient = self; + self.chatbubbleentity.alpha = 1; + self.chatbubbleentity.customizeentityforclient = ChatBubbleCustomize; self.chatbubbleentity.think = ChatBubbleThink; self.chatbubbleentity.nextthink = time; - setmodel(self.chatbubbleentity, "models/misc/chatbubble.spr"); // precision set below + setmodel(self.chatbubbleentity, "models/misc/chatbubble.md3"); // precision set below //setorigin(self.chatbubbleentity, self.origin + '0 0 15' + self.maxs_z * '0 0 1'); - setorigin(self.chatbubbleentity, '0 0 15' + self.maxs.z * '0 0 1'); + setorigin(self.chatbubbleentity, '0 0 15' + self.maxs_z * '0 0 1'); setattachment(self.chatbubbleentity, self, ""); // sticks to moving player better, also conserves bandwidth self.chatbubbleentity.mdl = self.chatbubbleentity.model; //self.chatbubbleentity.model = ""; diff --cc qcsrc/server/g_world.qc index d8d1d0a8a,0bde6b2fc..c6a5a0ae9 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@@ -633,10 -611,9 +633,12 @@@ void spawnfunc_worldspawn (void CALL_ACCUMULATED_FUNCTION(RegisterNotifications); CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes); CALL_ACCUMULATED_FUNCTION(RegisterBuffs); + CALL_ACCUMULATED_FUNCTION(RegisterEffects); + + initialize_minigames(); + initialize_minigames(); + ServerProgsDB = db_load(strcat("server.db", autocvar_sessionid)); TemporaryDB = db_create();