[nexuiz-commits] r7400 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-08-09 05:39:14 -0400 (Sun, 09 Aug 2009)
New Revision: 7400

Modified:
   trunk/data/qcsrc/server/g_tetris.qc
Log:
partial VS support for tetris; all that's missing is code to set up VS games


Modified: trunk/data/qcsrc/server/g_tetris.qc
===================================================================
--- trunk/data/qcsrc/server/g_tetris.qc	2009-08-08 20:45:09 UTC (rev 7399)
+++ trunk/data/qcsrc/server/g_tetris.qc	2009-08-09 09:39:14 UTC (rev 7400)
@@ -10,6 +10,8 @@
 
 .vector tet_org;
 
+float tet_vshighest_id;
+.float tet_vsid, tet_vs_addlines;
 .float tetris_on, tet_gameovertime, tet_drawtime, tet_autodown;
 .vector piece_pos;
 .float piece_type, next_piece, tet_score, tet_lines;
@@ -587,9 +589,18 @@
 float LINE_LOW = 349525;
 float LINE_HIGH = 699050; // above number times 2
 
+void AddLines(float n)
+{
+	entity head;
+	if(!self.tet_vsid)
+		return;
+	FOR_EACH_REALCLIENT(head) if(head != self) if(head.tetris_on) if(head.tet_vsid == self.tet_vsid)
+		head.tet_vs_addlines += n;
+}
+
 void CompletedLines()
 {
-	float y, cleared, ln;
+	float y, cleared, ln, added, pos, i, f;
 
 	cleared = 0;
 	y = TET_LINES;
@@ -603,14 +614,43 @@
 		ln = GetLine(y - cleared);
 		SetLine(y, ln);
 	}
-	if(cleared == 4)
+
+	if(cleared >= 4)
+		AddLines(cleared);
+	else if(cleared >= 1)
+		AddLines(cleared - 1);
+
+	self.tet_lines = self.tet_lines + cleared;
+	TetAddScore(cleared * cleared * 10);
+
+	added = self.tet_vs_addlines;
+	self.tet_vs_addlines = 0;
+
+	if(added)
+	{
+		for(y = 1; y <= TET_LINES - added; ++y)
+		{
+			SetLine(y, GetLine(y + added));
+		}
+		for(y = max(1, TET_LINES - added + 1); y <= TET_LINES; ++y)
+		{
+			pos = floor(random() * TET_WIDTH);
+			ln = 0;
+			for(i = 1; i <= TET_WIDTH; ++i)
+				if(i != pos)
+					ln = SetXBlock(i, ln, floor(random() * 3 + 1));
+			SetLine(y, ln);
+		}
+	}
+
+	if(added)
+		tetsnd("tetadd");
+	else if(cleared >= 4)
 		tetsnd("tetris");
 	else if(cleared)
 		tetsnd("tetline");
 	else
 		tetsnd("tetland");
-	self.tet_lines = self.tet_lines + cleared;
-	TetAddScore(cleared * cleared * 10);
 };
 
 void HandleGame(float keyss)