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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-08-09 06:07:28 -0400 (Sun, 09 Aug 2009)
New Revision: 7403

Modified:
   trunk/data/qcsrc/server/g_tetris.qc
Log:
working tetris VS mode!


Modified: trunk/data/qcsrc/server/g_tetris.qc
===================================================================
--- trunk/data/qcsrc/server/g_tetris.qc	2009-08-09 09:55:52 UTC (rev 7402)
+++ trunk/data/qcsrc/server/g_tetris.qc	2009-08-09 10:07:28 UTC (rev 7403)
@@ -10,12 +10,19 @@
 
 .vector tet_org;
 
-float tet_vshighest_id;
-.float tet_vsid, tet_vs_addlines;
+float tet_vs_current_id;
+float tet_vs_current_timeout;
+.float tet_vs_id, tet_vs_addlines;
+.float tet_highest_line;
 .float tetris_on, tet_gameovertime, tet_drawtime, tet_autodown;
 .vector piece_pos;
 .float piece_type, next_piece, tet_score, tet_lines;
 
+// tetris_on states:
+//   1 = running
+//   2 = game over
+//   3 = waiting for VS players
+
 var float tet_high_score = 0;
 
 float TET_LINES = 20;
@@ -414,6 +421,7 @@
 void Draw_Tetris()
 {
 	float i;
+	entity head;
 	msg_entity = self;
 	WriteChar(MSG_ONE, SVC_CENTERPRINTa);
 	// decoration
@@ -423,15 +431,12 @@
 	WriteChar(MSG_ONE, 10);
 	for (i = 1; i <= TET_LINES; i = i + 1)
 	{
-		if(self.tetris_on == 2 && i == 11)
-		{
-			p6(' ', ' ', ' ', ' ', ' ', ' ');
-			p6(' ', 'G', 'A', 'M', 'E', ' ');
-			p6(' ', 'O', 'V', 'E', 'R', ' ');
-			WriteChar(MSG_ONE, 10);
-			continue;
-		}
-		DrawLine(i);
+		if(self.tetris_on == 2)
+			WriteUnterminatedString(MSG_ONE, " GAME  OVER ");
+		else if(self.tetris_on == 3)
+			WriteUnterminatedString(MSG_ONE, "PLEASE  WAIT");
+		else
+			DrawLine(i);
 		if (i == 1)
 			p6(' ', 'N', 'E', 'X', 'T', ' ');
 		else if (i == 3)
@@ -466,6 +471,34 @@
 		WriteChar(MSG_ONE, TET_BORDER);
 	p6(' ', ' ', ' ', ' ', ' ', ' ');
 	WriteChar(MSG_ONE, 10);
+
+	// VS game status
+	if(self.tet_vs_id)
+	{
+		WriteChar(MSG_ONE, 10);
+		WriteChar(MSG_ONE, 10);
+		if(self.tetris_on == 3)
+		{
+			WriteUnterminatedString(MSG_ONE, strcat("WAITING FOR OTHERS (", ftos(ceil(tet_vs_current_timeout - time)), " SEC)\n"));
+		}
+
+		WriteChar(MSG_ONE, 10);
+		FOR_EACH_REALCLIENT(head) if(head.tetris_on) if(head.tet_vs_id == self.tet_vs_id)
+		{
+			if(head == self)
+				WriteChar(MSG_ONE, '>');
+			else
+				WriteChar(MSG_ONE, ' ');
+			if(head.tetris_on == 2)
+				WriteUnterminatedString(MSG_ONE, "   X_X");
+			else
+				pnum(head.tet_highest_line, 0);
+			WriteChar(MSG_ONE, 32);
+			WriteUnterminatedString(MSG_ONE, head.netname);
+		}
+		WriteChar(MSG_ONE, 10);
+	}
+
 	WriteChar(MSG_ONE, 0);
 }
 /*
@@ -592,15 +625,15 @@
 void AddLines(float n)
 {
 	entity head;
-	if(!self.tet_vsid)
+	if(!self.tet_vs_id)
 		return;
-	FOR_EACH_REALCLIENT(head) if(head != self) if(head.tetris_on) if(head.tet_vsid == self.tet_vsid)
+	FOR_EACH_REALCLIENT(head) if(head != self) if(head.tetris_on) if(head.tet_vs_id == self.tet_vs_id)
 		head.tet_vs_addlines += n;
 }
 
 void CompletedLines()
 {
-	float y, cleared, ln, added, pos, i, f;
+	float y, cleared, ln, added, pos, i;
 
 	cleared = 0;
 	y = TET_LINES;
@@ -643,6 +676,14 @@
 		}
 	}
 
+	self.tet_highest_line = 0;
+	for(y = 1; y <= TET_LINES; ++y)
+		if(GetLine(y) != 0)
+		{
+			self.tet_highest_line = TET_LINES + 1 - y;
+			break;
+		}
+
 	if(added)
 		tetsnd("tetadd");
 	else if(cleared >= 4)
@@ -793,7 +834,22 @@
 {
 	if(self.tetris_on != 1)
 	{
-		self.tetris_on = 1;
+		self.tetris_on = 3;
+
+		if(time < tet_vs_current_timeout)
+		{
+			// join VS game
+			self.tet_vs_id = tet_vs_current_id;
+		}
+		else
+		{
+			// start new VS game
+			++tet_vs_current_id;
+			tet_vs_current_timeout = time + 15;
+			self.tet_vs_id = tet_vs_current_id;
+			bprint("^2TET^4R^2IS: ", self.netname, "^2 started a new game. Do 'impulse 100' to join.\n");
+		}
+		self.tet_highest_line = 0;
 		ResetTetris();
 		self.tet_org = self.origin;
 		self.movetype = MOVETYPE_NOCLIP;
@@ -816,7 +872,10 @@
 	if (self.tet_drawtime > time)
 		return 1;
 	Draw_Tetris();
-	self.tet_drawtime = time + 0.5;
+	if(self.tetris_on == 3)
+		self.tet_drawtime = ceil(time - tet_vs_current_timeout + 0.1) + tet_vs_current_timeout;
+	else
+		self.tet_drawtime = time + 0.5;
 	return 1;
 };
 float frik_anglemoda(float v)
@@ -879,6 +938,11 @@
 		Tet_GameExit();
 		return 0;
 	}
+	if(self.tetris_on == 3 && time > tet_vs_current_timeout)
+	{
+		self.tetris_on = 1; // start VS game
+		self.tet_drawtime = 0;
+	}
 	
 	self.origin = self.tet_org;