#include <sys/types.h>
#include <netinet/in.h>
-enum { KT_left, KT_rotate, KT_right, KT_drop, KT_down,
+enum { KT_left, KT_right, KT_rotright, KT_rotleft, KT_drop, KT_down,
KT_toggleSpy, KT_pause, KT_faster, KT_redraw, KT_numKeys };
static char *keyNames[KT_numKeys+1] = {
- "Left", "Rotate", "Right", "Drop", "Down", "ToggleSpy", "Pause",
- "Faster", "Redraw", NULL };
+ "Left", "Right", "RotRight", "RotLeft", "Drop", "Down",
+ "ToggleSpy", "Pause", "Faster", "Redraw", NULL };
static char *gameNames[GT_len] = { "OnePlayer", "ClassicTwo" };
ExtFunc int StartNewPiece(int scr, Shape *shape)
{
- curShape[scr] = shape;
+ if (nextShape[scr]) {
+ curShape[scr] = nextShape[scr];
+ nextShape[scr] = shape;
+ }
+ else
+ curShape[scr] = shape;
curY[scr] = boardVisible[scr] + 4;
curX[scr] = boardWidth[scr] / 2;
- while (!ShapeVisible(shape, scr, curY[scr], curX[scr]))
+ while (!ShapeVisible(curShape[scr], scr, curY[scr], curX[scr]))
--curY[scr];
- if (!ShapeFits(shape, scr, curY[scr], curX[scr]))
+ if (!ShapeFits(curShape[scr], scr, curY[scr], curX[scr]))
return 0;
- PlotShape(shape, scr, curY[scr], curX[scr], 1);
+ PlotShape(curShape[scr], scr, curY[scr], curX[scr], 1);
return 1;
}
{
MyEvent event;
int linesCleared, changed = 0;
+ int totalDrops = 0, totalLines = 0, totalAdds = 0;
int spied = 0, spying = 0, dropMode = 0;
int oldPaused = 0, paused = 0, pausedByMe = 0, pausedByThem = 0;
long pauseTimeLeft;
RobotCmd(0, "BeginGame\n");
RobotTimeStamp();
}
+ nextShape[scr] = ChooseOption(stdOptions);
while (StartNewPiece(scr, ChooseOption(stdOptions))) {
+ ShowScore(scr, totalDrops, totalLines, totalAdds);
if (robotEnable && !fairRobot)
RobotCmd(1, "NewPiece %d\n", ++pieceCount);
if (spied) {
shapeNum = ShapeToNetNum(curShape[scr]);
data[0] = hton2(shapeNum);
- SendPacket(NP_newPiece, sizeof(data), data);
+ SendPacket(scr, NP_newPiece, sizeof(data), data);
}
for (;;) {
changed = RefreshBoard(scr) || changed;
if (!MovePiece(scr, -1, 0))
goto nextPiece;
else if (spied)
- SendPacket(NP_down, 0, NULL);
+ SendPacket(scr, NP_down, 0, NULL);
break;
case E_key:
p = strchr(keyTable, tolower(event.u.key));
switch(key) {
case KT_left:
if (MovePiece(scr, 0, -1) && spied)
- SendPacket(NP_left, 0, NULL);
+ SendPacket(scr, NP_left, 0, NULL);
break;
case KT_right:
if (MovePiece(scr, 0, 1) && spied)
- SendPacket(NP_right, 0, NULL);
+ SendPacket(scr, NP_right, 0, NULL);
+ break;
+ case KT_rotleft:
+ if (RotatePiece(scr, 0) && spied)
+ SendPacket(scr, NP_rotleft, 0, NULL);
break;
- case KT_rotate:
- if (RotatePiece(scr) && spied)
- SendPacket(NP_rotate, 0, NULL);
+ case KT_rotright:
+ if (RotatePiece(scr, 1) && spied)
+ SendPacket(scr, NP_rotright, 0, NULL);
break;
case KT_down:
if (MovePiece(scr, -1, 0) && spied)
- SendPacket(NP_down, 0, NULL);
+ SendPacket(scr, NP_down, 0, NULL);
+ SetITimer(speed, speed);
break;
case KT_toggleSpy:
spying = (!spying) && (scr2 >= 0);
case KT_drop:
if (DropPiece(scr) > 0) {
if (spied)
- SendPacket(NP_drop, 0, NULL);
- SetITimer(speed, speed);
+ SendPacket(scr, NP_drop, 0, NULL);
+ if (dropModeEnable == 2)
+ SetITimer(speed, 1); //instantdrop
+ else
+ SetITimer(speed, speed);
}
dropMode = dropModeEnable;
break;
netint2 data[1];
data[0] = hton2(pausedByMe);
- SendPacket(NP_pause, sizeof(data), data);
+ SendPacket(scr, NP_pause, sizeof(data), data);
}
paused = pausedByMe || pausedByThem;
if (robotEnable)
}
if (dropMode && DropPiece(scr) > 0) {
if (spied)
- SendPacket(NP_drop, 0, NULL);
+ SendPacket(scr, NP_drop, 0, NULL);
SetITimer(speed, speed);
}
break;
data[1] = hton2(column);
InsertJunk(scr, ntoh2(data[0]), column);
if (spied)
- SendPacket(NP_insertJunk, sizeof(data), data);
+ SendPacket(scr, NP_insertJunk, sizeof(data), data);
+// Message("Opponent added %d lines");
break;
}
case NP_newPiece:
case NP_right:
MovePiece(scr2, 0, 1);
break;
- case NP_rotate:
- RotatePiece(scr2);
+ case NP_rotleft:
+ RotatePiece(scr2, 0);
+ break;
+ case NP_rotright:
+ RotatePiece(scr2, 1);
break;
case NP_drop:
DropPiece(scr2);
nextPiece:
dropMode = 0;
FreezePiece(scr);
- linesCleared = ClearFullLines(scr);
+ totalDrops++;
+ if ((linesCleared = ClearFullLines(scr)) > 0) {
+ totalLines += linesCleared;
+ totalAdds += linesCleared - (linesCleared < 4);
+ }
if (linesCleared > 0 && spied)
- SendPacket(NP_clear, 0, NULL);
+ SendPacket(scr, NP_clear, 0, NULL);
if (game == GT_classicTwo && linesCleared > 1) {
short junkLines;
netint2 data[1];
junkLines = linesCleared - (linesCleared < 4);
data[0] = hton2(junkLines);
- SendPacket(NP_giveJunk, sizeof(data), data);
+ SendPacket(scr, NP_giveJunk, sizeof(data), data);
}
}
gameOver:
standoutEnable = colorEnable = 1;
stepDownInterval = DEFAULT_INTERVAL;
MapKeys(DEFAULT_KEYS);
- while ((ch = getopt(argc, argv, "hHRs:r:Fk:c:woDSCp:i:")) != -1)
+ while ((ch = getopt(argc, argv, "hHRs:r:Fk:c:wodDSCp:i:")) != -1)
switch (ch) {
case 'c':
initConn = 1;
fairRobot = 1;
myFlags |= SCF_fairRobot;
break;
- case 'D':
+ case 'd':
dropModeEnable = 1;
break;
+ case 'D':
+ dropModeEnable = 2;
+ break;
case 'C':
colorEnable = 0;
break;
data[0] = hton4(MAJOR_VERSION);
data[1] = hton4(PROTOCOL_VERSION);
- SendPacket(NP_version, sizeof(data), data);
+ SendPacket(0, NP_version, sizeof(data), data);
if (WaitMyEvent(&event, EM_net) != E_net)
fatal("Network negotiation failed");
memcpy(data, event.u.net.data, sizeof(data));
data[0] = hton4(myFlags);
data[1] = hton4(seed);
data[2] = hton4(stepDownInterval);
- SendPacket(NP_startConn, len, data);
+ SendPacket(0, NP_startConn, len, data);
if (WaitMyEvent(&event, EM_net) != E_net ||
event.u.net.type != NP_startConn)
fatal("Network negotiation failed");
len = strlen(userName)+1;
if (len > sizeof(opponentName))
len = sizeof(opponentName);
- SendPacket(NP_userName, len, userName);
+ SendPacket(0, NP_userName, len, userName);
if (WaitMyEvent(&event, EM_net) != E_net ||
event.u.net.type != NP_userName)
fatal("Network negotiation failed");
git.shiar.nl / netris.git / blobdiff