{ "ascii", 2, 0, 'a' },
{ "connect", 1, 0, 'c' },
{ "port", 1, 0, 'p' },
- { "speed", 1, 0, 'i' },
{ "level", 1, 0, 'l' },
+ { "team", 1, 0, 't' },
{ "spy", 1, 0, 1 },
- { "seed", 1, 0, 's' },
{ "robot", 1, 0, 'r' },
{ "fair-robot", 0, 0, 'F' },
{ "dropmode", 2, 0, 'd' },
};
enum { KT_left, KT_right, KT_rotright, KT_rotleft, KT_drop, KT_down,
- KT_toggleSpy, KT_pause, KT_faster, KT_redraw, KT_numKeys };
+ KT_faster, KT_pause, KT_redraw, KT_quit, KT_numKeys };
static char *keyNames[KT_numKeys+1] = {
"Left", "Right", "RotRight", "RotLeft", "Drop", "Down",
- "ToggleSpy", "Pause", "Faster", "Redraw", NULL };
+ "Faster", "Pause", "Redraw", "Quit", NULL };
static char *gameNames[GT_len] = { "OnePlayer", "ClassicTwo" };
static char keyTable[KT_numKeys+1];
+static char *hostStr;
+static int paused = 0;
+
ExtFunc void MapKeys(char *newKeys)
{
hostStr = value;
break;
case 'p': //port
- portStr = value; break;
+ port = atoi(value);
+ break;
case 'i': //speed (of level 1)
Game.initspeed = atof(value) * 1e6;
break;
if (Players[0].score.level > 15)
Players[0].score.level = 15;
break;
+ case 't': //team
+ Players[0].team = atoi(value);
+ break;
case 1: //spy
{
int i;
Players[i / 10].spy = i % 10;
}
break;
- case 's': //seed
- Game.seed = atoi(value);
- break;
case 'r': //robot
robotEnable = 1;
Players[0].flags |= SCF_usingRobot;
return 1;
}
+ExtFunc void checkPaused(void)
+{ //check whether anyone paused the game
+ int i;
+
+ paused = 0;
+ for (i = 1; i <= totalPlayers; i++)
+ if (Players[i].alive)
+ paused |= Players[i].flags & SCF_paused;
+} //checkPaused
+
ExtFunc void OneGame(int scr)
{
MyEvent event;
int linesCleared, changed = 0;
int spied = 0, dropMode = 0;
- int oldPaused = 0, paused = 0, pausedByMe = 0, pausedByThem = 0;
+ int oldPaused = 0;
long pauseTimeLeft;
int pieceCount = 0;
int key;
char *p, *cmd;
+ int playercount;
int linevalues[4] = { 40, 100, 400, 1200 }; //= 50*lines! - 10*(lines==1)
int i;
Game.speed = SPEEDMINIMUM;
ResetBaseTime();
InitFields();
- for (i = 1; i <= totalPlayers + 1; i++)
+ for (i = 1; i <= totalPlayers; i++)
if (Players[i].spy) DrawField(i);
- if (totalPlayers > 0) {
+ if (totalPlayers > 1) {
spied = 1;
}
- ShowDisplayInfo();
SetITimer(Game.speed, Game.speed);
if (robotEnable) {
RobotCmd(0, "GameType %s\n", gameNames[game]);
RobotCmd(0, "BoardSize 0 %d %d\n",
Players[scr].boardVisible, Players[scr].boardWidth);
- for (i = 1; i <= totalPlayers + 1; i++) {
+ for (i = 1; i <= totalPlayers; i++) {
RobotCmd(0, "BoardSize %d %d %d\n",
i, Players[i].boardVisible, Players[i].boardWidth);
RobotCmd(0, "Opponent %d %s %s\n",
RobotTimeStamp();
}
Players[scr].nextShape = ChooseOption(stdOptions);
- while (StartNewPiece(scr, ChooseOption(stdOptions))) {
- ShowScore(scr, Players[scr].score);
- if (robotEnable && !fairRobot)
- RobotCmd(1, "NewPiece %d\n", ++pieceCount);
- if (spied) {
- short shapeNum;
- netint2 data[1];
-
- shapeNum = ShapeToNetNum(Players[scr].curShape);
- data[0] = hton2(shapeNum);
- SendPacket(scr, NP_newPiece, sizeof(data), data);
+ while (1) {
+ if (Players[scr].alive) {
+ if (!StartNewPiece(scr, ChooseOption(stdOptions))) {
+ netint4 data[4];
+ Players[scr].alive = 0;
+ FieldMessage(scr, "G A M E O V E R");
+ changed = 1;
+ if (game == GT_classicTwo)
+ SendPacket(scr, NP_argghhh,
+ sizeof(Players[0].alive), &Players[scr].alive);
+ } //die
+ else {
+ ShowScore(scr, Players[scr].score);
+ if (robotEnable && !fairRobot)
+ RobotCmd(1, "NewPiece %d\n", ++pieceCount);
+ if (spied) {
+ short shapeNum;
+ netint2 data[1];
+
+ shapeNum = ShapeToNetNum(Players[scr].curShape);
+ data[0] = hton2(shapeNum);
+ SendPacket(scr, NP_newPiece, sizeof(data), data);
+ } //send new piece
+ }
}
for (;;) {
- changed = RefreshBoard(scr) || changed;
- for (i = 1; i <= totalPlayers+1; i++) if (Players[i].spy && i != me)
- changed = RefreshBoard(i) || changed;
+ for (i = 1; i <= totalPlayers; i++) if (Players[i].spy)
+ changed |= RefreshBoard(i);
if (changed) {
if (!paused) ShowTime();
refresh();
changed = 0;
}
+ playercount = 0;
+ for (i = 1; i <= totalPlayers; i++)
+ if (Players[i].alive) playercount++;
+ if (playercount < game + 1) goto gameOver;
CheckNetConn();
switch (WaitMyEvent(&event, EM_any)) {
case E_alarm:
- if (!MovePiece(scr, -1, 0))
- goto nextPiece;
- else if (spied)
- SendPacket(scr, NP_down, 0, NULL);
+ if (Players[scr].alive)
+ if (!MovePiece(scr, -1, 0))
+ goto nextPiece;
+ else if (spied)
+ SendPacket(scr, NP_down, 0, NULL);
break;
case E_key:
p = strchr(keyTable, tolower(event.u.key));
(int)(unsigned char)event.u.key,
p ? keyNames[key] : "?");
break;
- }
- if (!p)
- break;
+ } //let robot handle keypress
+ if (!p) break;
keyEvent:
- if (paused && (key != KT_pause) && (key != KT_redraw))
- break;
+ if (!Players[scr].alive && key != KT_quit) break;
+ if (paused && key < KT_pause) break;
switch(key) {
case KT_left:
if (MovePiece(scr, 0, -1) && spied)
dropMode = Players[scr].dropmode;
break;
case KT_pause:
- pausedByMe = !pausedByMe;
- if (game == GT_classicTwo) {
- netint2 data[1];
-
- data[0] = hton2(pausedByMe);
- SendPacket(scr, NP_pause, sizeof(data), data);
- }
- paused = pausedByMe || pausedByThem;
- if (robotEnable)
- RobotCmd(1, "Pause %d %d\n", pausedByMe,
- pausedByThem);
- ShowPause(pausedByMe, pausedByThem);
+ Players[scr].flags ^= SCF_paused;
+ checkPaused();
+ if (game == GT_classicTwo)
+ SendPacket(scr, NP_pause, 0, NULL);
+ if (robotEnable) RobotCmd(1, "Pause %d\n", paused);
+ ShowPause(scr);
changed = 1;
break;
case KT_faster:
// if (paused)
// RefreshScreen();
break;
- }
+ case KT_quit:
+ FieldMessage(me, "G A M E O V E R");
+ refresh();
+ goto gameOver;
+ } //E_key
if (dropMode && DropPiece(scr) > 0) {
SetITimer(Game.speed, Game.speed);
if (spied)
changed = 1;
}
break;
- }
+ } //E_robot
case E_net:
switch(event.u.net.type) {
case NP_giveJunk:
netint2 data[2];
short column;
+ if (!Players[scr].alive) break;
memcpy(data, event.u.net.data, sizeof(data[0]));
column = Random(0, Players[scr].boardWidth);
data[1] = hton2(column);
SendPacket(scr, NP_insertJunk, sizeof(data), data);
// Message("Opponent added %d lines");
break;
- }
+ } //receive junklines
case NP_newPiece:
{
short shapeNum;
shapeNum = ntoh2(data[0]);
StartNewPiece(event.u.net.uid, NetNumToShape(shapeNum));
break;
- }
+ } //new piece
case NP_down:
MovePiece(event.u.net.uid, -1, 0);
break;
memcpy(data, event.u.net.data, sizeof(data));
InsertJunk(event.u.net.uid, ntoh2(data[0]), ntoh2(data[1]));
break;
- }
+ } //player added junklines
case NP_pause:
{
- netint2 data[1];
-
- memcpy(data, event.u.net.data, sizeof(data));
- pausedByThem = ntoh2(data[0]);
- paused = pausedByMe || pausedByThem;
- if (robotEnable)
- RobotCmd(1, "Pause %d %d\n", pausedByMe,
- pausedByThem);
- ShowPause(pausedByMe, pausedByThem);
+ Players[event.u.net.uid].flags ^= SCF_paused;
+ checkPaused();
+ if (robotEnable) RobotCmd(1, "Pause %d\n", paused);
+ ShowPause(event.u.net.uid);
+ changed = 1;
+ break;
+ } //(un)pause
+ case NP_argghhh:
+ {
+ memcpy(&Players[event.u.net.uid].alive,
+ event.u.net.data, sizeof(Players[0].alive));
+// checkPaused();
+ FieldMessage(event.u.net.uid, "G A M E O V E R");
changed = 1;
break;
- }
+ } //G/O
default:
break;
- }
+ } //E_net
break;
case E_lostRobot:
case E_lostConn:
goto gameOver;
default:
break;
- }
+ } //handle event
if (paused != oldPaused) {
if (paused) {
PauseTime();
ResumeTime();
}
oldPaused = paused;
- }
- }
+ } //(un)pause
+ } //game loop
nextPiece:
dropMode = 0;
FreezePiece(scr);
data[0] = hton2(junkLines);
SendPacket(scr, NP_giveJunk, sizeof(data), data);
}
- }
+ } //new piece loop
gameOver:
SetITimer(0, 0);
}
{
char ch;
+ port = DEFAULT_PORT;
Game.standout = Game.color = 1;
Game.initspeed = DEFAULT_INTERVAL;
MapKeys(DEFAULT_KEYS);
Players[0].boardHeight = MAX_BOARD_HEIGHT;
Players[0].boardVisible = 20;
Players[0].spy = 1;
- strcpy(Players[0].host, "localhost");
+ Players[0].alive = 1;
}
// if (getopt(argc, argv, "f:") == 'f')
// else
ReadConf(CONFIG_FILE);
while ((ch = getopt_long(argc, argv,
- "hHRs:r:Fk:c:odDSCap:i:l:", options, NULL)) != -1)
+ "hHRr:Fk:c:odDSCap:i:l:t:", options, NULL)) != -1)
HandleOption(ch, optarg);
if (optind < argc) {
Usage();
InitScreens();
if (initConn) {
game = GT_classicTwo;
- InitiateConnection(hostStr, portStr);
+ Players[0].flags |= SCF_paused;
+ paused = SCF_paused;
+ InitiateConnection(hostStr, port);
HandShake();
OneGame(me);
} //client
else {
game = GT_onePlayer;
- totalPlayers = 0;
+ totalPlayers = 1;
me = 1;
memcpy(&Players[me], &Players[0], sizeof(Player));
OneGame(me);
git.shiar.nl / netris.git / blobdiff