Added serverkey to config. Added sv_areainfo command.

Author: DanielBrockhaus

.gitignore

@@ -17,3 +17,4 @@ zones/generic/armor.itm
 *.vpw
 *.vpwhist
 *.vtg
+.serverkey

client.h

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

config.c

@@ -14,7 +14,8 @@ struct config_data config_data = {
     .dbuser = "root",
     .dbpass = "tgbdwf3h",
     .dbname = "merc",
-    .chathost = "localhost"};
+    .chathost = "localhost",
+    .svrkey = "4241"};
 
 void config_set_name(char *name, char *value) {
     if (!strcmp(name, "dbhost")) {
@@ -37,6 +38,11 @@ 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 +129,5 @@ void config_getenv(void) {
     if ((tmp = getenv("AS3_DBPASS"))) config_data.dbpass = tmp;
     if ((tmp = getenv("AS3_DBNAME"))) config_data.dbname = tmp;
     if ((tmp = getenv("AS3_CHATHOST"))) config_data.chathost = tmp;
+    if ((tmp = getenv("AS3_SVRKEY"))) config_data.svrkey = tmp;
 }

config.h

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

player.c

@@ -59,6 +59,9 @@
 #include "military.h"
 #include "questlog.h"
 #include "shrine.h"
+#include "config.h"
+
+#define SERVER_PROTOCOL_VERSION 2
 
 #define MAX_IDLE (TICKS * 30)
 
@@ -360,9 +363,10 @@ static void read_login(int nr) {
 
     if (player[nr]->client_version) {
         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);
@@ -2815,6 +2819,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 is 1, default is 4241
+        break;
+    case AIC_CLEAR:
+        *(unsigned short *)(buf + 3) = 0u;
+        *(unsigned short *)(buf + 5) = 0u;
+        break;
+    }
+
+    psend(nr, buf, 7);
+}

player.h

@@ -163,3 +163,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);

random.c

@@ -1260,6 +1260,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) {
@@ -1289,6 +1290,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) {

server.c

@@ -182,6 +182,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:dhcs:f:e");

start

@@ -1,5 +1,9 @@
 #!/bin/sh
 
+pkill chatserver
+pkill server
+sleep 1
+
 # Chatserver needs to run first
 echo chatserver
 ./chatserver >/dev/null &
@@ -11,6 +15,10 @@ sleep 1
 ./server -a 2 -d
 sleep 1
 ./server -a 3 -d
+sleep 1
+./server -a 14 -d
+sleep 1
+./server -a 33 -d
 # ... add them all here for a full server
 
 echo Done