X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fminigame%2Fbd.qc;h=8ab37af13c8d26ad260238805cf2d4a287f431de;hb=45d8904a100765555e622598a39967963733df1d;hp=041e56339c3039be7f7207c642510a7638202951;hpb=9185b58da6fe5f2b095d7066577e1e024b4d2798;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/minigames/minigame/bd.qc b/qcsrc/common/minigames/minigame/bd.qc
index 041e56339..8ab37af13 100644
--- a/qcsrc/common/minigames/minigame/bd.qc
+++ b/qcsrc/common/minigames/minigame/bd.qc
@@ -1,12 +1,18 @@
+#include "bd.qh"
 REGISTER_MINIGAME(bd, "Bulldozer");
 
+REGISTER_NET_LINKED(ENT_CLIENT_BD_CONTROLLER)
+
 const int BD_TURN_MOVE  = 0x0100; // player must move the bulldozer
 const int BD_TURN_WIN   = 0x0200; // victory
 const int BD_TURN_LOSS  = 0x0400; // they did it?!
 const int BD_TURN_EDIT  = 0x0800; // editing mode
 const int BD_TURN_TYPE  = 0x0f00; // turn type mask
 
+// send flags
 const int BD_SF_PLAYERMOVES = MINIG_SF_CUSTOM;
+const int BD_SF_UPDATE_SINGLE = MINIG_SF_CUSTOM<<1;
+const int BD_SF_UPDATE_ALL = MINIG_SF_CUSTOM<<2;
 
 // 240 tiles...
 const int BD_LET_CNT = 20;
@@ -16,17 +22,24 @@ const int BD_TILE_SIZE = 20;
 
 const int BD_TEAMS = 1;
 
-.vector bd_dir;
+.int bd_dir;
+
+.int bd_dirs[BD_NUM_CNT];
 
 .int bd_moves;
 
+.int bd_tilelet;
+
 .string bd_levelname;
 .string bd_nextlevel;
 
 #ifdef SVQC
 .bool bd_canedit;
+.int bd_forceupdate;
 #endif
 
+.int bd_tiletypes[BD_NUM_CNT];
+
 .int bd_tiletype;
 const int BD_TILE_DOZER = 1;
 const int BD_TILE_TARGET = 2;
@@ -41,7 +54,14 @@ const int BD_TILE_BRICK7 = 10;
 const int BD_TILE_BRICK8 = 11;
 const int BD_TILE_LAST = 11;
 
+const int BD_DIR_UP = 0;
+const int BD_DIR_DN = 1;
+const int BD_DIR_LF = 2;
+const int BD_DIR_RT = 3;
+
+#ifdef SVQC
 string autocvar_sv_minigames_bulldozer_startlevel = "level1";
+#endif
 
 // find same game piece given its tile name
 entity bd_find_piece(entity minig, string tile, bool check_target)
@@ -53,6 +73,15 @@ entity bd_find_piece(entity minig, string tile, bool check_target)
 	return NULL;
 }
 
+entity bd_find_controller(entity minig, int letter)
+{
+	entity e = NULL;
+	while ( ( e = findentity(e,owner,minig) ) )
+		if ( e.classname == "bd_controller" && e.bd_tilelet == letter )
+			return e;
+	return NULL;
+}
+
 // check if the tile name is valid (15x15 grid)
 bool bd_valid_tile(string tile)
 {
@@ -63,6 +92,14 @@ bool bd_valid_tile(string tile)
 	return 0 <= number && number < BD_NUM_CNT && 0 <= letter && letter < BD_LET_CNT;
 }
 
+void bd_controller_update(entity controller, int number)
+{
+#ifdef SVQC
+	controller.bd_forceupdate = number;
+#endif
+	minigame_server_sendflags(controller,BD_SF_UPDATE_SINGLE);
+}
+
 entity bd_find_dozer(entity minig)
 {
 	entity e = NULL;
@@ -72,6 +109,71 @@ entity bd_find_dozer(entity minig)
 	return NULL;
 }
 
+#ifdef SVQC
+bool bd_controller_send(entity this, entity to, int sf)
+{
+	WriteHeader(MSG_ENTITY, ENT_CLIENT_BD_CONTROLLER);
+	if(sf & BD_SF_UPDATE_ALL)
+		sf &= ~BD_SF_UPDATE_SINGLE;
+
+	WriteByte(MSG_ENTITY, sf);
+	WriteByte(MSG_ENTITY, this.bd_tilelet);
+	WriteString(MSG_ENTITY,this.owner.netname);
+
+	if(sf & BD_SF_UPDATE_SINGLE)
+	{
+		int number = this.bd_forceupdate;
+		//this.bd_forceupdate = 0;
+		int ttype = this.bd_tiletypes[number];
+		int dir = this.bd_dirs[number];
+		WriteByte(MSG_ENTITY, number);
+		WriteByte(MSG_ENTITY, ttype);
+		WriteByte(MSG_ENTITY, dir);
+	}
+
+	if(sf & BD_SF_UPDATE_ALL)
+	{
+		for(int j = 0; j < BD_NUM_CNT; ++j)
+		{
+			int ttype = this.bd_tiletypes[j];
+			int dir = this.bd_dirs[j];
+			WriteByte(MSG_ENTITY, ttype);
+			WriteByte(MSG_ENTITY, dir);
+		}
+	}
+
+	return true;
+}
+#elif defined(CSQC)
+void minigame_read_owner(entity this);
+
+NET_HANDLE(ENT_CLIENT_BD_CONTROLLER, bool isNew)
+{
+	this.classname = "bd_controller";
+	return = true;
+
+	int sf = ReadByte();
+	this.bd_tilelet = ReadByte();
+	minigame_read_owner(this);
+
+	if(sf & BD_SF_UPDATE_SINGLE)
+	{
+		int number = ReadByte();
+		this.bd_tiletypes[number] = ReadByte();
+		this.bd_dirs[number] = ReadByte();
+	}
+
+	if(sf & BD_SF_UPDATE_ALL)
+	{
+		for(int j = 0; j < BD_NUM_CNT; ++j)
+		{
+			this.bd_tiletypes[j] = ReadByte();
+			this.bd_dirs[j] = ReadByte();
+		}
+	}
+}
+#endif
+
 void bd_check_winner(entity minig)
 {
 	int total = 0, valid = 0;
@@ -91,6 +193,44 @@ void bd_check_winner(entity minig)
 	}
 }
 
+vector bd_get_dir(int bdir)
+{
+	switch(bdir)
+	{
+		case BD_DIR_UP: return '0 1 0'; // up
+		default:
+		case BD_DIR_DN: return '0 -1 0'; // down
+		case BD_DIR_LF: return '-1 0 0'; // left
+		case BD_DIR_RT: return '1 0 0'; // right
+	}
+}
+
+string bd_get_dir_name(int bdir)
+{
+	switch(bdir)
+	{
+		case BD_DIR_UP: return "u"; // up
+		default:
+		case BD_DIR_DN: return "d"; // down
+		case BD_DIR_LF: return "l"; // left
+		case BD_DIR_RT: return "r"; // right
+	}
+}
+
+int bd_dir_fromname(string bdir)
+{
+	if(bdir == "up" || bdir == "u")
+		return BD_DIR_UP; // up
+	if(bdir == "down" || bdir == "dn" || bdir == "d")
+		return BD_DIR_DN; /// down
+	if(bdir == "left" || bdir == "lt" || bdir == "l")
+		return BD_DIR_LF; // left
+	if(bdir == "right" || bdir == "rt" || bdir == "r")
+		return BD_DIR_RT; // right
+
+	return BD_DIR_DN; // down
+}
+
 bool bd_canfill(int ttype)
 {
 	switch(ttype)
@@ -110,21 +250,23 @@ bool bd_canfill(int ttype)
 
 bool bd_move_dozer(entity minigame, entity dozer)
 {
-	if(!dozer.bd_dir_x && !dozer.bd_dir_y)
-		return false; // nope!
+	//if(!dozer.bd_dir)
+		//return false; // nope!
 
 	int myx = minigame_tile_letter(dozer.netname);
 	int myy = minigame_tile_number(dozer.netname);
 
-	myx += dozer.bd_dir_x;
-	myy += dozer.bd_dir_y;
+	vector dir = bd_get_dir(dozer.bd_dir);
 
-	string newpos = minigame_tile_buildname(myx, myy);
-	entity hit = bd_find_piece(minigame, newpos, false);
+	myx += dir.x;
+	myy += dir.y;
 
+	string newpos = minigame_tile_buildname(myx, myy);
 	if(!bd_valid_tile(newpos))
 		return false;
 
+	entity hit = bd_find_piece(minigame, newpos, false);
+
 	if(hit)
 	switch(hit.bd_tiletype)
 	{
@@ -143,24 +285,51 @@ bool bd_move_dozer(entity minigame, entity dozer)
 			int tx = minigame_tile_letter(hit.netname);
 			int ty = minigame_tile_number(hit.netname);
 
-			tx += dozer.bd_dir_x;
-			ty += dozer.bd_dir_y;
+			tx += dir.x;
+			ty += dir.y;
 
 			testpos = minigame_tile_buildname(tx, ty);
+			if(!bd_valid_tile(testpos))
+				return false;
 			entity testhit = bd_find_piece(minigame, testpos, false);
-
-			if(!bd_valid_tile(testpos) || testhit)
+			if(testhit)
 				return false;
 
-			if(hit.netname) { strunzone(hit.netname); }
-			hit.netname = strzone(testpos);
+			entity controller = bd_find_controller(minigame, minigame_tile_letter(testpos));
+			int tnum = minigame_tile_number(testpos);
+			switch(controller.bd_tiletypes[tnum])
+			{
+				case BD_TILE_BRICK8:
+				case BD_TILE_BRICK7:
+				case BD_TILE_BRICK6:
+				case BD_TILE_BRICK5:
+				case BD_TILE_BRICK4:
+				case BD_TILE_BRICK3:
+				case BD_TILE_BRICK2:
+				case BD_TILE_BRICK1: return false;
+			}
+
+			strcpy(hit.netname, testpos);
 			minigame_server_sendflags(hit,MINIG_SF_UPDATE);
 			break;
 		}
 	}
 
-	if(dozer.netname) { strunzone(dozer.netname); }
-	dozer.netname = strzone(newpos);
+	entity controller = bd_find_controller(minigame, minigame_tile_letter(newpos));
+	int number = minigame_tile_number(newpos);
+	switch(controller.bd_tiletypes[number])
+	{
+		case BD_TILE_BRICK8:
+		case BD_TILE_BRICK7:
+		case BD_TILE_BRICK6:
+		case BD_TILE_BRICK5:
+		case BD_TILE_BRICK4:
+		case BD_TILE_BRICK3:
+		case BD_TILE_BRICK2:
+		case BD_TILE_BRICK1: return false;
+	}
+
+	strcpy(dozer.netname, newpos);
 
 	return true;
 }
@@ -177,28 +346,19 @@ void bd_move(entity minigame, entity player, string dir)
 			entity dozer = bd_find_dozer(minigame);
 			if(!dozer)
 			{
-				LOG_INFO("Dozer wasn't found!\n");
+				LOG_INFO("Dozer wasn't found!");
 				return; // should not happen... TODO: end match?
 			}
 
-			int dxs = 0, dys = 0;
 			string thedir = strtolower(dir);
-			if(thedir == "up" || thedir == "u") { dxs = 0; dys = 1; }
-			if(thedir == "down" || thedir == "dn" || thedir == "d") { dxs = 0; dys = -1; }
-			if(thedir == "left" || thedir == "lt" || thedir == "l") { dxs = -1; dys = 0; }
-			if(thedir == "right" || thedir == "rt" || thedir == "r") { dxs = 1; dys = 0; }
-
-			int dx = bound(-1, dxs, 1);
-			int dy = bound(-1, dys, 1);
+			int bdir = bd_dir_fromname(thedir);
 
 			int moved = 0;
 			entity e = NULL;
 			while ( ( e = findentity(e,owner,minigame) ) )
 				if ( e.classname == "minigame_board_piece" && e.bd_tiletype == BD_TILE_DOZER )
 				{
-					e.bd_dir_x = dx;
-					e.bd_dir_y = dy;
-					e.bd_dir_z = 0;
+					e.bd_dir = bdir;
 
 					if(bd_move_dozer(minigame, e))
 						++moved;
@@ -230,19 +390,10 @@ void bd_editor_place(entity minigame, entity player, string pos, int thetile, st
 
 			if(found_piece.bd_tiletype == BD_TILE_DOZER && thedir != "")
 			{
-				int dxs = 0, dys = 0;
 				string newdir = strtolower(thedir);
-				if(newdir == "up" || newdir == "u") { dxs = 0; dys = 1; }
-				if(newdir == "down" || newdir == "dn" || newdir == "d") { dxs = 0; dys = -1; }
-				if(newdir == "left" || newdir == "lt" || newdir == "l") { dxs = -1; dys = 0; }
-				if(newdir == "right" || newdir == "rt" || newdir == "r") { dxs = 1; dys = 0; }
-
-				int dx = bound(-1, dxs, 1);
-				int dy = bound(-1, dys, 1);
+				int bdir = bd_dir_fromname(newdir);
 
-				found_piece.bd_dir_x = dx;
-				found_piece.bd_dir_y = dy;
-				found_piece.bd_dir_z = 0;
+				found_piece.bd_dir = bdir;
 				minigame_server_sendflags(found_piece,MINIG_SF_UPDATE); // update anyway
 				return;
 			}
@@ -251,6 +402,17 @@ void bd_editor_place(entity minigame, entity player, string pos, int thetile, st
 			//if(dozer && thetile == BD_TILE_DOZER && pos != dozer.netname)
 				//return; // nice try
 
+			int tlet = minigame_tile_letter(pos);
+			int tnum = minigame_tile_number(pos);
+			entity controller = bd_find_controller(minigame, tlet);
+			if(controller.bd_tiletypes[tnum])
+			{
+				controller.bd_tiletypes[tnum] = 0;
+				controller.bd_dirs[tnum] = 0;
+				bd_controller_update(controller, tnum);
+				return;
+			}
+
 			if(found_piece || (targ && thetile != BD_TILE_BOULDER))
 			{
 				entity piece = bd_find_piece(minigame, pos, false);
@@ -258,18 +420,30 @@ void bd_editor_place(entity minigame, entity player, string pos, int thetile, st
 				if(!piece)
 					return; // how?!
 
-				if(piece.netname) { strunzone(piece.netname); }
+				strfree(piece.netname);
 				delete(piece);
 				minigame_server_sendflags(minigame,MINIG_SF_UPDATE);
 				return;
 			}
 
-			entity piece = msle_spawn(minigame,"minigame_board_piece");
-			piece.team = 1;
-			piece.netname = strzone(pos);
-			piece.bd_tiletype = thetile;
-			piece.bd_dir = '0 -1 0';
-			minigame_server_sendflags(piece,MINIG_SF_UPDATE);
+			if(bd_canfill(thetile))
+			{
+				int number = minigame_tile_number(pos);
+				int letter = minigame_tile_letter(pos);
+				entity controller = bd_find_controller(minigame, letter);
+				controller.bd_tiletypes[number] = thetile;
+				controller.bd_dirs[number] = 0;
+				bd_controller_update(controller, number);
+			}
+			else
+			{
+				entity piece = msle_spawn(minigame,"minigame_board_piece");
+				piece.team = 1;
+				piece.netname = strzone(pos);
+				piece.bd_tiletype = thetile;
+				piece.bd_dir = 0;
+				minigame_server_sendflags(piece,MINIG_SF_UPDATE);
+			}
 
 			minigame_server_sendflags(minigame,MINIG_SF_UPDATE);
 		}
@@ -312,12 +486,12 @@ void bd_unfill_recurse(entity minigame, entity player, int thetype, int letter,
 
 	if(targ && thetype == targ.bd_tiletype)
 	{
-		if(targ.netname) { strunzone(targ.netname); }
+		strfree(targ.netname);
 		delete(targ);
 	}
 	else if(piece && thetype == piece.bd_tiletype)
 	{
-		if(piece.netname) { strunzone(piece.netname); }
+		strfree(piece.netname);
 		delete(piece);
 	}
 	else return;
@@ -392,10 +566,26 @@ void bd_setup_pieces(entity minigame)
 	while( (e = findentity(e, owner, minigame)) )
 		if(e.classname == "minigame_board_piece")
 		{
-			if(e.netname) { strunzone(e.netname); }
+			strfree(e.netname);
+			delete(e);
+		}
+	e = NULL;
+	while( (e = findentity(e, owner, minigame)) )
+		if(e.classname == "bd_controller")
+		{
 			delete(e);
 		}
 
+	for(int letter = 0; letter < BD_LET_CNT; ++letter)
+	{
+		entity controller = new_pure(bd_controller);
+		controller.owner = minigame;
+		controller.bd_tilelet = letter;
+	#ifdef SVQC
+		Net_LinkEntity(controller, false, 0, bd_controller_send);
+	#endif
+	}
+
 	bd_load_level(minigame);
 }
 
@@ -406,8 +596,7 @@ void bd_do_next_match(entity minigame, entity player)
 
 	if(minigame.bd_nextlevel && minigame.bd_nextlevel != "")
 	{
-		if(minigame.bd_levelname) { strunzone(minigame.bd_levelname); }
-		minigame.bd_levelname = strzone(minigame.bd_nextlevel);
+		strcpy(minigame.bd_levelname, minigame.bd_nextlevel);
 	}
 
 	bd_setup_pieces(minigame);
@@ -417,8 +606,7 @@ void bd_do_next_match(entity minigame, entity player)
 
 void bd_set_next_match(entity minigame, string next)
 {
-	if(minigame.bd_nextlevel) { strunzone(minigame.bd_nextlevel); }
-	minigame.bd_nextlevel = strzone(next);
+	strcpy(minigame.bd_nextlevel, next);
 }
 
 void bd_next_match(entity minigame, entity player, string next)
@@ -458,13 +646,26 @@ void bd_activate_editor(entity minigame, entity player)
 	bd_setup_pieces(minigame);
 }
 
+string bd_save_controller_piece(entity minigame, entity e, int number)
+{
+	string bd_string = "";
+
+	string tilename = minigame_tile_buildname(e.bd_tilelet, number);
+
+	bd_string = strcat(bd_string, "\"", tilename, "\" ");
+	bd_string = strcat(bd_string, ftos(e.bd_tiletypes[number]), " ");
+	bd_string = strcat(bd_string, ftos(e.bd_dirs[number]));
+
+	return bd_string;
+}
+
 string bd_save_piece(entity minigame, entity e)
 {
 	string bd_string = "";
 
 	bd_string = strcat(bd_string, "\"", e.netname, "\" ");
 	bd_string = strcat(bd_string, ftos(e.bd_tiletype), " ");
-	bd_string = strcat(bd_string, sprintf("\"%.9v\"", e.bd_dir));
+	bd_string = strcat(bd_string, ftos(e.bd_dir));
 
 	return bd_string;
 }
@@ -473,29 +674,50 @@ void bd_set_nextlevel(entity minigame, string s)
 {
 	tokenize_console(s);
 
-	if(minigame.bd_nextlevel) { strunzone(minigame.bd_nextlevel); }
-	minigame.bd_nextlevel = strzone(argv(2));
+	strcpy(minigame.bd_nextlevel, argv(2));
 }
 
-entity bd_load_piece(entity minigame, string s)
+int bd_fix_dir(vector dir)
+{
+	if(dir.x == 0 && dir.y == 1) { return BD_DIR_UP; } // up
+	if(dir.x == 0 && dir.y == -1) { return BD_DIR_DN; } // down
+	if(dir.x == -1 && dir.y == 0) { return BD_DIR_LF; } // left
+	if(dir.x == 1 && dir.y == 0) { return BD_DIR_RT; } // right
+
+	return BD_DIR_DN; // down if all else fails
+}
+
+void bd_load_piece(entity minigame, string s)
 {
 	// separate pieces between the ; symbols
 	string bd_string = s;
 
 	tokenize_console(bd_string);
 
-	entity e = msle_spawn(minigame,"minigame_board_piece");
-	e.team = 1;
-	e.bd_dir = '0 -1 0';
-
 	int argv_num = 0;
-	e.netname = strzone(argv(argv_num)); ++argv_num;
-	e.bd_tiletype = stof(argv(argv_num)); ++argv_num;
-	e.bd_dir = stov(argv(argv_num)); ++argv_num;
+	string tilename = strzone(argv(argv_num)); ++argv_num;
+	int tiletype = stoi(argv(argv_num)); ++argv_num;
+	int dir = stoi(argv(argv_num)); ++argv_num;
 
-	minigame_server_sendflags(e,MINIG_SF_ALL);
+	if(bd_canfill(tiletype))
+	{
+		int letter = minigame_tile_letter(tilename);
+		int number = minigame_tile_number(tilename);
+		entity controller = bd_find_controller(minigame, letter);
+		controller.bd_tiletypes[number] = tiletype;
+		controller.bd_dirs[number] = dir;
 
-	return e;
+		bd_controller_update(controller, number);
+	}
+	else
+	{
+		entity e = msle_spawn(minigame,"minigame_board_piece");
+		e.netname = tilename;
+		e.team = 1;
+		e.bd_dir = dir;
+		e.bd_tiletype = tiletype;
+		minigame_server_sendflags(e,MINIG_SF_ALL);
+	}
 }
 
 bool bd_save_level(entity minigame)
@@ -505,15 +727,17 @@ bool bd_save_level(entity minigame)
 		int target_count = 0, boulder_count = 0;
 		entity piece = NULL;
 		while((piece = findentity(piece,owner,minigame)))
-		if(piece.classname == "minigame_board_piece")
-			if(piece.bd_tiletype == BD_TILE_BOULDER)
-				++boulder_count;
-			else if(piece.bd_tiletype == BD_TILE_TARGET)
-				++target_count;
+			if(piece.classname == "minigame_board_piece")
+			{
+				if(piece.bd_tiletype == BD_TILE_BOULDER)
+					++boulder_count;
+				else if(piece.bd_tiletype == BD_TILE_TARGET)
+					++target_count;
+			}
 
 		if(boulder_count != target_count)
 		{
-			LOG_INFO("Not enough targets or boulders, fix your level!\n");
+			LOG_INFO("Not enough targets or boulders, fix your level!");
 			return false;
 		}
 
@@ -529,6 +753,17 @@ bool bd_save_level(entity minigame)
 			fputs(file_get, strcat("nextlevel = \"", minigame.bd_nextlevel, "\"\n"));
 
 		entity e = NULL;
+		while ( ( e = findentity(e,owner,minigame) ) )
+		if ( e.classname == "bd_controller" )
+		{
+			for(int j = 0; j < BD_NUM_CNT; ++j)
+			{
+				// use a line of text for each object, listing all properties
+				fputs(file_get, strcat(bd_save_controller_piece(minigame, e, j), "\n"));
+			}
+		}
+		e = NULL;
+
 		while ( ( e = findentity(e,owner,minigame) ) )
 		if ( e.classname == "minigame_board_piece" )
 		{
@@ -553,7 +788,7 @@ void bd_load_level(entity minigame)
 	file_get = fopen(file_name, FILE_READ);
 	if(file_get < 0)
 	{
-		LOG_INFO("^3BULLDOZER: ^7could not find storage file ^3", file_name, "^7, no items were loaded\n");
+		LOG_INFO("^3BULLDOZER: ^7could not find storage file ^3", file_name, "^7, no items were loaded");
 	}
 	else
 	{
@@ -572,8 +807,7 @@ void bd_load_level(entity minigame)
 				continue;
 			}
 
-			entity e;
-			e = bd_load_piece(minigame, file_read);
+			bd_load_piece(minigame, file_read);
 		}
 	}
 	fclose(file_get);
@@ -592,7 +826,7 @@ void bd_close_editor(entity minigame, entity player)
 	entity dozer = bd_find_dozer(minigame);
 	if(!dozer)
 	{
-		LOG_INFO("You need to place a bulldozer on the level to save it!\n");
+		LOG_INFO("You need to place a bulldozer on the level to save it!");
 		return;
 	}
 
@@ -603,7 +837,7 @@ void bd_close_editor(entity minigame, entity player)
 	}
 	else
 	{
-		LOG_INFO("You need to set the level name!\n");
+		LOG_INFO("You need to set the level name!");
 		return;
 	}
 }
@@ -617,8 +851,7 @@ int bd_server_event(entity minigame, string event, ...)
 	{
 		case "start":
 		{
-			if(minigame.bd_levelname) { strunzone(minigame.bd_levelname); }
-			minigame.bd_levelname = strzone(autocvar_sv_minigames_bulldozer_startlevel);
+			strcpy(minigame.bd_levelname, autocvar_sv_minigames_bulldozer_startlevel);
 			bd_setup_pieces(minigame);
 			minigame.minigame_flags = BD_TURN_MOVE;
 
@@ -630,12 +863,18 @@ int bd_server_event(entity minigame, string event, ...)
 			while( (e = findentity(e, owner, minigame)) )
 			if(e.classname == "minigame_board_piece")
 			{
-				if(e.netname) { strunzone(e.netname); }
+				strfree(e.netname);
+				delete(e);
+			}
+			e = NULL;
+			while( (e = findentity(e, owner, minigame)) )
+			if(e.classname == "bd_controller")
+			{
 				delete(e);
 			}
 
-			if(minigame.bd_nextlevel) { strunzone(minigame.bd_nextlevel); }
-			if(minigame.bd_levelname) { strunzone(minigame.bd_levelname); }
+			strfree(minigame.bd_nextlevel);
+			strfree(minigame.bd_levelname);
 			return false;
 		}
 		case "join":
@@ -686,12 +925,7 @@ int bd_server_event(entity minigame, string event, ...)
 
 				WriteByte(MSG_ENTITY,sent.bd_tiletype);
 
-				int dx = sent.bd_dir_x;
-				int dy = sent.bd_dir_y;
-				if(dx == -1) dx = 2;
-				if(dy == -1) dy = 2;
-				WriteByte(MSG_ENTITY,dx);
-				WriteByte(MSG_ENTITY,dy);
+				WriteByte(MSG_ENTITY,sent.bd_dir);
 			}
 			else if(sent.classname == "minigame_player" && (sf & BD_SF_PLAYERMOVES))
 				WriteShort(MSG_ENTITY,sent.bd_moves);
@@ -765,7 +999,26 @@ void bd_hud_board(vector pos, vector mySize)
 	}
 	FOREACH_MINIGAME_ENTITY(e)
 	{
-		if ( e.classname == "minigame_board_piece" )
+		if ( e.classname == "bd_controller" )
+		{
+			for(int j = 0; j < BD_NUM_CNT; ++j)
+			{
+				if(!e.bd_tiletypes[j]) continue;
+
+				int letter = e.bd_tilelet;
+				string mypos = minigame_tile_buildname(letter, j);
+
+				tile_pos = minigame_tile_pos(mypos,BD_NUM_CNT,BD_LET_CNT);
+				tile_pos = minigame_hud_denormalize(tile_pos,pos,mySize);
+
+				string thepiece = bd_get_tile_pic(e.bd_tiletypes[j]);
+
+				minigame_drawpic_centered( tile_pos,
+						minigame_texture(thepiece),
+						tile_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL );
+			}
+		}
+		else if ( e.classname == "minigame_board_piece" )
 		{
 			if(e.bd_tiletype != BD_TILE_DOZER && !e.bd_hide) // hide boulders
 			{
@@ -792,12 +1045,17 @@ void bd_hud_board(vector pos, vector mySize)
 			tile_pos = minigame_tile_pos(e.netname,BD_NUM_CNT,BD_LET_CNT);
 			tile_pos = minigame_hud_denormalize(tile_pos,pos,mySize);
 
-			vector thedir = e.bd_dir;
+			int bdir = e.bd_dir;
 			float theang = 0;
 
-			if(thedir_y == -1) { theang = M_PI; }
-			if(thedir_x == 1) { theang = M_PI/2; }
-			if(thedir_x == -1) { theang = M_PI*3/2; }
+			switch(bdir)
+			{
+				case BD_DIR_UP: theang = 0; break;
+				default:
+				case BD_DIR_DN: theang = M_PI; break;
+				case BD_DIR_LF: theang = M_PI * 3 / 2; break;
+				case BD_DIR_RT: theang = M_PI / 2; break;
+			}
 
 			drawrotpic(tile_pos, theang, minigame_texture("bd/dozer"),
 						tile_size, tile_size/2, '1 1 1',
@@ -854,7 +1112,7 @@ void bd_hud_board(vector pos, vector mySize)
 // Required function, draw the game status panel
 void bd_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);
@@ -906,10 +1164,12 @@ string bd_turn_to_string(int turnflags)
 		return _("Better luck next time!");
 
 	if ( turnflags & BD_TURN_WIN )
+	{
 		if(random() > 0.5)
 			return _("Tubular! Press \"Next Level\" to continue!");
 		else
 			return _("Wicked! Press \"Next Level\" to continue!");
+	}
 
 	if( turnflags & BD_TURN_EDIT )
 		return _("Press the space bar to change your currently selected tile");
@@ -947,8 +1207,7 @@ void bd_editor_fill(entity minigame)
 
 void bd_set_curr_pos(string s)
 {
-	if ( bd_curr_pos )
-		strunzone(bd_curr_pos);
+	strfree(bd_curr_pos);
 	if ( s )
 		s = strzone(s);
 	bd_curr_pos = s;
@@ -985,14 +1244,15 @@ bool bd_change_dozer_angle(entity minigame)
 	if(!dozer || dozer.bd_tiletype != BD_TILE_DOZER)
 		return false;
 
-	string thedir = "";
-	vector dir = dozer.bd_dir;
-	if(dir.x == 0 && dir.y == 0) { thedir = "r"; }
-
-	if(dir.x == 0 && dir.y == 1) { thedir = "r"; }
-	if(dir.x == 0 && dir.y ==-1) { thedir = "l"; }
-	if(dir.x ==-1 && dir.y == 0) { thedir = "u"; }
-	if(dir.x == 1 && dir.y == 0) { thedir = "d"; }
+	switch(dozer.bd_dir)
+	{
+		case BD_DIR_UP: dozer.bd_dir = BD_DIR_LF; break; // up -> left
+		default:
+		case BD_DIR_DN: dozer.bd_dir = BD_DIR_RT; break; // down -> right
+		case BD_DIR_LF: dozer.bd_dir = BD_DIR_DN; break; // left -> down
+		case BD_DIR_RT: dozer.bd_dir = BD_DIR_UP; break; // right -> up
+	}
+	string thedir = bd_get_dir_name(dozer.bd_dir);
 
 	bd_editor_make_move(minigame, thedir);
 	return true;
@@ -1114,7 +1374,7 @@ int bd_client_event(entity minigame, string event, ...)
 				{
 					sent.message = bd_turn_to_string(sent.minigame_flags);
 					//if ( sent.minigame_flags & minigame_self.team )
-						minigame_prompt();
+						//minigame_prompt();
 				}
 			}
 			else if(sent.classname == "minigame_board_piece")
@@ -1123,20 +1383,11 @@ int bd_client_event(entity minigame, string event, ...)
 				{
 					int letter = ReadByte();
 					int number = ReadByte();
-					if(sent.netname) { strunzone(sent.netname); }
-					sent.netname = strzone(minigame_tile_buildname(letter, number));
+					strcpy(sent.netname, minigame_tile_buildname(letter, number));
 
 					sent.bd_tiletype = ReadByte();
 
-					int dx = ReadByte();
-					int dy = ReadByte();
-
-					if(dx == 2) dx = -1;
-					if(dy == 2) dy = -1;
-
-					sent.bd_dir_x = dx;
-					sent.bd_dir_y = dy;
-					sent.bd_dir_z = 0;
+					sent.bd_dir = ReadByte();
 				}
 			}
 			else if(sent.classname == "minigame_player" && (sf & BD_SF_PLAYERMOVES))