Added serverkey to config. Added sv_areainfo command.

Author: DanielBrockhaus

.gitignore

@@ -10,4 +10,5 @@ v3.*
 *.log
 *.o
 *.d
+.serverkey
 accman/var

docs/quests.md

@@ -18,3 +18,23 @@ Feels easier then Creepers at first. Larger groups with evasive mages can be cha
 
 
 **5000 EXP, 27% of level 16.**
+
+## Smuggler Book (Below Aston 2, Imp. Leader)
+
+Went right past the book and cleared the section. Found the book on the way back.
+
+** 1000 EXP, 6.7% of level 15.**
+
+## Contraband (Below Aston 2, Imp. Leader)
+
+Quest items as random drops. Not sure if this is a good idea. I got all but one twice on a single run, so it might be fine.
+
+**4x1000 EXP, 27% of level 15.**
+
+## Smuggler Leader (Below Aston 2, Imp. Leader)
+
+Guild leader was a wimp, continuing the tradition.
+
+_The kill does not count unless you received the quest already. Considering that many players will just clear the area right away this might need fixing.
+_
+**2000 EXP, 13% of level 15.**

src/client.h

@@ -261,7 +261,7 @@ union ceffect {
 #define SV_GOLD 30
 #define SV_LOOKINV 31
 #define SV_ITEMPRICE 32
-#define SV__FREE_FOR_USE4__ 33
+#define SV_AREAINFO 33
 #define SV_CEFFECT 34
 #define SV_UEFFECT 35
 #define SV_REALTIME 36

src/config.c

@@ -14,7 +14,8 @@ struct config_data config_data = {
     .dbuser = "root",
     .dbpass = "tgbdwf3h",
     .dbname = "merc35",
-    .chathost = "localhost"};
+    .chathost = "localhost",
+    .svrkey = "4242"};
 
 void config_set_name(char *name, char *value) {
     if (!strcmp(name, "dbhost")) {
@@ -37,6 +38,10 @@ void config_set_name(char *name, char *value) {
         config_data.chathost = strdup(value);
         return;
     }
+    if (!strcmp(name, "svrkey")) {
+        config_data.svrkey = strdup(value);
+        return;
+    }
     fprintf(stderr, "config_set: unknown name '%s'.\n", name);
     exit(1);
 }
@@ -123,4 +128,5 @@ void config_getenv(void) {
     if ((tmp = getenv("AS35_DBPASS"))) config_data.dbpass = tmp;
     if ((tmp = getenv("AS35_DBNAME"))) config_data.dbname = tmp;
     if ((tmp = getenv("AS35_CHATHOST"))) config_data.chathost = tmp;
+    if ((tmp = getenv("AS35_SVRKEY"))) config_data.svrkey = tmp;
 }

src/config.h

@@ -5,6 +5,7 @@ struct config_data {
     char *dbpass;
     char *dbname;
     char *chathost;
+    char *svrkey;
 };
 extern struct config_data config_data;
 

src/player.c

@@ -53,6 +53,9 @@
 #include "questlog.h"
 #include "shrine.h"
 #include "spell.h"
+#include "config.h"
+
+#define SERVER_PROTOCOL_VERSION 2
 
 #define MAX_IDLE (TICKS * 30)
 
@@ -350,10 +353,12 @@ static void read_login(int nr) {
     // clients v1 and better understand SV_PROTOCOL, so we tell them the server version
     if (player[nr]->client_version > 0) {
         buf[0] = SV_PROTOCOL;
-        buf[1] = 1;
+        buf[1] = SERVER_PROTOCOL_VERSION;
         psend(nr, buf, 2);
     }
 
+    player_areainfo(nr, 0);
+
     if (!(ch[cn].flags & CF_AREACHANGE)) {
         show_motd(nr);
         show_clan_message(cn);
@@ -2839,6 +2844,33 @@ int get_player_version(int nr) {
 int get_char_version(int cn) {
     int nr;
 
+    if (!player) return 0;
+
     if ((nr = ch[cn].player) && player[nr]) return player[nr]->client_version;
     else return 0;
 }
+
+void player_areainfo(int nr, unsigned short cmd) {
+    char buf[80];
+
+    if (!player) return;
+    if (!player[nr]) return;
+
+    if (player[nr]->client_version < 2) return;
+
+    buf[0] = SV_AREAINFO;
+    *(unsigned short *)(buf + 1) = cmd;
+
+    switch (cmd) {
+    case AIC_SETID:
+        *(unsigned short *)(buf + 3) = (unsigned short)areaID;
+        *(unsigned short *)(buf + 5) = atoi(config_data.svrkey); // server_key: vanilla 3.5 is 2, default is 4242
+        break;
+    case AIC_CLEAR:
+        *(unsigned short *)(buf + 3) = 0u;
+        *(unsigned short *)(buf + 5) = 0u;
+        break;
+    }
+
+    psend(nr, buf, 7);
+}

src/player.h

@@ -158,3 +158,7 @@ unsigned int get_player_addr(int nr);
 void sendquestlog(int cn, int nr);
 int get_player_version(int nr);
 int get_char_version(int cn);
+
+#define AIC_SETID 0
+#define AIC_CLEAR 1
+void player_areainfo(int nr, unsigned short cmd);

src/random.c

@@ -1251,6 +1251,7 @@ void create_dungeon(int cn, int co, int level, struct master_data *dat) {
     say(cn, "This dungeon will collapse in %.2f minutes.", DUNGEONTIME / (TICKS * 60.0));
 
     teleport_char_driver(co, xoff + 2, yoff + 58);
+    player_areainfo(ch[co].player, AIC_CLEAR);
 }
 
 void enter_dungeon(int cn, int co, int target, struct master_data *dat) {
@@ -1280,6 +1281,7 @@ void enter_dungeon(int cn, int co, int target, struct master_data *dat) {
     say(cn, "This dungeon will collapse in %.2f minutes,", tmp / (TICKS * 60.0));
 
     teleport_char_driver(co, (target % 4) * 61 + 4, (target / 4) * 61 + 60);
+    player_areainfo(ch[co].player, AIC_CLEAR);
 }
 
 void list_dungeon(int cn, struct master_data *dat) {

src/server.c

@@ -154,6 +154,9 @@ int main(int argc, char *args[]) {
     printf("   ********************************************\n");
     printf("\n");
 
+    // load serverkey from file first so it can be overwritten by config
+    config_file(".serverkey");
+
     if (argc > 1) {
         while (1) {
             c = getopt(argc, args, "a:m:i:w:dhcs:f:e");