SWMP code removed per ref #234

diff --git a/hdrs/conf.h b/hdrs/conf.h
index b28738a6d2eab2aed1a058d1ca06da0134bd33cf..38301c9ddb1222903e375e456753f0d47c854f8a 100644 (file)
--- a/hdrs/conf.h
+++ b/hdrs/conf.h
@@ -468,9 +468,6 @@ int cf_time(const char *opt, const char *val, void *loc, int maxval,
 #define SQL_USER (options.sql_username)
 #define SQL_PASS (options.sql_password)
 #endif
-#ifdef _SWMP_
-#define SQLCMD_MasterRoom (options.sql_master)
-#endif
 
 #define CHUNK_SWAP_FILE (options.chunk_swap_file)
 #define CHUNK_CACHE_MEMORY (options.chunk_cache_memory)

diff --git a/hdrs/externs.h b/hdrs/externs.h
index e822a7e7b22ec0c4a420675184f83c293117806c..99bd8da9fd276e70eb5ae4c7463060b7743589c8 100644 (file)
--- a/hdrs/externs.h
+++ b/hdrs/externs.h
@@ -253,9 +253,6 @@ extern EVAL_CONTEXT global_eval_context;
 extern char *wenv[10], renv[NUMQ][BUFFER_LEN];
 extern char *wnxt[10], *rnxt[NUMQ];
 */
-#ifdef _SWMP_
-extern int sql_env[2]; /* Sql Environment */
-#endif
 extern void do_second(void);
 extern int do_top(int ncom);
 extern void do_halt(dbref owner, const char *ncom, dbref victim);

diff --git a/options.h.dist b/options.h.dist
index f5a4a02174f7cd1cf9cf595ba6d7856921368f12..5f6e7bf0872b4bf891c05fdd3effc798e93a3e1e 100644 (file)
--- a/options.h.dist
+++ b/options.h.dist
@@ -115,8 +115,9 @@
 /* Standard PennMUSH chat system.  Allows user to talk cross-MUSH
  * to each other, without needing to be in the same room.  Wether or
  * not you want this depends on what type of MUSH you want.
+ * **RECOMMENDED NOT TO ENABLE THIS DURING 0.80 DEVELOPMENT!**
  */
-#define CHAT_SYSTEM /* */
+/* #define CHAT_SYSTEM /* */
 
 /* Many MUSHes want to change the +channels to =channels. That's
  * annoying. So we've got this CHAT_TOKEN_ALIAS, which allows + as well

diff --git a/src/cque.c b/src/cque.c
index 766e9839dce2731696c56b41af056fb59a47ffdb..0f17860362d205d61d824d2d8f910e0bda7089bf 100644 (file)
--- a/src/cque.c
+++ b/src/cque.c
@@ -711,10 +711,6 @@ do_top(int ncom)
       qlast = NULL;
     if (GoodObject(entry->player) && !IsGarbage(entry->player)) {
       global_eval_context.cplr = entry->player;
-#ifdef _SWMP_
-      sql_env[0] = entry->sql_env[0];
-      sql_env[1] = entry->sql_env[1];
-#endif
       giveto(global_eval_context.cplr, QUEUE_COST);
       add_to(entry->queued, -1);
       entry->player = 0;

diff --git a/src/function.c b/src/function.c
index 1c20ba889415f9fe7ed5ce92ec3e23a23da8a93c..a309d0757e5f622345e5eeb80c0f1ef88e877ad7 100644 (file)
--- a/src/function.c
+++ b/src/function.c
@@ -692,9 +692,6 @@ FUNTAB flist[] = {
   {"SPEAKPENN", fun_speak, 2, 7, FN_REG},
   {"SPELLNUM", fun_spellnum, 1, 1, FN_REG},
   {"SPLICE", fun_splice, 3, 4, FN_REG},
-#ifdef _SWMP_
-  {"SQ_RESPOND", fun_sq_respond, 1, 1, FN_REG},
-#endif
   {"SQL", fun_sql, 1, 3, FN_REG},
   {"SQLESCAPE", fun_sql_escape, 1, 1, FN_REG},
   {"SQUISH", fun_squish, 1, 2, FN_REG},

diff --git a/src/game.c b/src/game.c
index aab34a84c2db16910eaf0e7f2b84311a0b8f57e1..a7d43aba64f26f8b0b431fa7a9082ed161389101 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -871,9 +871,6 @@ init_game_postdb(const char *conf)
     options.ssl_port = 0;       /* Disable ssl */
   }
 #endif
-#if (defined(HAS_MYSQL) && defined(_SWMP_))
-  sql_startup();
-#endif
 }
 
 extern int dbline;

diff --git a/src/timer.c b/src/timer.c
index 50f99b0a7eea6d7edd51c77165124c2d357baf0f..168a6a0813711d8adb48250df7c1a4322fa78325 100644 (file)
--- a/src/timer.c
+++ b/src/timer.c
@@ -55,9 +55,6 @@ static sig_atomic_t usr1_triggered = 0;
 
 extern void inactivity_check(void);
 extern void reopen_logs(void);
-#ifdef _SWMP_
-extern void sql_timer();
-#endif
 static void migrate_stuff(int amount);
 
 #ifndef WIN32
@@ -298,9 +295,6 @@ dispatch(void)
   if((mudtime % 60) == 0)
     run_cron(); /* Run the MUSH Cron Daemon */
 #endif /* MUSHCRON */
-#ifdef _SWMP_
-  sql_timer();
-#endif
 #ifdef RPMODE_SYS 
   rplog_reset();
 #endif