X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fminigame%2Fsnake.qc;h=cd45ed96d6662cada5cdf4d9f669ded4a4e1e61d;hb=c039d054a46888048d214000273ccfc63e4611b6;hp=98729092ccd2894c10a172c687439fc69c521457;hpb=eac60648c4017e495060dd3ba9e50ac4bad5000a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/minigames/minigame/snake.qc b/qcsrc/common/minigames/minigame/snake.qc
index 98729092c..cd45ed96d 100644
--- a/qcsrc/common/minigames/minigame/snake.qc
+++ b/qcsrc/common/minigames/minigame/snake.qc
@@ -1,3 +1,4 @@
+#include "snake.qh"
 REGISTER_MINIGAME(snake, "Snake"); // SNAAAAKE
 
 const float SNAKE_TURN_MOVE  = 0x0100; // the snake is moving, player must control it
@@ -38,7 +39,7 @@ int autocvar_sv_minigames_snake_lives = 3;
 bool snake_alone(entity minig)
 {
 	int headcount = 0;
-	entity e = world;
+	entity e = NULL;
 	while ( ( e = findentity(e,owner,minig) ) )
 		if ( e.classname == "minigame_board_piece" && e.cnt == 1 )
 			++headcount;
@@ -49,21 +50,21 @@ bool snake_alone(entity minig)
 // find same game piece given its tile name
 entity snake_find_piece(entity minig, string tile)
 {
-	entity e = world;
+	entity e = NULL;
 	while ( ( e = findentity(e,owner,minig) ) )
 		if ( e.classname == "minigame_board_piece" && e.netname == tile )
 			return e;
-	return world;
+	return NULL;
 }
 
 // find same game piece given its cnt
 entity snake_find_cnt(entity minig, int steam, int tile)
 {
-	entity e = world;
+	entity e = NULL;
 	while ( ( e = findentity(e,owner,minig) ) )
 		if ( e.classname == "minigame_board_piece" && e.cnt == tile && e.team == steam )
 			return e;
-	return world;
+	return NULL;
 }
 
 // check if the tile name is valid (15x15 grid)
@@ -78,11 +79,11 @@ bool snake_valid_tile(string tile)
 
 entity snake_find_head(entity minig, int steam)
 {
-	entity e = world;
+	entity e = NULL;
 	while ( ( e = findentity(e,owner,minig) ) )
 		if ( e.classname == "minigame_board_piece" && e.cnt == 1 && e.team == steam )
 			return e;
-	return world;
+	return NULL;
 }
 
 void snake_new_mouse(entity minigame)
@@ -94,7 +95,7 @@ void snake_new_mouse(entity minigame)
 	{
 		string pos = minigame_tile_buildname(i, j);
 		if(!snake_find_piece(minigame, pos))
-			RandomSelection_Add(world, 0, pos, 1, 1);
+			RandomSelection_Add(NULL, 0, pos, 1, 1);
 	}
 
 	entity piece = msle_spawn(minigame,"minigame_board_piece");
@@ -174,15 +175,15 @@ void minigame_setup_snake(entity minigame, int pteam)
 	{
 		string pos = minigame_tile_buildname(i, j);
 		if(!snake_find_piece(minigame, pos))
-			RandomSelection_Add(world, 0, pos, 1, 1);
+			RandomSelection_Add(NULL, 0, pos, 1, 1);
 	}
 
 	entity piece = msle_spawn(minigame,"minigame_board_piece");
 	piece.team = pteam;
 	piece.netname = strzone(RandomSelection_chosen_string);
 	piece.cnt = 1;
-	piece.snake_next = world;
-	piece.snake_prev = world;
+	piece.snake_next = NULL;
+	piece.snake_prev = NULL;
 	piece.snake_last = piece;
 	setthink(piece, snake_head_think);
 	piece.snake_delay = autocvar_sv_minigames_snake_delay_initial;
@@ -203,13 +204,13 @@ entity snake_get_player(entity minigame, int pteam)
 #ifdef SVQC
 	for(e = minigame.minigame_players; e; e = e.list_next)
 #elif defined(CSQC)
-	e = world;
+	e = NULL;
 	while( (e = findentity(e,owner,minigame)) )
 		if ( e.classname == "minigame_player" )
 #endif
 	if(e.team == pteam)
 		return e;
-	return world;
+	return NULL;
 }
 
 void snake_add_score(entity minigame, int pteam, int thescore)
@@ -255,7 +256,7 @@ void snake_move_body(entity minigame, entity head, bool ate_mouse)
 		piece.team = head.team;
 		piece.snake_prev = tail;
 		piece.snake_dir = tail.snake_dir;
-		piece.snake_next = world;
+		piece.snake_next = NULL;
 		piece.snake_tail = true;
 		piece.netname = strzone(tail.netname);
 
@@ -282,12 +283,12 @@ void snake_eat_team(entity minigame, int pteam)
 
 	head.nextthink = time + 1; // make sure they don't to eat us somehow
 
-	entity e = world;
+	entity e = NULL;
 	while ( ( e = findentity(e,owner,minigame) ) )
 		if ( e.classname == "minigame_board_piece" && e.cnt && e.team == pteam )
 		{
 			if(e.netname) { strunzone(e.netname); }
-			remove(e);
+			delete(e);
 		}
 
 	if(minigame.snake_lives[pteam] <= 0)
@@ -354,7 +355,7 @@ void snake_move_head(entity minigame, entity head)
 	if(ate_mouse)
 	{
 		if(hit.netname) { strunzone(hit.netname); }
-		remove(hit);
+		delete(hit);
 
 		snake_new_mouse(minigame);
 	}
@@ -420,12 +421,12 @@ int snake_server_event(entity minigame, string event, ...)
 		}
 		case "end":
 		{
-			entity e = world;
+			entity e = NULL;
 			while( (e = findentity(e, owner, minigame)) )
 			if(e.classname == "minigame_board_piece")
 			{
 				if(e.netname) { strunzone(e.netname); }
-				remove(e);
+				delete(e);
 			}
 			return false;
 		}
@@ -673,7 +674,7 @@ void snake_hud_board(vector pos, vector mySize)
 // Required function, draw the game status panel
 void snake_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);