X-Git-Url: http://git.shiar.nl/netris.git/blobdiff_plain/776faa936ea4b3f5ccaacda0f05a2ed1e945d304..e3d58186949bfcdb149cc2a545ce6c14a8689268:/game.c diff --git a/game.c b/game.c index 423befb..87208fb 100644 --- a/game.c +++ b/game.c @@ -27,8 +27,29 @@ #include #include +static struct option options[] = { + { "ascii", 2, 0, 'a' }, + { "connect", 1, 0, 'c' }, + { "port", 1, 0, 'p' }, + { "speed", 1, 0, 'i' }, + { "level", 1, 0, 'l' }, + { "spy", 1, 0, 1 }, + { "seed", 1, 0, 's' }, + { "robot", 1, 0, 'r' }, + { "fair-robot", 0, 0, 'F' }, + { "dropmode", 2, 0, 'd' }, + { "instadrop", 2, 0, 'D' }, + { "color", 2, 0, 'C' }, + { "slowterm", 2, 0, 'S' }, + { "keys", 1, 0, 'k' }, + { "rules", 0, 0, 'R' }, + { "info", 0, 0, 'H' }, + { "help", 0, 0, 'h' }, + { 0, 0, 0, 0 } +}; + enum { KT_left, KT_right, KT_rotright, KT_rotleft, KT_drop, KT_down, - KT_toggleSpy, KT_pause, KT_faster, KT_redraw, KT_numKeys }; + KT_toggleSpy, KT_pause, KT_faster, KT_redraw, KT_numKeys }; static char *keyNames[KT_numKeys+1] = { "Left", "Right", "RotRight", "RotLeft", "Drop", "Down", @@ -37,8 +58,7 @@ static char *keyNames[KT_numKeys+1] = { static char *gameNames[GT_len] = { "OnePlayer", "ClassicTwo" }; static char keyTable[KT_numKeys+1]; -static int dropModeEnable = 0; -static char *robotProg; + ExtFunc void MapKeys(char *newKeys) { @@ -73,85 +93,212 @@ ExtFunc void MapKeys(char *newKeys) } if (errs) exit(1); -} +} //MapKeys + +ExtFunc void WriteConf(void) +{ + FILE *file_out; + + file_out = fopen(CONFIG_FILE, "w"); + if (file_out == NULL) + die("Error writing config file"); + + fprintf(file_out, "### NETRIS %s Config file ###\n\n", version_string); + + fclose(file_out); + fprintf(stderr, "Wrote new game configuration to %s\n", CONFIG_FILE); +} //WriteConf + +ExtFunc void HandleOption(char tag, char *value) +{ + switch (tag) { + case 'a': //ascii + if (value && !strcasecmp(value, "0")) Game.ascii = 0; + else Game.ascii = 1; + break; + case 'c': //connect + initConn = 1; + hostStr = value; + break; + case 'p': //port + portStr = value; break; + case 'i': //speed (of level 1) + Game.initspeed = atof(value) * 1e6; + break; + case 'l': //level + if ((Players[0].score.level = atof(value)) < 1) + Players[0].score.level = 1; + if (Players[0].score.level > 15) + Players[0].score.level = 15; + break; + case 1: //spy + { + int i; + i = atof(value); + 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; + InitRobot(value); + break; + case 'F': //fair robot + fairRobot = 1; + Players[0].flags |= SCF_fairRobot; + break; + case 'd': //drop mode + if (value && !strcasecmp(value, "0")) Players[0].dropmode &= 254; + else Players[0].dropmode |= 1; + break; + case 'D': //instadrop + if (value && !strcasecmp(value, "0")) Players[0].dropmode &= 253; + else Players[0].dropmode |= 2; + break; + case 'C': //color + if (value && !strcasecmp(value, "1")) Game.color = 1; + else Game.color = 0; + break; + case 'S': //slowterm + if (value && !strcasecmp(value, "1")) Game.standout = 1; + else Game.standout = 0; + break; + case 'k': //keys + MapKeys(value); break; + case 'H': //info + DistInfo(); exit(0); + case 'R': //rules + Rules(); exit(0); + case 'h': //help + Usage(); exit(0); + default: + Usage(); exit(1); + } +} //HandleParam + +ExtFunc void ReadConf(char *filename) +{ + FILE *file_in; + char buf[513]; + int i; + char *ch; + char tag[81], value[81]; + + file_in = fopen(filename, "r"); + if (file_in) { + while (fgets(buf, 512, file_in) != NULL) { + if ((ch = strchr(buf, '#'))) + *ch = '\0'; // truncate string from # char + for (i = strlen(buf)-1; i >= 0; i--) + if (buf[i] == ' ' || buf[i] == '\n' || buf[i] == '\t' || buf[i] == 13) + buf[i] = '\0'; + else break; + + sscanf(buf, "%80[^= \t] = %80[^\n]", tag, value); + for (i = 0; options[i].name; i++){ + if (!strcasecmp(options[i].name, tag)) { + HandleOption(options[i].val, value); + break; + } + } + } + fclose(file_in); + } //read file + else { + fprintf(stderr, "Unable to open config file %s.\n", filename); + } //defaults + +} //ReadConf ExtFunc int StartNewPiece(int scr, Shape *shape) { - if (nextShape[scr]) { - curShape[scr] = nextShape[scr]; - nextShape[scr] = shape; + if (Players[scr].nextShape) { + Players[scr].curShape = Players[scr].nextShape; + Players[scr].nextShape = shape; } else - curShape[scr] = shape; - curY[scr] = boardVisible[scr] + 4; - curX[scr] = boardWidth[scr] / 2; - while (!ShapeVisible(curShape[scr], scr, curY[scr], curX[scr])) - --curY[scr]; - if (!ShapeFits(curShape[scr], scr, curY[scr], curX[scr])) + Players[scr].curShape = shape; + Players[scr].curY = Players[scr].boardVisible + 4; + Players[scr].curX = Players[scr].boardWidth / 2; + while (!ShapeVisible(Players[scr].curShape, scr, + Players[scr].curY, Players[scr].curX)) + Players[scr].curY--; + if (!ShapeFits(Players[scr].curShape, scr, + Players[scr].curY, Players[scr].curX)) return 0; - PlotShape(curShape[scr], scr, curY[scr], curX[scr], 1); + PlotShape(Players[scr].curShape, scr, + Players[scr].curY, Players[scr].curX, 1); return 1; } -ExtFunc void OneGame(int scr, int scr2) +ExtFunc void OneGame(int scr) { MyEvent event; int linesCleared, changed = 0; - int totalDrops = 0, totalLines = 0, totalAdds = 0; - int spied = 0, spying = 0, dropMode = 0; + int spied = 0, dropMode = 0; int oldPaused = 0, paused = 0, pausedByMe = 0, pausedByThem = 0; long pauseTimeLeft; int pieceCount = 0; int key; char *p, *cmd; + int linevalues[4] = { 40, 100, 400, 1200 }; //= 50*lines! - 10*(lines==1) + int i; - speed = stepDownInterval; + Game.speed = Game.initspeed; + for (i = 1; i < Players[scr].score.level; i++) + Game.speed /= SPEEDINC; + if (Game.speed < SPEEDMINIMUM) + Game.speed = SPEEDMINIMUM; ResetBaseTime(); - InitBoard(scr); - if (scr2 >= 0) { + InitFields(); + for (i = 1; i <= totalPlayers + 1; i++) + if (Players[i].spy) DrawField(i); + if (totalPlayers > 0) { spied = 1; - spying = 1; - InitBoard(scr2); - UpdateOpponentDisplay(); } ShowDisplayInfo(); - SetITimer(speed, speed); + SetITimer(Game.speed, Game.speed); if (robotEnable) { RobotCmd(0, "GameType %s\n", gameNames[game]); RobotCmd(0, "BoardSize 0 %d %d\n", - boardVisible[scr], boardWidth[scr]); - if (scr2 >= 0) { - RobotCmd(0, "BoardSize 1 %d %d\n", - boardVisible[scr2], boardWidth[scr2]); - RobotCmd(0, "Opponent 1 %s %s\n", opponentName, opponentHost); - if (opponentFlags & SCF_usingRobot) - RobotCmd(0, "OpponentFlag 1 robot\n"); - if (opponentFlags & SCF_fairRobot) - RobotCmd(0, "OpponentFlag 1 fairRobot\n"); + Players[scr].boardVisible, Players[scr].boardWidth); + for (i = 1; i <= totalPlayers + 1; i++) { + RobotCmd(0, "BoardSize %d %d %d\n", + i, Players[i].boardVisible, Players[i].boardWidth); + RobotCmd(0, "Opponent %d %s %s\n", + i, Players[i].name, Players[i].host); + if (Players[i].flags & SCF_usingRobot) + RobotCmd(0, "OpponentFlag %d robot\n", i); + if (Players[i].flags & SCF_fairRobot) + RobotCmd(0, "OpponentFlag %d fairRobot\n", i); } - RobotCmd(0, "TickLength %.3f\n", speed / 1.0e6); + RobotCmd(0, "TickLength %.3f\n", Game.speed / 1.0e6); RobotCmd(0, "BeginGame\n"); RobotTimeStamp(); } - nextShape[scr] = ChooseOption(stdOptions); + Players[scr].nextShape = ChooseOption(stdOptions); while (StartNewPiece(scr, ChooseOption(stdOptions))) { - ShowScore(scr, totalDrops, totalLines, totalAdds); + ShowScore(scr, Players[scr].score); if (robotEnable && !fairRobot) RobotCmd(1, "NewPiece %d\n", ++pieceCount); if (spied) { short shapeNum; netint2 data[1]; - shapeNum = ShapeToNetNum(curShape[scr]); + shapeNum = ShapeToNetNum(Players[scr].curShape); data[0] = hton2(shapeNum); SendPacket(scr, NP_newPiece, sizeof(data), data); } for (;;) { changed = RefreshBoard(scr) || changed; - if (spying) - changed = RefreshBoard(scr2) || changed; + for (i = 1; i <= totalPlayers+1; i++) if (Players[i].spy && i != me) + changed = RefreshBoard(i) || changed; if (changed) { - RefreshScreen(); + if (!paused) ShowTime(); + refresh(); changed = 0; } CheckNetConn(); @@ -194,23 +341,20 @@ ExtFunc void OneGame(int scr, int scr2) SendPacket(scr, NP_rotright, 0, NULL); break; case KT_down: - if (MovePiece(scr, -1, 0) && spied) - SendPacket(scr, NP_down, 0, NULL); - SetITimer(speed, speed); - break; - case KT_toggleSpy: - spying = (!spying) && (scr2 >= 0); + SetITimer(Game.speed, Game.speed); + if (MovePiece(scr, -1, 0)) { + if (spied) SendPacket(scr, NP_down, 0, NULL); + } + else goto nextPiece; break; case KT_drop: - if (DropPiece(scr) > 0) { - if (spied) - SendPacket(scr, NP_drop, 0, NULL); - if (dropModeEnable == 2) - SetITimer(speed, 1); //instantdrop - else - SetITimer(speed, speed); + SetITimer(Game.speed, Game.speed); + if (DropPiece(scr)) { + if (spied) SendPacket(scr, NP_drop, 0, NULL); + if (Players[scr].dropmode == 2) goto nextPiece; } - dropMode = dropModeEnable; + else goto nextPiece; + dropMode = Players[scr].dropmode; break; case KT_pause: pausedByMe = !pausedByMe; @@ -230,21 +374,23 @@ ExtFunc void OneGame(int scr, int scr2) case KT_faster: if (game != GT_onePlayer) break; - speed = speed * 0.8; - SetITimer(speed, SetITimer(0, 0)); - ShowDisplayInfo(); + if ((Game.speed /= SPEEDINC) < SPEEDMINIMUM) + Game.speed = SPEEDMINIMUM; + SetITimer(Game.speed, SetITimer(0, 0)); + Players[scr].score.level++; + ShowScore(scr, Players[scr].score); changed = 1; break; case KT_redraw: ScheduleFullRedraw(); - if (paused) - RefreshScreen(); +// if (paused) +// RefreshScreen(); break; } if (dropMode && DropPiece(scr) > 0) { + SetITimer(Game.speed, Game.speed); if (spied) SendPacket(scr, NP_drop, 0, NULL); - SetITimer(speed, speed); } break; case E_robot: @@ -275,7 +421,7 @@ ExtFunc void OneGame(int scr, int scr2) short column; memcpy(data, event.u.net.data, sizeof(data[0])); - column = Random(0, boardWidth[scr]); + column = Random(0, Players[scr].boardWidth); data[1] = hton2(column); InsertJunk(scr, ntoh2(data[0]), column); if (spied) @@ -288,39 +434,39 @@ ExtFunc void OneGame(int scr, int scr2) short shapeNum; netint2 data[1]; - FreezePiece(scr2); + FreezePiece(event.u.net.uid); memcpy(data, event.u.net.data, sizeof(data)); shapeNum = ntoh2(data[0]); - StartNewPiece(scr2, NetNumToShape(shapeNum)); + StartNewPiece(event.u.net.uid, NetNumToShape(shapeNum)); break; } case NP_down: - MovePiece(scr2, -1, 0); + MovePiece(event.u.net.uid, -1, 0); break; case NP_left: - MovePiece(scr2, 0, -1); + MovePiece(event.u.net.uid, 0, -1); break; case NP_right: - MovePiece(scr2, 0, 1); + MovePiece(event.u.net.uid, 0, 1); break; case NP_rotleft: - RotatePiece(scr2, 0); + RotatePiece(event.u.net.uid, 0); break; case NP_rotright: - RotatePiece(scr2, 1); + RotatePiece(event.u.net.uid, 1); break; case NP_drop: - DropPiece(scr2); + DropPiece(event.u.net.uid); break; case NP_clear: - ClearFullLines(scr2); + ClearFullLines(event.u.net.uid); break; case NP_insertJunk: { netint2 data[2]; memcpy(data, event.u.net.data, sizeof(data)); - InsertJunk(scr2, ntoh2(data[0]), ntoh2(data[1])); + InsertJunk(event.u.net.uid, ntoh2(data[0]), ntoh2(data[1])); break; } case NP_pause: @@ -348,23 +494,37 @@ ExtFunc void OneGame(int scr, int scr2) break; } if (paused != oldPaused) { - if (paused) + if (paused) { + PauseTime(); pauseTimeLeft = SetITimer(0, 0); - else - SetITimer(speed, pauseTimeLeft); + } + else { + SetITimer(Game.speed, pauseTimeLeft); + ResumeTime(); + } oldPaused = paused; } } nextPiece: dropMode = 0; FreezePiece(scr); - totalDrops++; + Players[scr].score.drops++; + Players[scr].score.score++; if ((linesCleared = ClearFullLines(scr)) > 0) { - totalLines += linesCleared; - totalAdds += linesCleared - (linesCleared < 4); + if (game == GT_onePlayer) + if ((Players[scr].score.lines / 10) < + ((Players[scr].score.lines + linesCleared) / 10)) { + if ((Game.speed /= SPEEDINC) < SPEEDMINIMUM) + Game.speed = SPEEDMINIMUM; + SetITimer(Game.speed, SetITimer(0, 0)); + Players[scr].score.level++; + } //level up + Players[scr].score.score += linevalues[linesCleared]; + Players[scr].score.lines += linesCleared; + Players[scr].score.adds += linesCleared - (linesCleared < 4); + if (spied) + SendPacket(scr, NP_clear, 0, NULL); } - if (linesCleared > 0 && spied) - SendPacket(scr, NP_clear, 0, NULL); if (game == GT_classicTwo && linesCleared > 1) { short junkLines; netint2 data[1]; @@ -380,181 +540,59 @@ gameOver: ExtFunc int main(int argc, char **argv) { - int initConn = 0, waitConn = 0, ch; - char *hostStr = NULL, *portStr = NULL; + char ch; - standoutEnable = colorEnable = 1; - stepDownInterval = DEFAULT_INTERVAL; + Game.standout = Game.color = 1; + Game.initspeed = DEFAULT_INTERVAL; MapKeys(DEFAULT_KEYS); - while ((ch = getopt(argc, argv, "hHRs:r:Fk:c:wodDSCp:i:")) != -1) - switch (ch) { - case 'c': - initConn = 1; - hostStr = optarg; - break; - case 'w': - waitConn = 1; - break; - case 'p': - portStr = optarg; - break; - case 'i': - stepDownInterval = atof(optarg) * 1e6; - break; - case 's': - initSeed = atoi(optarg); - myFlags |= SCF_setSeed; - break; - case 'r': - robotEnable = 1; - robotProg = optarg; - myFlags |= SCF_usingRobot; - break; - case 'F': - fairRobot = 1; - myFlags |= SCF_fairRobot; - break; - case 'd': - dropModeEnable = 1; - break; - case 'D': - dropModeEnable = 2; - break; - case 'C': - colorEnable = 0; - break; - case 'S': - standoutEnable = 0; - break; - case 'k': - MapKeys(optarg); - break; - case 'H': - DistInfo(); - exit(0); - case 'R': - Rules(); - exit(0); - case 'h': - Usage(); - exit(0); - default: - Usage(); - exit(1); - } - if (optind < argc || (initConn && waitConn)) { + { + int i; + char *userName; + + for (i = 0; i <= MAX_SCREENS; i++) + Players[i].score.level = Players[i].spy = 1; + if (!(userName = getenv("LOGNAME")) || !userName[0]) + if (!(userName = getenv("USER")) || !userName[0]) + userName = "Anonymous"; + strncpy(Players[0].name, userName, 16); //sizeof(Player.name) + Players[0].name[16] = 0; + Players[0].boardWidth = 10; + Players[0].boardHeight = MAX_BOARD_HEIGHT; + Players[0].boardVisible = 20; + Players[0].spy = 1; + strcpy(Players[0].host, "localhost"); + } + +// if (getopt(argc, argv, "f:") == 'f') +// ReadConf(optarg); +// else + ReadConf(CONFIG_FILE); + while ((ch = getopt_long(argc, argv, + "hHRs:r:Fk:c:odDSCap:i:l:", options, NULL)) != -1) + HandleOption(ch, optarg); + if (optind < argc) { Usage(); exit(1); } if (fairRobot && !robotEnable) fatal("You can't use the -F option without the -r option"); +// WriteConf(); + InitUtil(); - if (robotEnable) - InitRobot(robotProg); - InitNet(); InitScreens(); - if (initConn || waitConn) { - MyEvent event; - + if (initConn) { game = GT_classicTwo; - if (initConn) - InitiateConnection(hostStr, portStr); - else if (waitConn) - WaitForConnection(portStr); - { - netint4 data[2]; - int major; - - data[0] = hton4(MAJOR_VERSION); - data[1] = hton4(PROTOCOL_VERSION); - 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)); - major = ntoh4(data[0]); - protocolVersion = ntoh4(data[1]); - if (event.u.net.type != NP_version || major < MAJOR_VERSION) - fatal("Your opponent is using an old, incompatible version\n" - "of Netris. They should get the latest version."); - if (major > MAJOR_VERSION) - fatal("Your opponent is using an newer, incompatible version\n" - "of Netris. Get the latest version."); - if (protocolVersion > PROTOCOL_VERSION) - protocolVersion = PROTOCOL_VERSION; - } - if (protocolVersion < 3 && stepDownInterval != DEFAULT_INTERVAL) - fatal("Your opponent's version of Netris predates the -i option.\n" - "For fairness, you shouldn't use the -i option either."); - { - netint4 data[3]; - int len; - int seed; - - if (protocolVersion >= 3) - len = sizeof(data); - else - len = sizeof(netint4[2]); - if ((myFlags & SCF_setSeed)) - seed = initSeed; - else - seed = time(0); - if (waitConn) - SRandom(seed); - data[0] = hton4(myFlags); - data[1] = hton4(seed); - data[2] = hton4(stepDownInterval); - SendPacket(0, NP_startConn, len, data); - if (WaitMyEvent(&event, EM_net) != E_net || - event.u.net.type != NP_startConn) - fatal("Network negotiation failed"); - memcpy(data, event.u.net.data, len); - opponentFlags = ntoh4(data[0]); - seed = ntoh4(data[1]); - if (initConn) { - if ((opponentFlags & SCF_setSeed) != (myFlags & SCF_setSeed)) - fatal("If one player sets the random number seed, " - "both must."); - if ((myFlags & SCF_setSeed) && seed != initSeed) - fatal("Both players have set the random number seed, " - "and they are unequal."); - if (protocolVersion >= 3 && stepDownInterval != ntoh4(data[2])) - fatal("Your opponent is using a different step-down " - "interval (-i).\nYou must both use the same one."); - SRandom(seed); - } - } - { - char *userName; - int len, i; - - userName = getenv("LOGNAME"); - if (!userName || !userName[0]) - userName = getenv("USER"); - if (!userName || !userName[0]) - strcpy(userName, "???"); - len = strlen(userName)+1; - if (len > sizeof(opponentName)) - len = sizeof(opponentName); - SendPacket(0, NP_userName, len, userName); - if (WaitMyEvent(&event, EM_net) != E_net || - event.u.net.type != NP_userName) - fatal("Network negotiation failed"); - strncpy(opponentName, event.u.net.data, - sizeof(opponentName)-1); - opponentName[sizeof(opponentName)-1] = 0; - for (i = 0; opponentName[i]; ++i) - if (!isprint(opponentName[i])) - opponentName[i] = '?'; - for (i = 0; opponentHost[i]; ++i) - if (!isprint(opponentHost[i])) - opponentHost[i] = '?'; - } - OneGame(0, 1); - } + InitiateConnection(hostStr, portStr); + HandShake(); + OneGame(me); + } //client else { game = GT_onePlayer; - OneGame(0, -1); - } + totalPlayers = 0; + me = 1; + memcpy(&Players[me], &Players[0], sizeof(Player)); + OneGame(me); + } //singleplay return 0; }