From: Mattia Basaglia Date: Thu, 12 Feb 2015 14:35:54 +0000 (+0100) Subject: Rename the minigame definition functions X-Git-Tag: xonotic-v0.8.2~2038^2~23 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a1b328c05f71d4a2f54f9d743dd46c70f5b5e7c8;p=xonotic%2Fxonotic-data.pk3dir.git Rename the minigame definition functions --- diff --git a/qcsrc/common/minigames/cl_minigames.qc b/qcsrc/common/minigames/cl_minigames.qc index 85ddf57ff..6d250ac70 100644 --- a/qcsrc/common/minigames/cl_minigames.qc +++ b/qcsrc/common/minigames/cl_minigames.qc @@ -51,9 +51,9 @@ void initialize_minigames() minig.classname = "minigame_descriptor"; \ minig.netname = strzone(strtolower(#name)); \ minig.message = nicename; \ - minig.minigame_hud_board = minigame_hud_board_##name; \ - minig.minigame_hud_status = minigame_hud_status_##name; \ - minig.minigame_event = minigame_event_##name; \ + minig.minigame_hud_board = name##_hud_board; \ + minig.minigame_hud_status = name##_hud_status; \ + minig.minigame_event = name##_client_event; \ if ( !last_minig ) minigame_descriptors = minig; \ else last_minig.list_next = minig; \ last_minig = minig; diff --git a/qcsrc/common/minigames/minigame/all.qh b/qcsrc/common/minigames/minigame/all.qh index 4085a96ac..6b19121bd 100644 --- a/qcsrc/common/minigames/minigame/all.qh +++ b/qcsrc/common/minigames/minigame/all.qh @@ -17,17 +17,17 @@ Required functions ------------------ SVQC: - int minigame_event_(entity minigame, string event, ...count) + int _server_event(entity minigame, string event, ...count) see ../minigames.qh for a detailed explanation CSQC: - void minigame_hud_board_(vector pos, vector mySize) + void _hud_board(vector pos, vector mySize) draws the main game board inside the rectangle defined by pos and mySize (That rectangle is expressed in window coordinates) - void minigame_hud_status_(vector pos, vector mySize) + void _hud_status(vector pos, vector mySize) draws the game status panel inside the rectangle defined by pos and mySize (That rectangle is expressed in window coordinates) This panel shows eg scores, captured pieces and so on - int minigame_event_(entity minigame, string event, ...count) + int _client_event(entity minigame, string event, ...count) see ../minigames.qh for a detailed explanation Managing entities diff --git a/qcsrc/common/minigames/minigame/nmm.qc b/qcsrc/common/minigames/minigame/nmm.qc index eb27646fd..fc5df6bc5 100644 --- a/qcsrc/common/minigames/minigame/nmm.qc +++ b/qcsrc/common/minigames/minigame/nmm.qc @@ -211,7 +211,7 @@ int nmm_count_pieces(entity minigame, int teamn, int pieceflags) } // required function, handle server side events -int minigame_event_nmm(entity minigame, string event, ...) +int nmm_server_event(entity minigame, string event, ...) { if ( event == "start" ) { @@ -425,7 +425,7 @@ bool nmm_draw_avaliable(entity tile) } // Required function, draw the game board -void minigame_hud_board_nmm(vector pos, vector mySize) +void nmm_hud_board(vector pos, vector mySize) { minigame_hud_fitsqare(pos, mySize); nmm_boardpos = pos; @@ -493,7 +493,7 @@ void minigame_hud_board_nmm(vector pos, vector mySize) } // Required function, draw the game status panel -void minigame_hud_status_nmm(vector pos, vector mySize) +void nmm_hud_status(vector pos, vector mySize) { HUD_Panel_DrawBg(1); vector ts; @@ -616,7 +616,7 @@ string nmm_turn_to_string(int turnflags) } // Required function, handle client events -int minigame_event_nmm(entity minigame, string event, ...) +int nmm_client_event(entity minigame, string event, ...) { if ( event == "activate" ) { diff --git a/qcsrc/common/minigames/minigame/pong.qc b/qcsrc/common/minigames/minigame/pong.qc index 649c98415..5ba05f7eb 100644 --- a/qcsrc/common/minigames/minigame/pong.qc +++ b/qcsrc/common/minigames/minigame/pong.qc @@ -188,7 +188,7 @@ vector pong_team_to_paddlepos(int nteam) } // required function, handle server side events -int minigame_event_pong(entity minigame, string event, ...) +int pong_server_event(entity minigame, string event, ...) { switch (event) { @@ -297,7 +297,7 @@ vector pong_team_to_color(int nteam) } // Required function, draw the game board -void minigame_hud_board_pong(vector pos, vector mySize) +void pong_hud_board(vector pos, vector mySize) { minigame_hud_fitsqare(pos, mySize); minigame_hud_simpleboard(pos,mySize,minigame_texture("pong/board")); @@ -337,7 +337,7 @@ void minigame_hud_board_pong(vector pos, vector mySize) // Required function, draw the game status panel -void minigame_hud_status_pong(vector pos, vector mySize) +void pong_hud_status(vector pos, vector mySize) { HUD_Panel_DrawBg(1); vector ts; @@ -387,7 +387,7 @@ string pong_message(int mgflags) } // Required function, handle client events -int minigame_event_pong(entity minigame, string event, ...) +int pong_client_event(entity minigame, string event, ...) { switch(event) { diff --git a/qcsrc/common/minigames/minigame/ttt.qc b/qcsrc/common/minigames/minigame/ttt.qc index 2823d6830..91da259b4 100644 --- a/qcsrc/common/minigames/minigame/ttt.qc +++ b/qcsrc/common/minigames/minigame/ttt.qc @@ -125,7 +125,7 @@ void ttt_next_match(entity minigame, entity player) // required function, handle server side events -int minigame_event_ttt(entity minigame, string event, ...) +int ttt_server_event(entity minigame, string event, ...) { switch(event) { @@ -212,7 +212,7 @@ vector ttt_boardsize;// HUD board size .int ttt_checkwin; // Used to optimize checks to display a win // Required function, draw the game board -void minigame_hud_board_ttt(vector pos, vector mySize) +void ttt_hud_board(vector pos, vector mySize) { minigame_hud_fitsqare(pos, mySize); ttt_boardpos = pos; @@ -264,7 +264,7 @@ void minigame_hud_board_ttt(vector pos, vector mySize) // Required function, draw the game status panel -void minigame_hud_status_ttt(vector pos, vector mySize) +void ttt_hud_status(vector pos, vector mySize) { HUD_Panel_DrawBg(1); vector ts; @@ -541,7 +541,7 @@ void ttt_set_curr_pos(string s) } // Required function, handle client events -int minigame_event_ttt(entity minigame, string event, ...) +int ttt_client_event(entity minigame, string event, ...) { switch(event) { diff --git a/qcsrc/common/minigames/sv_minigames.qc b/qcsrc/common/minigames/sv_minigames.qc index f047c9269..40332796e 100644 --- a/qcsrc/common/minigames/sv_minigames.qc +++ b/qcsrc/common/minigames/sv_minigames.qc @@ -277,7 +277,7 @@ void initialize_minigames() minig.classname = "minigame_descriptor"; \ minig.netname = #name; \ minig.message = nicename; \ - minig.minigame_event = minigame_event_##name; \ + minig.minigame_event = name##_server_event; \ if ( !last_minig ) minigame_descriptors = minig; \ else last_minig.list_next = minig; \ last_minig = minig;