X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fminigame%2Fpong.qc;h=dd57fb5c66886c846458d3991ce1eef96f1707c2;hp=5074dccffd7131d0c693e3b0d8ffba686e7c7b3a;hb=34e7f534e2015466228eb3a78c9857741b736dca;hpb=304b8158c9b753dd5674d055a1b91bd5472a66b8 diff --git a/qcsrc/common/minigames/minigame/pong.qc b/qcsrc/common/minigames/minigame/pong.qc index 5074dccff..dd57fb5c6 100644 --- a/qcsrc/common/minigames/minigame/pong.qc +++ b/qcsrc/common/minigames/minigame/pong.qc @@ -1,3 +1,4 @@ +#include "pong.qh" REGISTER_MINIGAME(pong, "Pong"); // minigame flags @@ -36,7 +37,7 @@ float autocvar_sv_minigames_pong_ball_number; float autocvar_sv_minigames_pong_ai_thinkspeed; float autocvar_sv_minigames_pong_ai_tolerance; -void pong_ball_think(); +void pong_ball_think(entity this); // Throws a ball in a random direction and sets the think function void pong_ball_throw(entity ball) @@ -47,16 +48,16 @@ void pong_ball_throw(entity ball) while ( fabs(sin(angle)) < 0.17 || fabs(cos(angle)) < 0.17 ); ball.velocity_x = cos(angle)*autocvar_sv_minigames_pong_ball_speed; ball.velocity_y = sin(angle)*autocvar_sv_minigames_pong_ball_speed; - ball.think = pong_ball_think; + setthink(ball, pong_ball_think); ball.nextthink = time; ball.team = 0; ball.SendFlags |= MINIG_SF_UPDATE|PONG_SF_BALLTEAM; } // Think equivalent of pong_ball_throw, used to delay throws -void pong_ball_throwthink() -{SELFPARAM(); - pong_ball_throw(self); +void pong_ball_throwthink(entity this) +{ + pong_ball_throw(this); } // Moves ball to the center and stops its motion @@ -64,10 +65,10 @@ void pong_ball_reset(entity ball) { ball.velocity = '0 0 0'; ball.origin = '0.5 0.5 0'; - ball.think = SUB_NullThink; + setthink(ball, SUB_NullThink); ball.team = 0; ball.SendFlags |= MINIG_SF_UPDATE|PONG_SF_BALLTEAM; - ball.think = pong_ball_throwthink; + setthink(ball, pong_ball_throwthink); ball.nextthink = time + autocvar_sv_minigames_pong_ball_wait; } @@ -145,8 +146,8 @@ bool pong_goal(entity ball, int pteam) } // Moves the ball around -void pong_ball_think() -{SELFPARAM(); +void pong_ball_think(entity this) +{ float think_speed = autocvar_sys_ticrate; this.nextthink = time + think_speed; @@ -201,16 +202,16 @@ void pong_ball_think() } // AI action -void pong_ai_think() -{SELFPARAM(); +void pong_ai_think(entity this) +{ float think_speed = autocvar_sv_minigames_pong_ai_thinkspeed; this.nextthink = time + think_speed; float distance; float next_distance; float min_distance = 1; - entity ball = world; - entity mayball = world; + entity ball = NULL; + entity mayball = NULL; while ( ( mayball = findentity(mayball,owner,this.owner) ) ) if ( mayball.classname == "pong_ball" ) { @@ -256,7 +257,7 @@ entity pong_ai_spawn(entity paddle) entity ai = msle_spawn(paddle.owner,"pong_ai"); ai.minigame_players = ai; ai.team = paddle.team; - ai.think = pong_ai_think; + setthink(ai, pong_ai_think); ai.nextthink = time; ai.pong_ai_paddle = paddle; @@ -266,8 +267,8 @@ entity pong_ai_spawn(entity paddle) } // Moves the paddle -void pong_paddle_think() -{SELFPARAM(); +void pong_paddle_think(entity this) +{ float think_speed = autocvar_sys_ticrate; this.nextthink = time + think_speed; @@ -309,19 +310,19 @@ vector pong_team_to_paddlepos(int nteam) } // Spawns a pong paddle -// if real_player is world, the paddle is controlled by AI +// if real_player is NULL, the paddle is controlled by AI entity pong_paddle_spawn(entity minigame, int pl_team, entity real_player) { entity paddle = msle_spawn(minigame,"pong_paddle"); paddle.pong_length = autocvar_sv_minigames_pong_paddle_size; paddle.origin = pong_team_to_paddlepos(pl_team); - paddle.think = pong_paddle_think; + setthink(paddle, pong_paddle_think); paddle.nextthink = time; paddle.team = pl_team; paddle.mins = pong_team_to_box_halfsize(pl_team,-paddle.pong_length,-1/16); paddle.maxs = pong_team_to_box_halfsize(pl_team,paddle.pong_length,1/16); - if ( real_player == world ) + if ( real_player == NULL ) pong_ai_spawn(paddle); else paddle.realowner = real_player; @@ -352,7 +353,7 @@ int pong_server_event(entity minigame, string event, ...) int i; for ( i = 0; i < PONG_MAX_PLAYERS; i++ ) { - if ( minigame.pong_paddles[i] == world ) + if ( minigame.pong_paddles[i] == NULL ) { pong_paddle_spawn(minigame,i+1,player); return i+1; @@ -370,7 +371,7 @@ int pong_server_event(entity minigame, string event, ...) for ( i = 0; i < PONG_MAX_PLAYERS; i++ ) { paddle = minigame.pong_paddles[i]; - if ( paddle != world && paddle.realowner == player ) + if ( paddle != NULL && paddle.realowner == player ) { ai = pong_ai_spawn(paddle); ai.pong_score = player.minigame_players.pong_score; @@ -420,9 +421,9 @@ int pong_server_event(entity minigame, string event, ...) if ( minigame.minigame_flags & PONG_STATUS_WAIT ) for ( i = 0; i < PONG_MAX_PLAYERS; i++ ) { - if ( minigame.pong_paddles[i] == world ) + if ( minigame.pong_paddles[i] == NULL ) { - pong_paddle_spawn(minigame,i+1,world); + pong_paddle_spawn(minigame,i+1,NULL); return true; } } @@ -438,12 +439,12 @@ int pong_server_event(entity minigame, string event, ...) for ( i = PONG_MAX_PLAYERS-1; i >= 0; i-- ) { paddle = minigame.pong_paddles[i]; - if ( paddle != world && + if ( paddle != NULL && paddle.realowner.classname == "pong_ai" ) { - minigame.pong_paddles[i] = world; - remove(paddle.realowner); - remove(paddle); + minigame.pong_paddles[i] = NULL; + delete(paddle.realowner); + delete(paddle); return true; } } @@ -542,7 +543,7 @@ void pong_hud_board(vector pos, vector mySize) // Required function, draw the game status panel void pong_hud_status(vector pos, vector mySize) { - HUD_Panel_DrawBg(1); + HUD_Panel_DrawBg(); vector ts; ts = minigame_drawstring_wrapped(mySize_x,pos,active_minigame.descriptor.message, hud_fontsize * 2, '0.25 0.47 0.72', panel_fg_alpha, DRAWFLAG_NORMAL,0.5);