This is patch36 to PennMUSH 1.7.7. After applying this patch, you will have version 1.7.7p36 To apply this patch, save it to a file in your top-level MUSH directory, and do the following: patch -p1 < 1.7.7-patch36 make clean make install If you use GNU patch 2.2, you probably want the above to be 'patch -b -p1', not just 'patch -p1'. Unix (or cygwin) users need not worry about failed hunks in src/switchinc.c, hdrs/switches.h, hdrs/cmds.h, or hdrs/funs.h. These files are automatically rebuilt on compile. On the off chance they appear not to be, simply rm them and re-run make. Then @shutdown and restart your MUSH. - Alan/Javelin In this patch: Functions: * l/lv/n/nv/x/xvthings() functions by Walker@M*U*S*H. * New flag to locate(), 'y', for matching player names like pmatch(), without requiring a leading * before the name like the 'p' flag. [SW] * lattr()/nattr() works for mortals on non-owned objects, showing or counting only attribs they can examine. Suggested by Philip Mak, patch by Walker@M*U*S*H. Minor changes (user-visible): * Mortals can no longer teleport HEAVY admin through exits. Suggested by Ambrosia@M*U*S*H. Minor changes (internals): * win32 directory has subdirectories for msvc6 and msvc.net. [EEH] * locate() on dark rooms now works for see_all players. Suggested by Wayne@PDX. Fixes: * @mail subjects are stripped of ansi before being stored (escape chars were always smashed on display). Suggested by Wayne@PDX. * @command/delete by God of a non-existing command caused a crash. Report by Wayne@PDX. * Follow works again. Report by Shirow. * Fix to digest()'s sha hash on systems without OpenSSL. [SW] * @list/command no longer includes duplicates. Report by Relay@M*U*S*H. [EEH] * comp() again returns -1/1 instead of -2/2. Report by Jessica Hawthorne. * sort() of large floats works again. Report by Jessica Hawthorne. * Linting of warnings in funlist.c. Report by Nymeria@M*U*S*H. * It was possible for wizards to create circular zone chains that would cause an infinite loop. Report by Wayne@PDX. * safe_ansi_string was double-prepending starting ansi codes. Report by Shirow. * Debian packaging improvements. [EEH] * Help fixes by Mike Griffiths. Prereq: 1.7.7p35 *** 1_7_7.1146/Patchlevel Wed, 21 Jul 2004 16:39:21 -0500 dunemush (pennmush/5_Patchlevel 1.17.1.11.1.37 600) --- 1_7_7.1169(w)/Patchlevel Mon, 09 Aug 2004 14:06:08 -0500 dunemush (pennmush/5_Patchlevel 1.17.1.11.1.38 600) *************** *** 1,2 **** Do not edit this file. It is maintained by the official PennMUSH patches. ! This is PennMUSH 1.7.7p35 --- 1,2 ---- Do not edit this file. It is maintained by the official PennMUSH patches. ! This is PennMUSH 1.7.7p36 *** 1_7_7.1146/CHANGES.177 Wed, 21 Jul 2004 16:39:21 -0500 dunemush (pennmush/g/23_CHANGES 1.48.1.258.1.14.1.157 600) --- 1_7_7.1169(w)/CHANGES.177 Thu, 12 Aug 2004 12:23:20 -0500 dunemush (pennmush/g/23_CHANGES 1.48.1.258.1.14.1.174 600) *************** *** 18,23 **** --- 18,58 ---- ========================================================================== + Version 1.7.7 patchlevel 36 August 9, 2004 + + Functions: + * l/lv/n/nv/x/xvthings() functions by Walker@M*U*S*H. + * New flag to locate(), 'y', for matching player names like pmatch(), + without requiring a leading * before the name like the 'p' flag. [SW] + * lattr()/nattr() works for mortals on non-owned objects, showing + or counting only attribs they can examine. Suggested by Philip Mak, + patch by Walker@M*U*S*H. + Minor changes (user-visible): + * Mortals can no longer teleport HEAVY admin through exits. + Suggested by Ambrosia@M*U*S*H. + Minor changes (internals): + * win32 directory has subdirectories for msvc6 and msvc.net. [EEH] + * locate() on dark rooms now works for see_all players. Suggested + by Wayne@PDX. + Fixes: + * @mail subjects are stripped of ansi before being stored (escape + chars were always smashed on display). Suggested by Wayne@PDX. + * @command/delete by God of a non-existing command caused a crash. + Report by Wayne@PDX. + * Follow works again. Report by Shirow. + * Fix to digest()'s sha hash on systems without OpenSSL. [SW] + * @list/command no longer includes duplicates. Report by Relay@M*U*S*H. [EEH] + * comp() again returns -1/1 instead of -2/2. Report by Jessica Hawthorne. + * sort() of large floats works again. Report by Jessica Hawthorne. + * Linting of warnings in funlist.c. Report by Nymeria@M*U*S*H. + * It was possible for wizards to create circular zone chains that + would cause an infinite loop. Report by Wayne@PDX. + * safe_ansi_string was double-prepending starting ansi codes. + Report by Shirow. + * Debian packaging improvements. [EEH] + * Help fixes by Mike Griffiths. + + Version 1.7.7 patchlevel 35 July 21, 2004 Attributes: *** 1_7_7.1146/game/txt/hlp/pennfunc.hlp Sat, 17 Jul 2004 20:49:33 -0500 dunemush (pennmush/16_pennfunc.h 1.2.1.50.1.1.1.1.1.2.1.7.1.8.1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.9.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.17 600) --- 1_7_7.1169(w)/game/txt/hlp/pennfunc.hlp Thu, 12 Aug 2004 11:57:18 -0500 dunemush (pennmush/16_pennfunc.h 1.2.1.50.1.1.1.1.1.2.1.7.1.8.1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.9.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.21 600) *************** *** 1121,1126 **** --- 1121,1127 ---- See also: @lock, locktypes & EMIT() + & NSEMIT() emit() nsemit() *************** *** 1884,1891 **** lattr([/]) lattrp([/]) ! Returns a space-separated list of the attribute names on the object. ! You must either be a Wizard or Royalty, own the object, have the See_All power, or have the object set VISUAL in order to use this function on the object. --- 1885,1893 ---- lattr([/]) lattrp([/]) ! Returns a space-separated list of the attribute names on the object ! that you are permitted to examine. To see the complete list, ! you must either be a Wizard or Royalty, own the object, have the See_All power, or have the object set VISUAL in order to use this function on the object. *************** *** 1906,1916 **** attrpcnt([/]) This function (known by two names) returns the number of attributes ! on the object. You must have permission to examine the object ! in order to use this function, but its count may include attributes ! that are not visible to you. This function is considerably faster ! than words(lattr()) and doesn't suffer from buffer length constraints. ! It's designed primarily for statistical purposes. nattrp() and attrpcnt() also count matching attributes on the parent. --- 1908,1916 ---- attrpcnt([/]) This function (known by two names) returns the number of attributes ! on the object that you are permitted to examine. This function is ! considerably faster than words(lattr()) and doesn't suffer from buffer ! length constraints. It's designed primarily for statistical purposes. nattrp() and attrpcnt() also count matching attributes on the parent. *************** *** 1951,1956 **** --- 1951,1957 ---- Returns the first characters from string. + & NSLEMIT() & LEMIT() lemit() nslemit() *************** *** 2117,2122 **** --- 2118,2124 ---- m - "me" ( itself) n - Neighbors (other objects in same location as ) p - Player names prefixed by '*' + y - Player names with or without a '*' prefix z - English-style matching (my 2nd book) of * - All of the above (try a complete match) *************** *** 2199,2205 **** see_all power. You must be in or control it to use this function. ! See also: lvplayers(), lcon() & LPOS() lpos(, ) --- 2201,2214 ---- see_all power. You must be in or control it to use this function. ! See also: lvplayers(), lcon(), lthings() ! & LTHINGS() ! lthings() ! ! This function returns the dbrefs of all things, dark or not, in ! . You must be in or control it to use this function. ! ! See also: lvthings(), lcon() & LPOS() lpos(, ) *************** *** 2307,2312 **** --- 2316,2327 ---- This function returns the dbrefs of all connected and non-dark players in an object. You must be in the object or control it to use this function. + & LVTHINGS() + lvthings() + + This function returns the dbrefs of all connected and non-dark things + inside an object. You must be in the object or control it to use this + function. & LWHO() lwho() *************** *** 2757,2762 **** --- 2772,2788 ---- nvplayers() is identical to words(lvplayers()) See also: ncon(), nexits(), xplayers(), lplayers(), lvplayers() + & NVTHINGS() + & NTHINGS() + nthings() + nvthings() + + These functions return a count of the things in a container. + + nthings() is identical to words(lthings()) + nvthings() is identical to words(lvthings()) + + See also: ncon(), nexits(), xthings(), lthings(), lvthings() & NWHO() nwho() *************** *** 2803,2808 **** --- 2829,2835 ---- See also: playermem() & OEMIT() + & NSOEMIT() oemit([/] [ ...],) nsoemit([/] [ ...],) *************** *** 2869,2874 **** --- 2896,2902 ---- If you specify a second argument, it tries to re-parent the object. In this case, you must control the object. & PEMIT() + & NSPEMIT() pemit(,) nspemit(,) *************** *** 3048,3053 **** --- 3076,3082 ---- See also: regrab() & REMIT() + & NSREMIT() remit(, ) nsremit(, ) *************** *** 4452,4457 **** --- 4481,4501 ---- lvplayers() See also: nplayers(), lplayers(), lvplayers() + & XVTHINGS() + & XTHINGS() + xthings(,,) + xvthings(,,) + + xthings() fetches or fewer non-player dbrefs from 's + contents starting at position . It is useful when the number of + players in a container causes lthings() to exceed the buffer limit. + + It is equivalent to extract(lthings(),,) + + xvthings() is identical, except it follows the restrictions of + lvthings() + + See also: nthings(), lthings(), lvthings() & XWHO() & XMWHO() xwho(start,count) *************** *** 4468,4473 **** --- 4512,4518 ---- See also: lwho(), mwho(), nwho() & ZEMIT() + & NSZEMIT() zemit(, ) nszemit(, ) *** 1_7_7.1146/game/txt/hlp/penncmd.hlp Wed, 21 Jul 2004 15:26:22 -0500 dunemush (pennmush/18_penncmd.hl 1.2.1.1.1.47.1.1.1.1.1.3.1.4.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.10.1.1.1.1.1.1.1.1.1.1.1.40 600) --- 1_7_7.1169(w)/game/txt/hlp/penncmd.hlp Thu, 12 Aug 2004 11:58:14 -0500 dunemush (pennmush/18_penncmd.hl 1.2.1.1.1.47.1.1.1.1.1.3.1.4.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.10.1.1.1.1.1.1.1.1.1.1.1.41 600) *************** *** 2217,2232 **** @nslemit[/] @nspemit[/switches] = @nsremit[/switches] = . @nszemit = These wizard-only commands work like @emit, @lemit, @pemit, @remit, ! and @zemit, respectively, but will not include nospoof information. They are meant to be used by commands in the master room where the nospoof information is just useless noise. They take all switches of their respective commands. ! See also: @emit, @lemit, @pemit, @remit, @zemit, nsemit(), nslemit(), ! nspemit(), nsremit(), nszemit() & @odeath @odeath [=] --- 2217,2233 ---- @nslemit[/] @nspemit[/switches] = @nsremit[/switches] = . + @nsoemit[/] [/] [...] = @nszemit = These wizard-only commands work like @emit, @lemit, @pemit, @remit, ! @oemit, and @zemit, respectively, but will not include nospoof information. They are meant to be used by commands in the master room where the nospoof information is just useless noise. They take all switches of their respective commands. ! See also: @emit, @lemit, @pemit, @remit, @oemit, @zemit, nsemit(), nslemit(), ! nspemit(), nsremit(), nsoemit(), nszemit() & @odeath @odeath [=] *** 1_7_7.1146/src/wiz.c Wed, 21 Jul 2004 11:20:20 -0500 dunemush (pennmush/b/23_wiz.c 1.44.1.1.1.1.1.2.1.7.1.1.1.1.1.1.1.1.1.1.1.8.1.2.2.2.1.2.1.1.1.1.1.1.1.2.1.1.1.2.2.17.1.9.1.30.1.1 660) --- 1_7_7.1169(w)/src/wiz.c Thu, 12 Aug 2004 13:03:58 -0500 dunemush (pennmush/b/23_wiz.c 1.44.1.1.1.1.1.2.1.7.1.1.1.1.1.1.1.1.1.1.1.8.1.2.2.2.1.2.1.1.1.1.1.1.1.2.1.1.1.2.2.17.1.9.1.30.1.2 660) *************** *** 530,542 **** return; } else { /* attempted teleport to an exit */ ! if (Tel_Anything(player) || controls(player, victim) ! || controls(player, Location(victim))) do_move(victim, to, MOVE_NORMAL); ! else notify_format(victim, T("%s tries to impose his will on you and fails."), Name(player)); } } } --- 530,543 ---- return; } else { /* attempted teleport to an exit */ ! if (tport_control_ok(player, victim, Location(victim))) do_move(victim, to, MOVE_NORMAL); ! else { ! notify(player, T("Permission denied.")); notify_format(victim, T("%s tries to impose his will on you and fails."), Name(player)); + } } } } *** 1_7_7.1146/src/strutil.c Wed, 21 Jul 2004 16:38:49 -0500 dunemush (pennmush/b/33_strutil.c 1.28.1.3.1.3.1.7.2.1.1.2.1.1.1.1.1.1.1.21.1.2.1.2.1.21 660) --- 1_7_7.1169(w)/src/strutil.c Thu, 12 Aug 2004 13:03:58 -0500 dunemush (pennmush/b/33_strutil.c 1.28.1.3.1.3.1.7.2.1.1.2.1.1.1.1.1.1.1.21.1.2.1.2.1.23 660) *************** *** 1696,1701 **** --- 1696,1796 ---- * in ansi, html, or both. We also know how many html tags have been * opened. */ + } + + /* Copy the text. The right thing to do now would be to have a stack + * of open html tags and clear in_html once all of the tags have + * been closed. We don't quite do that, alas. + */ + for (p = (int) start; p < (int) (start + len) && p < (int) as->len; p++) { + if (as->codes[p]) { + if (safe_str(as->codes[p], buff, bp)) + return 1; + if (is_end_ansi_code(as->codes[p])) + in_ansi = 0; + else if (is_ansi_code(as->codes[p])) + in_ansi = 1; + if (is_end_html_code(as->codes[p])) + in_html--; + else if (is_start_html_code(as->codes[p])) + in_html++; + } + if (safe_chr(as->text[p], buff, bp)) + return 1; + } + + /* Output (only) closing codes if needed. */ + while (p <= (int) as->len) { + if (!in_ansi && !in_html) + break; + if (as->codes[p]) { + if (is_end_ansi_code(as->codes[p])) { + in_ansi = 0; + if (safe_str(as->codes[p], buff, bp)) + return 1; + } else if (is_end_html_code(as->codes[p])) { + in_html--; + if (safe_str(as->codes[p], buff, bp)) + return 1; + } + } + p++; + } + if (in_ansi) + safe_str(ANSI_NORMAL, buff, bp); + return 0; + } + + /** Safely append an ansi_string into a buffer as a real string, + * with extra copying of starting tags (for wrap()/align()). + * \param as pointer to ansi_string to append. + * \param start position in as to start copying from. + * \param len length in characters to copy from as. + * \param buff buffer to insert into. + * \param bp pointer to pointer to insertion point of buff. + * \retval 0 success. + * \retval 1 failure. + */ + int + safe_ansi_string2(ansi_string *as, size_t start, size_t len, char *buff, + char **bp) + { + int p, q; + int in_ansi = 0; + int in_html = 0; + + if (!as) + return 1; + + depopulate_codes(as); + + if (start > as->len || len == 0 || as->len == 0) + return safe_str("", buff, bp); + + /* Find the starting codes by working our way backward until we + * reach some opening codes, and then working our way back from there + * until we hit a non-opening code or non-code + */ + p = start; + while ((p >= 0) && (as->codes[p] == NULL)) + p--; + /* p is now either <0 or pointing to a code */ + if ((p >= 0) && !is_end_html_code(as->codes[p]) && + !is_end_ansi_code(as->codes[p])) { + /* p is now pointing to a starting code */ + q = p; + while ((q >= 0) && as->codes[q] && !is_end_html_code(as->codes[q]) && + !is_end_ansi_code(as->codes[q])) { + if (is_ansi_code(as->codes[q])) + in_ansi = 1; + else if (is_start_html_code(as->codes[q])) + in_html++; + q--; + } + /* p is now pointing to the first starting code, and we know if we're + * in ansi, html, or both. We also know how many html tags have been + * opened. + */ /* Except there's this one problem - Now we know it, we weren't * doing anything with it. */ *************** *** 1747,1752 **** --- 1842,1848 ---- safe_str(ANSI_NORMAL, buff, bp); return 0; } + /** Safely append a list item to a buffer, possibly with punctuation * and conjunctions. *** 1_7_7.1146/src/set.c Sat, 17 Jul 2004 21:02:33 -0500 dunemush (pennmush/b/38_set.c 1.26.1.5.1.1.2.1.1.1.1.1.1.11.1.1.1.1.1.1.1.1.1.1.1.1.1.38 660) --- 1_7_7.1169(w)/src/set.c Thu, 12 Aug 2004 13:03:58 -0500 dunemush (pennmush/b/38_set.c 1.26.1.5.1.1.2.1.1.1.1.1.1.11.1.1.1.1.1.1.1.1.1.1.1.1.1.39 660) *************** *** 325,331 **** } else { Owner(thing) = Owner(newowner); } ! Zone(thing) = Zone(newowner); clear_flag_internal(thing, "CHOWN_OK"); if (!preserve || !Wizard(player)) { clear_flag_internal(thing, "WIZARD"); --- 325,354 ---- } else { Owner(thing) = Owner(newowner); } ! /* Don't allow circular zones */ ! Zone(thing) = NOTHING; ! if (GoodObject(Zone(newowner))) { ! dbref tmp; ! int ok_to_zone = 1; ! int zone_depth = MAX_ZONES; ! for (tmp = Zone(Zone(newowner)); GoodObject(tmp); tmp = Zone(tmp)) { ! if (tmp == thing) { ! notify(player, T("Circular zone broken.")); ! ok_to_zone = 0; ! break; ! } ! if (tmp == Zone(tmp)) /* Ran into an object zoned to itself */ ! break; ! zone_depth--; ! if (!zone_depth) { ! ok_to_zone = 0; ! notify(player, T("Overly deep zone chain broken.")); ! break; ! } ! } ! if (ok_to_zone) ! Zone(thing) = Zone(newowner); ! } clear_flag_internal(thing, "CHOWN_OK"); if (!preserve || !Wizard(player)) { clear_flag_internal(thing, "WIZARD"); *************** *** 418,423 **** --- 441,447 ---- /* Don't allow circular zones */ if (GoodObject(zone)) { dbref tmp; + int zone_depth = MAX_ZONES; for (tmp = Zone(zone); GoodObject(tmp); tmp = Zone(tmp)) { if (tmp == thing) { notify(player, T("You can't make circular zones!")); *************** *** 425,430 **** --- 449,459 ---- } if (tmp == Zone(tmp)) /* Ran into an object zoned to itself */ break; + zone_depth--; + if (!zone_depth) { + notify(player, T("Overly deep zone chain.")); + return 0; + } } } *** 1_7_7.1146/src/move.c Sun, 11 Jul 2004 11:36:53 -0500 dunemush (pennmush/b/51_move.c 1.1.1.18.1.5.1.13.1.3.1.9.1.1.1.1.1.2.1.1.1.1.1.32 660) --- 1_7_7.1169(w)/src/move.c Thu, 12 Aug 2004 13:03:58 -0500 dunemush (pennmush/b/51_move.c 1.1.1.18.1.5.1.13.1.3.1.9.1.1.1.1.1.2.1.1.1.1.1.33 660) *************** *** 442,448 **** enter_room(player, var_dest, 0); /* Move the followers if the leader is elsewhere */ if (Location(player) != loc) ! follower_command(player, loc, tprintf("%s #%d", "move", exit_m)); break; case TYPE_PLAYER: case TYPE_THING: --- 442,448 ---- enter_room(player, var_dest, 0); /* Move the followers if the leader is elsewhere */ if (Location(player) != loc) ! follower_command(player, loc, tprintf("%s #%d", "goto", exit_m)); break; case TYPE_PLAYER: case TYPE_THING: *************** *** 458,464 **** safe_tel(player, var_dest, 0); /* Move the followers if the leader is elsewhere */ if (Location(player) != loc) ! follower_command(player, loc, tprintf("%s #%d", "move", exit_m)); break; case TYPE_EXIT: notify(player, T("This feature coming soon.")); --- 458,464 ---- safe_tel(player, var_dest, 0); /* Move the followers if the leader is elsewhere */ if (Location(player) != loc) ! follower_command(player, loc, tprintf("%s #%d", "goto", exit_m)); break; case TYPE_EXIT: notify(player, T("This feature coming soon.")); *** 1_7_7.1146/src/match.c Tue, 11 May 2004 10:08:19 -0500 dunemush (pennmush/c/2_match.c 1.24.1.1.1.4.1.1.1.1.1.1.1.1.1.1.1.29 660) --- 1_7_7.1169(w)/src/match.c Thu, 12 Aug 2004 13:03:58 -0500 dunemush (pennmush/c/2_match.c 1.24.1.1.1.4.1.1.1.1.1.1.1.1.1.1.1.30 660) *************** *** 64,69 **** --- 64,70 ---- /** Convenience alias for parse_objid */ #define match_absolute(name) parse_objid(name) static dbref match_player(const dbref matcher, const char *match_name); + static dbref match_pmatch(const dbref matcher, const char *match_name); static dbref choose_thing(const dbref match_who, const int preferred_type, long int flags, dbref thing1, dbref thing2); extern int check_alias(const char *command, const char *list); /* game.c */ *************** *** 341,346 **** --- 342,352 ---- if (GoodObject(match)) return match; } + if (flags & MAT_PMATCH) { + match = match_pmatch(who, name); + if (GoodObject(match)) + return match; + } } else { /* We're doing a nearby match and the player doesn't have * long_fingers, so it's a controlled absolute *************** *** 484,489 **** --- 490,509 ---- if (*match_name != LOOKUP_TOKEN) return NOTHING; for (p = match_name + 1; isspace((unsigned char) *p); p++) ; + /* If lookup_player fails, try a partial match on connected + * players, 2.0 style. That can return match, NOTHING, AMBIGUOUS + */ + match = lookup_player(p); + return (match != NOTHING) ? match : visible_short_page(matcher, p); + } + + static dbref + match_pmatch(const dbref matcher, const char *match_name) + { + dbref match; + const char *p; + + for (p = match_name; isspace((unsigned char) *p); p++) ; /* If lookup_player fails, try a partial match on connected * players, 2.0 style. That can return match, NOTHING, AMBIGUOUS */ *** 1_7_7.1146/src/funstr.c Tue, 06 Jul 2004 22:10:33 -0500 dunemush (pennmush/c/13_funstr.c 1.28.1.1.1.2.1.4.1.6.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.3.1.5.1.3.1.2.1.1.1.1.1.1.1.1.1.14.1.19 660) --- 1_7_7.1169(w)/src/funstr.c Thu, 12 Aug 2004 13:03:58 -0500 dunemush (pennmush/c/13_funstr.c 1.28.1.1.1.2.1.4.1.6.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.3.1.5.1.3.1.2.1.1.1.1.1.1.1.1.1.14.1.21 660) *************** *** 46,51 **** --- 46,52 ---- char *ptrs[MAX_COLS], ansi_string *as[MAX_COLS], int linenum, char *fieldsep, int fslen, char *linesep, int lslen, char filler); + static int comp_gencomp(dbref executor, char *left, char *right, char *type); void init_tag_hashtab(void); void init_pronouns(void); *************** *** 460,465 **** --- 461,474 ---- } + static int + comp_gencomp(dbref executor, char *left, char *right, char *type) + { + int c; + c = gencomp(executor, left, right, type); + return (c > 0 ? 1 : (c < 0 ? -1 : 0)); + } + /* ARGSUSED */ FUNCTION(fun_comp) { *************** *** 481,487 **** memcpy(left, l, llen); r = remove_markup(args[1], &rlen); memcpy(right, r, rlen); ! safe_integer(gencomp(executor, left, right, ALPHANUM_LIST), buff, bp); return; } case 'I': /* Case-insensitive lexicographic */ --- 490,497 ---- memcpy(left, l, llen); r = remove_markup(args[1], &rlen); memcpy(right, r, rlen); ! safe_integer(comp_gencomp(executor, left, right, ALPHANUM_LIST), buff, ! bp); return; } case 'I': /* Case-insensitive lexicographic */ *************** *** 492,499 **** memcpy(left, l, llen); r = remove_markup(args[1], &rlen); memcpy(right, r, rlen); ! safe_integer(gencomp(executor, left, right, INSENS_ALPHANUM_LIST), buff, ! bp); return; } case 'N': /* Integers */ --- 502,509 ---- memcpy(left, l, llen); r = remove_markup(args[1], &rlen); memcpy(right, r, rlen); ! safe_integer(comp_gencomp(executor, left, right, INSENS_ALPHANUM_LIST), ! buff, bp); return; } case 'N': /* Integers */ *************** *** 501,514 **** safe_str(T(e_ints), buff, bp); return; } ! safe_integer(gencomp(executor, args[0], args[1], NUMERIC_LIST), buff, bp); return; case 'F': if (!is_strict_number(args[0]) || !is_strict_number(args[1])) { safe_str(T(e_nums), buff, bp); return; } ! safe_integer(gencomp(executor, args[0], args[1], FLOAT_LIST), buff, bp); return; case 'D': { --- 511,526 ---- safe_str(T(e_ints), buff, bp); return; } ! safe_integer(comp_gencomp(executor, args[0], args[1], NUMERIC_LIST), buff, ! bp); return; case 'F': if (!is_strict_number(args[0]) || !is_strict_number(args[1])) { safe_str(T(e_nums), buff, bp); return; } ! safe_integer(comp_gencomp(executor, args[0], args[1], FLOAT_LIST), buff, ! bp); return; case 'D': { *************** *** 519,525 **** safe_str(T("#-1 INVALID DBREF"), buff, bp); return; } ! safe_integer(gencomp(executor, args[0], args[1], DBREF_LIST), buff, bp); return; } default: --- 531,538 ---- safe_str(T("#-1 INVALID DBREF"), buff, bp); return; } ! safe_integer(comp_gencomp(executor, args[0], args[1], DBREF_LIST), buff, ! bp); return; } default: *************** *** 1789,1800 **** if (ansilen < 0) { /* word doesn't fit on one line, so cut it */ ! safe_ansi_string(as, pstr - as->text, ansiwidth - 1, buff, bp); safe_chr('-', buff, bp); pstr += ansiwidth - 1; /* move to start of next line */ } else { /* normal line */ ! safe_ansi_string(as, pstr - as->text, ansilen, buff, bp); if (pstr[ansilen] == '\r') ++ansilen; pstr += ansilen + 1; /* move to start of next line */ --- 1802,1813 ---- if (ansilen < 0) { /* word doesn't fit on one line, so cut it */ ! safe_ansi_string2(as, pstr - as->text, ansiwidth - 1, buff, bp); safe_chr('-', buff, bp); pstr += ansiwidth - 1; /* move to start of next line */ } else { /* normal line */ ! safe_ansi_string2(as, pstr - as->text, ansilen, buff, bp); if (pstr[ansilen] == '\r') ++ansilen; pstr += ansilen + 1; /* move to start of next line */ *************** *** 1857,1870 **** sp = segment; if (!*ptr) { if (len > 0) { ! safe_ansi_string(as[i], ptrs[i] - (as[i]->text), len, segment, &sp); } ptrs[i] = ptr; } else if (*ptr == '\n') { for (tptr = ptr; *tptr && tptr >= ptrs[i] && isspace(*tptr); tptr--) ; len = (tptr - ptrs[i]) + 1; if (len > 0) { ! safe_ansi_string(as[i], ptrs[i] - (as[i]->text), len, segment, &sp); } ptrs[i] = ptr + 1; ptr = tptr; --- 1870,1883 ---- sp = segment; if (!*ptr) { if (len > 0) { ! safe_ansi_string2(as[i], ptrs[i] - (as[i]->text), len, segment, &sp); } ptrs[i] = ptr; } else if (*ptr == '\n') { for (tptr = ptr; *tptr && tptr >= ptrs[i] && isspace(*tptr); tptr--) ; len = (tptr - ptrs[i]) + 1; if (len > 0) { ! safe_ansi_string2(as[i], ptrs[i] - (as[i]->text), len, segment, &sp); } ptrs[i] = ptr + 1; ptr = tptr; *************** *** 1874,1885 **** for (tptr = ptr; *tptr && tptr >= ptrs[i] && isspace(*tptr); tptr--) ; len = (tptr - ptrs[i]) + 1; if (len > 0) { ! safe_ansi_string(as[i], ptrs[i] - (as[i]->text), len, segment, &sp); } ptrs[i] = lastspace; } else { if (len > 0) { ! safe_ansi_string(as[i], ptrs[i] - (as[i]->text), len, segment, &sp); } ptrs[i] = ptr; } --- 1887,1898 ---- for (tptr = ptr; *tptr && tptr >= ptrs[i] && isspace(*tptr); tptr--) ; len = (tptr - ptrs[i]) + 1; if (len > 0) { ! safe_ansi_string2(as[i], ptrs[i] - (as[i]->text), len, segment, &sp); } ptrs[i] = lastspace; } else { if (len > 0) { ! safe_ansi_string2(as[i], ptrs[i] - (as[i]->text), len, segment, &sp); } ptrs[i] = ptr; } *** 1_7_7.1146/src/funlist.c Sun, 25 Jul 2004 06:52:25 -0500 dunemush (pennmush/c/16_funlist.c 1.3.1.1.1.5.1.2.1.1.1.1.1.4.1.2.1.2.1.19.1.2.1.1.1.2.1.5.1.1.1.1.1.1.1.1.1.1.2.1.1.3.1.2.1.1.1.1.1.1.1.1.1.1.1.12.1.14.1.7.1.17 660) --- 1_7_7.1169(w)/src/funlist.c Thu, 12 Aug 2004 13:03:58 -0500 dunemush (pennmush/c/16_funlist.c 1.3.1.1.1.5.1.2.1.1.1.1.1.4.1.2.1.2.1.19.1.2.1.1.1.2.1.5.1.1.1.1.1.1.1.1.1.1.2.1.1.3.1.2.1.1.1.1.1.1.1.1.1.1.1.12.1.14.1.7.1.19 660) *************** *** 18,23 **** --- 18,24 ---- #include "mymalloc.h" #include "pcre.h" #include "match.h" + #include "command.h" #include "attrib.h" #include "dbdefs.h" #include "flags.h" *************** *** 700,706 **** typedef int (*qsort_func) (const void *, const void *); typedef void (*makerecord) (s_rec *, dbref player, char *sortflags); ! #define GENRECORD(x) void x(s_rec *rec,dbref player,char *sortflags) /** Sorting strings by different values. We store both the string and * its 'key' to sort by. Sort of a hardcode munge. --- 701,710 ---- typedef int (*qsort_func) (const void *, const void *); typedef void (*makerecord) (s_rec *, dbref player, char *sortflags); ! #define GENRECORD(x) void x(s_rec *rec,dbref player,char *sortflags); \ ! void x(s_rec *rec, \ ! dbref player __attribute__ ((__unused__)), \ ! char *sortflags __attribute__ ((__unused__))) /** Sorting strings by different values. We store both the string and * its 'key' to sort by. Sort of a hardcode munge. *************** *** 779,785 **** { const s_rec *sr1 = (const s_rec *) s1; const s_rec *sr2 = (const s_rec *) s2; ! int res = 0; res = sr1->numval - sr2->numval; return Compare(res, sr1, sr2); } --- 783,789 ---- { const s_rec *sr1 = (const s_rec *) s1; const s_rec *sr2 = (const s_rec *) s2; ! NVAL res = 0; res = sr1->numval - sr2->numval; return Compare(res, sr1, sr2); } *************** *** 808,814 **** GENRECORD(gen_db_name) { ! rec->str = ""; if (RealGoodObject(rec->db)) rec->str = (char *) Name(rec->db); } --- 812,818 ---- GENRECORD(gen_db_name) { ! rec->str = (char *) ""; if (RealGoodObject(rec->db)) rec->str = (char *) Name(rec->db); } *************** *** 859,865 **** { /* Eek, I hate dealing with memory issues. */ ! static char *defstr = ""; const char *ptr; rec->str = defstr; --- 863,869 ---- { /* Eek, I hate dealing with memory issues. */ ! static char *defstr = (char *) ""; const char *ptr; rec->str = defstr; *************** *** 1027,1033 **** for (i = 0; ltypelist[i].name && strcasecmp(ltypelist[i].name, sort_type); i++) ; } - // FIXME s1.freestr = s2.freestr = 0; if (ltypelist[i].isdbs) { s1.db = parse_dbref(a); --- 1031,1036 ---- *************** *** 1085,1091 **** ltypelist[sorti].name && strcasecmp(ltypelist[sorti].name, sort_type); sorti++) ; } - // FIXME sp = (s_rec *) mush_malloc(n * sizeof(s_rec), "do_gensort"); for (i = 0; i < n; i++) { sp[i].val = s[i]; --- 1088,1093 ---- *************** *** 2851,2857 **** */ /* string, regexp, replacement string. Acts like sed or perl's s///g, ! //with an ig version */ int re_subpatterns = -1; /**< Number of subpatterns in regexp */ int *re_offsets; /**< Array of offsets to subpatterns */ char *re_from = NULL; /**< Pointer to last match position */ --- 2853,2859 ---- */ /* string, regexp, replacement string. Acts like sed or perl's s///g, ! * with an ig version */ int re_subpatterns = -1; /**< Number of subpatterns in regexp */ int *re_offsets; /**< Array of offsets to subpatterns */ char *re_from = NULL; /**< Pointer to last match position */ *** 1_7_7.1146/src/fundb.c Sat, 17 Jul 2004 21:02:33 -0500 dunemush (pennmush/c/17_fundb.c 1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.7.1.3.1.3.1.3.1.2.1.2.1.3.2.1.2.1.2.1.1.1.1.4.1.1.1.1.1.1.1.1.1.1.1.3.1.1.2.2.2.1.1.1.1.1.1.42.1.6 660) --- 1_7_7.1169(w)/src/fundb.c Thu, 12 Aug 2004 13:03:58 -0500 dunemush (pennmush/c/17_fundb.c 1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.7.1.3.1.3.1.3.1.2.1.2.1.3.2.1.2.1.2.1.1.1.1.4.1.1.1.1.1.1.1.1.1.1.1.3.1.1.2.2.2.1.1.1.1.1.1.42.1.11 660) *************** *** 124,141 **** safe_str(T(e_notvis), buff, bp); return; } - if (!Can_Examine(executor, thing)) { - safe_str(T(e_perm), buff, bp); - return; - } doparent = strchr(called_as, 'P') ? 1 : 0; ! if (!doparent && pattern == matchall) { safe_integer(AttrCount(thing), buff, bp); } else { ! safe_integer(atr_pattern_count(executor, thing, pattern, doparent, 0), buff, ! bp); } } --- 124,137 ---- safe_str(T(e_notvis), buff, bp); return; } doparent = strchr(called_as, 'P') ? 1 : 0; ! if (!doparent && pattern == matchall && Can_Examine(executor, thing)) { safe_integer(AttrCount(thing), buff, bp); } else { ! safe_integer(atr_pattern_count(executor, thing, pattern, doparent, ! !Can_Examine(executor, thing)), buff, bp); } } *************** *** 174,190 **** safe_str(T(e_notvis), buff, bp); return; } - if (!Can_Examine(executor, thing)) { - safe_str(T(e_perm), buff, bp); - return; - } lh.first = 1; lh.buff = buff; lh.bp = bp; if (strchr(called_as, 'P')) { ! (void) atr_iter_get_parent(executor, thing, pattern, 0, lattr_helper, &lh); } else { ! (void) atr_iter_get(executor, thing, pattern, 0, lattr_helper, &lh); } } --- 170,185 ---- safe_str(T(e_notvis), buff, bp); return; } lh.first = 1; lh.buff = buff; lh.bp = bp; if (strchr(called_as, 'P')) { ! (void) atr_iter_get_parent(executor, thing, pattern, ! !Can_Examine(executor, thing), lattr_helper, ! &lh); } else { ! (void) atr_iter_get(executor, thing, pattern, ! !Can_Examine(executor, thing), lattr_helper, &lh); } } *************** *** 627,633 **** int first; int nthing; dbref thing; ! int validloc, validthing; dbref startdb; nthing = 0; --- 622,628 ---- int first; int nthing; dbref thing; ! int validloc; dbref startdb; nthing = 0; *************** *** 651,682 **** (enactor == loc))) { first = 1; DOLIST_VISIBLE(thing, startdb, executor) { ! validthing = can_interact(thing, executor, INTERACT_SEE); ! if (type == TYPE_PLAYER) ! validthing &= (skipdark ? (IsPlayer(thing) && !Dark(thing) ! && Connected(thing)) : IsPlayer(thing)); ! else ! validthing &= (skipdark ? (!Dark(thing)) : 1); ! if (validthing) { ! nthing += 1; ! if (count < 1 || (nthing >= start && nthing < start + count)) { ! if (buff) { ! if (first) ! first = 0; ! else ! safe_chr(' ', buff, bp); ! safe_dbref(thing, buff, bp); ! } ! } ! if (result == NOTHING) { ! if (after == NOTHING) ! result = thing; ! if (after == thing) ! after = NOTHING; } - if (retcount) - *retcount = nthing; } } } else if (buff) safe_str("#-1", buff, bp); --- 646,682 ---- (enactor == loc))) { first = 1; DOLIST_VISIBLE(thing, startdb, executor) { ! /* Skip if: ! * - We're not checking this type ! * - We can't interact with this thing ! * - We're only listing visual objects, and it's dark ! * - It's a player, not connected, and skipdark is true ! * Funkily, lvcon() shows unconnected players, so we ! * use type == TYPE_PLAYER for this check. :-/. ! */ ! if (!(Typeof(thing) & type) || ! !can_interact(thing, executor, INTERACT_SEE) || ! (skipdark && Dark(thing)) || ! ((type == TYPE_PLAYER) && skipdark && !Connected(thing))) ! continue; ! nthing += 1; ! if (count < 1 || (nthing >= start && nthing < start + count)) { ! if (buff) { ! if (first) ! first = 0; ! else ! safe_chr(' ', buff, bp); ! safe_dbref(thing, buff, bp); } } + if (result == NOTHING) { + if (after == NOTHING) + result = thing; + if (after == thing) + after = NOTHING; + } + if (retcount) + *retcount = nthing; } } else if (buff) safe_str("#-1", buff, bp); *************** *** 725,730 **** --- 725,733 ---- switch (*ptr) { case 'C': /* con */ + type = TYPE_THING | TYPE_PLAYER; + break; + case 'T': /* things */ type = TYPE_THING; break; case 'P': /* players */ *************** *** 735,741 **** break; default: /* This should never be reached ... */ ! type = TYPE_THING; } dbwalk(buffptr, bptr, executor, enactor, type, loc, NOTHING, --- 738,744 ---- break; default: /* This should never be reached ... */ ! type = TYPE_THING | TYPE_PLAYER; } dbwalk(buffptr, bptr, executor, enactor, type, loc, NOTHING, *************** *** 1729,1734 **** --- 1732,1740 ---- case 'n': match_flags |= MAT_NEIGHBOR; break; + case 'y': + match_flags |= MAT_PMATCH; + break; case 'p': match_flags |= MAT_PLAYER; break; *************** *** 1776,1782 **** else safe_dbref(NOTHING, buff, bp); } else { ! if (can_interact(item, executor, INTERACT_SEE) && !DarkLegal(item)) safe_dbref(item, buff, bp); else safe_dbref(NOTHING, buff, bp); --- 1782,1789 ---- else safe_dbref(NOTHING, buff, bp); } else { ! if (can_interact(item, executor, INTERACT_SEE) ! && (See_All(executor) || !DarkLegal(item))) safe_dbref(item, buff, bp); else safe_dbref(NOTHING, buff, bp); *** 1_7_7.1146/src/function.c Sat, 17 Jul 2004 20:49:33 -0500 dunemush (pennmush/c/18_function.c 1.29.1.14.1.3.1.6.1.1.1.1.1.14.1.2.1.1.1.7.1.22.1.11.1.3.1.24.1.3 660) --- 1_7_7.1169(w)/src/function.c Thu, 12 Aug 2004 13:03:58 -0500 dunemush (pennmush/c/18_function.c 1.29.1.14.1.3.1.6.1.1.1.1.1.14.1.2.1.1.1.7.1.22.1.11.1.3.1.24.1.4 660) *************** *** 347,355 **** --- 347,357 ---- {"LSTATS", fun_lstats, 0, 1, FN_REG}, {"LT", fun_lt, 2, 2, FN_REG}, {"LTE", fun_lte, 2, 2, FN_REG}, + {"LTHINGS", fun_dbwalker, 1, 1, FN_REG}, {"LVCON", fun_dbwalker, 1, 1, FN_REG}, {"LVEXITS", fun_dbwalker, 1, 1, FN_REG}, {"LVPLAYERS", fun_dbwalker, 1, 1, FN_REG}, + {"LVTHINGS", fun_dbwalker, 1, 1, FN_REG}, {"LWHO", fun_lwho, 0, 0, FN_REG}, {"MAIL", fun_mail, 0, 2, FN_REG}, {"MAILFROM", fun_mailfrom, 1, 2, FN_REG}, *************** *** 399,409 **** --- 401,413 ---- {"NSPEMIT", fun_pemit, 2, -2, FN_REG}, {"NSREMIT", fun_remit, 2, -2, FN_REG}, {"NSZEMIT", fun_zemit, 2, -2, FN_REG}, + {"NTHINGS", fun_dbwalker, 1, 1, FN_REG}, {"NUM", fun_num, 1, 1, FN_REG}, {"NULL", fun_null, 1, INT_MAX, FN_REG}, {"NVCON", fun_dbwalker, 1, 1, FN_REG}, {"NVEXITS", fun_dbwalker, 1, 1, FN_REG}, {"NVPLAYERS", fun_dbwalker, 1, 1, FN_REG}, + {"NVTHINGS", fun_dbwalker, 1, 1, FN_REG}, {"NWHO", fun_nwho, 0, 0, FN_REG}, {"OBJ", fun_obj, 1, 1, FN_REG}, {"OBJEVAL", fun_objeval, 2, -2, FN_NOPARSE}, *************** *** 546,554 **** --- 550,560 ---- {"XPLAYERS", fun_dbwalker, 3, 3, FN_REG}, {"XGET", fun_xget, 2, 2, FN_REG}, {"XOR", fun_xor, 2, INT_MAX, FN_REG}, + {"XTHINGS", fun_dbwalker, 3, 3, FN_REG}, {"XVCON", fun_dbwalker, 3, 3, FN_REG}, {"XVEXITS", fun_dbwalker, 3, 3, FN_REG}, {"XVPLAYERS", fun_dbwalker, 3, 3, FN_REG}, + {"XVTHINGS", fun_dbwalker, 3, 3, FN_REG}, {"XWHO", fun_xwho, 2, 2, FN_REG}, {"ZEMIT", fun_zemit, 2, -2, FN_REG}, {"ZFUN", fun_zfun, 1, 11, FN_REG}, *** 1_7_7.1146/src/funcrypt.c Tue, 08 Jun 2004 12:15:45 -0500 dunemush (pennmush/c/19_funcrypt.c 1.16 660) --- 1_7_7.1169(w)/src/funcrypt.c Thu, 12 Aug 2004 13:03:58 -0500 dunemush (pennmush/c/19_funcrypt.c 1.19 660) *************** *** 35,47 **** #include "confmagic.h" ! static char *crunch_code _((char *code)); ! static char *crypt_code _((char *code, char *text, int type)); #ifdef HAS_OPENSSL static void safe_hexchar(unsigned char c, char *buff, char **bp); #endif /* Copy over only alphanumeric chars */ static char * crunch_code(char *code) --- 35,49 ---- #include "confmagic.h" ! static char *crunch_code(char *code); ! static char *crypt_code(char *code, char *text, int type); #ifdef HAS_OPENSSL static void safe_hexchar(unsigned char c, char *buff, char **bp); #endif + static void safe_sha0(const char *text, size_t len, char *buff, char **bp); + /* Copy over only alphanumeric chars */ static char * crunch_code(char *code) *************** *** 106,111 **** --- 108,136 ---- return textbuff; } + static void + safe_sha0(const char *text, size_t len, char *buff, char **bp) + { + #ifdef HAS_OPENSSL + unsigned char hash[SHA_DIGEST_LENGTH]; + int n; + + SHA(text, len, hash); + + for (n = 0; n < SHA_DIGEST_LENGTH; n++) + safe_hexchar(hash[n], buff, bp); + #else + SHS_INFO shsInfo; + shsInfo.reverse_wanted = (BYTE) options.reverse_shs; + shsInit(&shsInfo); + shsUpdate(&shsInfo, (const BYTE *) text, len); + shsFinal(&shsInfo); + safe_format(buff, bp, "%0lx%0lx%0lx%0lx%0lx", shsInfo.digest[0], + shsInfo.digest[1], shsInfo.digest[2], shsInfo.digest[3], + shsInfo.digest[4]); + #endif + } + FUNCTION(fun_encrypt) { safe_str(crypt_code(args[1], args[0], 1), buff, bp); *************** *** 128,151 **** FUNCTION(fun_sha0) { ! #ifdef HAS_OPENSSL ! unsigned char hash[SHA_DIGEST_LENGTH]; ! int n; ! ! SHA(args[0], arglens[0], hash); ! ! for (n = 0; n < SHA_DIGEST_LENGTH; n++) ! safe_hexchar(hash[n], buff, bp); ! #else ! SHS_INFO shsInfo; ! shsInfo.reverse_wanted = (BYTE) options.reverse_shs; ! shsInit(&shsInfo); ! shsUpdate(&shsInfo, (const BYTE *) args[0], arglens[0]); ! shsFinal(&shsInfo); ! safe_format(buff, bp, "%0lx%0lx%0lx%0lx%0lx", shsInfo.digest[0], ! shsInfo.digest[1], shsInfo.digest[2], shsInfo.digest[3], ! shsInfo.digest[4]); ! #endif } FUNCTION(fun_digest) --- 153,159 ---- FUNCTION(fun_sha0) { ! safe_sha0(args[0], arglens[0], buff, bp); } FUNCTION(fun_digest) *************** *** 171,184 **** #else if (strcmp(args[0], "sha") == 0) { ! SHS_INFO shsInfo; ! shsInfo.reverse_wanted = (BYTE) options.reverse_shs; ! shsInit(&shsInfo); ! shsUpdate(&shsInfo, (const BYTE *) args[0], arglens[0]); ! shsFinal(&shsInfo); ! safe_format(buff, bp, "%0lx%0lx%0lx%0lx%0lx", shsInfo.digest[0], ! shsInfo.digest[1], shsInfo.digest[2], shsInfo.digest[3], ! shsInfo.digest[4]); } else { safe_str(T("#-1 UNSUPPORTED DIGEST TYPE"), buff, bp); } --- 179,185 ---- #else if (strcmp(args[0], "sha") == 0) { ! safe_sha0(args[1], arglens[1], buff, bp); } else { safe_str(T("#-1 UNSUPPORTED DIGEST TYPE"), buff, bp); } *** 1_7_7.1146/src/extmail.c Wed, 21 Jul 2004 11:49:58 -0500 dunemush (pennmush/c/22_extmail.c 1.44.1.7.1.5.1.9.1.1.1.1.1.20 660) --- 1_7_7.1169(w)/src/extmail.c Thu, 12 Aug 2004 13:03:58 -0500 dunemush (pennmush/c/22_extmail.c 1.44.1.7.1.5.1.9.1.1.1.1.1.22 660) *************** *** 978,983 **** --- 978,984 ---- char *mailsig; char sbuf[BUFFER_LEN]; ATTR *a; + char *cp; if (!IsPlayer(target)) { notify(player, T("MAIL: You cannot send mail to non-existent people.")); *************** *** 1006,1014 **** newp->to = target; newp->from = player; newp->from_ctime = CreTime(player); /* Deal with the subject */ ! if (subject) ! strcpy(sbuf, subject); else strcpy(sbuf, T("(no subject)")); if ((flags & M_FORWARD) && !string_prefix(sbuf, "Fwd:")) --- 1007,1017 ---- newp->to = target; newp->from = player; newp->from_ctime = CreTime(player); + /* Deal with the subject */ ! cp = remove_markup(subject, NULL); ! if (subject && cp && *cp) ! strcpy(sbuf, cp); else strcpy(sbuf, T("(no subject)")); if ((flags & M_FORWARD) && !string_prefix(sbuf, "Fwd:")) *** 1_7_7.1146/src/destroy.c Sat, 17 Jul 2004 20:49:33 -0500 dunemush (pennmush/c/24_destroy.c 1.24.2.2.1.3.1.1.1.1.1.1.1.4.1.1.1.1.1.13 660) --- 1_7_7.1169(w)/src/destroy.c Thu, 12 Aug 2004 13:03:57 -0500 dunemush (pennmush/c/24_destroy.c 1.24.2.2.1.3.1.1.1.1.1.1.1.4.1.1.1.1.1.14 660) *************** *** 1166,1171 **** --- 1166,1172 ---- check_zones(void) { dbref n, zone = NOTHING, tmp; + int zone_depth; for (n = 0; n < db_top; n++) { if (IsGarbage(n)) *************** *** 1176,1182 **** if (ZONE_CONTROL_ZMP && !IsPlayer(zone)) continue; if (zone != n) /* Objects can be zoned to themselves */ ! for (tmp = Zone(zone); GoodObject(tmp); tmp = Zone(tmp)) { if (tmp == n) { notify_format(Owner(n), T("You own an object in a circular zone chain: %s"), --- 1177,1184 ---- if (ZONE_CONTROL_ZMP && !IsPlayer(zone)) continue; if (zone != n) /* Objects can be zoned to themselves */ ! for (zone_depth = MAX_ZONES, tmp = Zone(zone); ! zone_depth-- && GoodObject(tmp); tmp = Zone(tmp)) { if (tmp == n) { notify_format(Owner(n), T("You own an object in a circular zone chain: %s"), *** 1_7_7.1146/src/command.c Wed, 21 Jul 2004 15:26:22 -0500 dunemush (pennmush/c/36_command.c 1.56.1.1.1.1.1.1.1.2.1.1.1.1.1.5.1.2.1.1.1.1.1.2.1.3.1.10.1.1.3.67 660) --- 1_7_7.1169(w)/src/command.c Thu, 12 Aug 2004 13:03:57 -0500 dunemush (pennmush/c/36_command.c 1.56.1.1.1.1.1.1.1.2.1.1.1.1.1.5.1.2.1.1.1.1.1.2.1.3.1.10.1.1.3.70 660) *************** *** 1376,1381 **** --- 1376,1385 ---- return; } command = command_find(name); + if (!command) { + notify(player, T("No such command.")); + return; + } if (command->func != cmd_unimplemented) { notify(player, T("You can't delete built-in commands. @hook/override instead.")); *************** *** 1564,1574 **** nptrs++; command = (COMMAND_INFO *) ptab_nextentry(&ptab_command); } bp = buff; safe_str(ptrs[0], buff, &bp); for (i = 1; i < nptrs; i++) { ! safe_chr(' ', buff, &bp); ! safe_str(ptrs[i], buff, &bp); } *bp = '\0'; return buff; --- 1568,1584 ---- nptrs++; command = (COMMAND_INFO *) ptab_nextentry(&ptab_command); } + + do_gensort((dbref) 0, (char **) ptrs, nptrs, ALPHANUM_LIST); bp = buff; safe_str(ptrs[0], buff, &bp); for (i = 1; i < nptrs; i++) { ! if (gencomp ! ((dbref) 0, (char *) ptrs[i], (char *) ptrs[i - 1], ! ALPHANUM_LIST) > 0) { ! safe_chr(' ', buff, &bp); ! safe_str(ptrs[i], buff, &bp); ! } } *bp = '\0'; return buff; *** 1_7_7.1146/hdrs/version.h Wed, 21 Jul 2004 16:39:21 -0500 dunemush (pennmush/c/47_version.h 1.32.1.2.1.7.1.9.1.1.1.17.1.39 660) --- 1_7_7.1169(w)/hdrs/version.h Thu, 12 Aug 2004 13:03:58 -0500 dunemush (pennmush/c/47_version.h 1.32.1.2.1.7.1.9.1.1.1.17.1.40 660) *************** *** 1,4 **** #define VERSION "1.7.7" ! #define PATCHLEVEL "35" ! #define PATCHDATE "[07/21/2004]" ! #define NUMVERSION 001007007035 --- 1,4 ---- #define VERSION "1.7.7" ! #define PATCHLEVEL "36" ! #define PATCHDATE "[08/09/2004]" ! #define NUMVERSION 001007007036 *** 1_7_7.1146/hdrs/match.h Fri, 05 Jul 2002 12:57:10 -0500 dunemush (pennmush/d/4_match.h 1.7 660) --- 1_7_7.1169(w)/hdrs/match.h Thu, 12 Aug 2004 13:03:58 -0500 dunemush (pennmush/d/4_match.h 1.8 660) *************** *** 19,24 **** --- 19,25 ---- #define MAT_NEIGHBOR 0x000100 #define MAT_POSSESSION 0x000200 #define MAT_EXIT 0x004000 + #define MAT_PMATCH 0x008000 /* special things to match */ #define MAT_CARRIED_EXIT 0x010000 #define MAT_CONTAINER 0x020000 *** 1_7_7.1146/hdrs/externs.h Wed, 21 Jul 2004 15:26:22 -0500 dunemush (pennmush/d/16_externs.h 1.1.1.53.1.2.1.8.2.1.1.2.1.1.1.1.1.2.1.6.1.3.1.4.3.1.1.1.1.18.1.8.1.1.1.30 660) --- 1_7_7.1169(w)/hdrs/externs.h Thu, 12 Aug 2004 13:03:58 -0500 dunemush (pennmush/d/16_externs.h 1.1.1.53.1.2.1.8.2.1.1.2.1.1.1.1.1.2.1.6.1.3.1.4.3.1.1.1.1.18.1.8.1.1.1.32 660) *************** *** 447,452 **** --- 447,454 ---- account. */ extern int safe_ansi_string(ansi_string *as, size_t start, size_t len, char *buff, char **bp); + extern int safe_ansi_string2(ansi_string *as, size_t start, size_t len, + char *buff, char **bp); /* Append N copies of the character X to the end of a string */ extern int safe_fill(char x, size_t n, char *buff, char **bp); /* Append an accented string */ *** 1_7_7.1146/hdrs/copyrite.h Tue, 30 Sep 2003 18:30:48 -0500 dunemush (pennmush/d/19_copyrite.h 1.4 660) --- 1_7_7.1169(w)/hdrs/copyrite.h Thu, 12 Aug 2004 13:03:58 -0500 dunemush (pennmush/d/19_copyrite.h 1.5 660) *************** *** 13,22 **** * TinyMUSH 2.2 source code, with permission. TinyMUSH 2.2 is * Copyright (c) 1994-2002, Jean Marie Diaz, Lydia Leong, and Devin Hooker. * ! * Some code used in this server may have been directive from TinyMUSH 2.0. * Copyright (c) 1995, Joseph Traub, Glenn Crocker. * ! * Some code used in this server may have been directive from TinyMUD. * Copyright (c) 1995, David Applegate, James Aspnes, Timothy Freeman * and Bennet Yee. * --- 13,22 ---- * TinyMUSH 2.2 source code, with permission. TinyMUSH 2.2 is * Copyright (c) 1994-2002, Jean Marie Diaz, Lydia Leong, and Devin Hooker. * ! * Some code used in this server may have been derived from TinyMUSH 2.0. * Copyright (c) 1995, Joseph Traub, Glenn Crocker. * ! * Some code used in this server may have been derived from TinyMUD. * Copyright (c) 1995, David Applegate, James Aspnes, Timothy Freeman * and Bennet Yee. * *************** *** 170,176 **** * * Past and present PennMUSH development team members: * T. Alexander Popiel, Ralph Melton, Thorvald Natvig, Luuk de Waard, ! * Shawn Wagner * Past and present PennMUSH porters: * Nick Gammon, Sylvia, Dan Williams, Ervin Hearn III * TinyMUSH 2.2, TinyMUSH 3.0, TinyMUX 2, and RhostMUSH developers --- 170,176 ---- * * Past and present PennMUSH development team members: * T. Alexander Popiel, Ralph Melton, Thorvald Natvig, Luuk de Waard, ! * Shawn Wagner, Ervin Hearn III * Past and present PennMUSH porters: * Nick Gammon, Sylvia, Dan Williams, Ervin Hearn III * TinyMUSH 2.2, TinyMUSH 3.0, TinyMUX 2, and RhostMUSH developers *** 1_7_7.1146/hdrs/conf.h Thu, 15 Jul 2004 14:37:11 -0500 dunemush (pennmush/d/20_conf.h 1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.5.1.1.1.1.1.1.1.1.1.2.1.1.2.1.2.13.1.4.1.20.1.23 660) --- 1_7_7.1169(w)/hdrs/conf.h Thu, 12 Aug 2004 13:03:58 -0500 dunemush (pennmush/d/20_conf.h 1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.5.1.1.1.1.1.1.1.1.1.2.1.1.2.1.2.13.1.4.1.20.1.24 660) *************** *** 345,350 **** --- 345,351 ---- #define PURGE_INTERVAL (options.purge_interval) #define DBCK_INTERVAL (options.dbck_interval) #define MAX_PARENTS (options.max_parents) + #define MAX_ZONES (30) #define MAX_DEPTH (options.max_depth) #define MAX_PENNIES (options.max_pennies) #define MAX_GUEST_PENNIES (options.max_guest_pennies) *** 1_7_7.1146/COPYRITE Thu, 15 Jul 2004 14:37:11 -0500 dunemush (pennmush/d/29_COPYRITE 1.7 600) --- 1_7_7.1169(w)/COPYRITE Sun, 08 Aug 2004 21:35:43 -0500 dunemush (pennmush/d/29_COPYRITE 1.8 600) *************** *** 170,176 **** * * Past and present PennMUSH development team members: * T. Alexander Popiel, Ralph Melton, Thorvald Natvig, Luuk de Waard, ! * Shawn Wagner * Past and present PennMUSH porters: * Nick Gammon, Sylvia, Dan Williams, Ervin Hearn III * TinyMUSH 2.2, TinyMUSH 3.0, TinyMUX 2, and RhostMUSH developers --- 170,176 ---- * * Past and present PennMUSH development team members: * T. Alexander Popiel, Ralph Melton, Thorvald Natvig, Luuk de Waard, ! * Shawn Wagner, Ervin Hearn III * Past and present PennMUSH porters: * Nick Gammon, Sylvia, Dan Williams, Ervin Hearn III * TinyMUSH 2.2, TinyMUSH 3.0, TinyMUX 2, and RhostMUSH developers *** 1_7_7.1146/MANIFEST Sat, 26 Jun 2004 20:31:02 -0500 dunemush (pennmush/d/34_MANIFEST 1.21.1.2.1.7.1.3.1.26 600) --- 1_7_7.1169(w)/MANIFEST Thu, 12 Aug 2004 13:02:31 -0500 dunemush (pennmush/d/34_MANIFEST 1.21.1.2.1.7.1.3.1.26 600) *************** *** 233,242 **** win32/funs.h win32/options.h win32/patches.h ! win32/pennmush.dsp ! win32/pennmush.dsw ! win32/pennmush.vcproj ! win32/pennmush.sln win32/README.mingw src/SWITCHES test/MUSHConnection.pm --- 233,242 ---- win32/funs.h win32/options.h win32/patches.h ! win32/msvc6/pennmush.dsp ! win32/msvc6/pennmush.dsw ! win32/msvc.net/pennmush.vcproj ! win32/msvc.net/pennmush.sln win32/README.mingw src/SWITCHES test/MUSHConnection.pm *** 1_7_7.1146/win32/pennmush.dsw Sun, 29 Feb 2004 19:48:18 -0600 dunemush (pennmush/f/8_pennmush.d 1.5 640) --- 1_7_7.1169(w)/win32/msvc6/pennmush.dsw Sun, 08 Aug 2004 16:05:02 -0500 dunemush (pennmush/f/8_pennmush.d 1.6 600) *************** *** 1,29 **** ! Microsoft Developer Studio Workspace File, Format Version 6.00 ! # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ! ! ############################################################################### ! ! Project: "pennmush"=.\pennmush.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Global: ! ! Package=<5> ! {{{ ! }}} ! ! Package=<3> ! {{{ ! }}} ! ! ############################################################################### ! --- 1,29 ---- ! Microsoft Developer Studio Workspace File, Format Version 6.00 ! # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ! ! ############################################################################### ! ! Project: "pennmush"=.\pennmush.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Global: ! ! Package=<5> ! {{{ ! }}} ! ! Package=<3> ! {{{ ! }}} ! ! ############################################################################### ! *** 1_7_7.1146/win32/pennmush.dsp Mon, 28 Jun 2004 09:33:37 -0500 dunemush (pennmush/f/9_pennmush.d 1.20 640) --- 1_7_7.1169(w)/win32/msvc6/pennmush.dsp Sun, 08 Aug 2004 16:05:02 -0500 dunemush (pennmush/f/9_pennmush.d 1.21 600) *************** *** 1,854 **** ! # Microsoft Developer Studio Project File - Name="pennmush" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=pennmush - Win32 MySQL Debug ! !MESSAGE This is not a valid makefile. To build this project using NMAKE, ! !MESSAGE use the Export Makefile command and run ! !MESSAGE ! !MESSAGE NMAKE /f "pennmush.mak". ! !MESSAGE ! !MESSAGE You can specify a configuration when running NMAKE ! !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE ! !MESSAGE NMAKE /f "pennmush.mak" CFG="pennmush - Win32 MySQL Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "pennmush - Win32 MySQL SSL Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "pennmush - Win32 MySQL SSL Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "pennmush - Win32 MySQL Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "pennmush - Win32 MySQL Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "pennmush - Win32 SSL Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "pennmush - Win32 SSL Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "pennmush - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "pennmush - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE ! ! # Begin Project ! # PROP AllowPerConfigDependencies 0 ! # PROP Scc_ProjName "" ! # PROP Scc_LocalPath "" ! CPP=cl.exe ! RSC=rc.exe ! ! !IF "$(CFG)" == "pennmush - Win32 MySQL SSL Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "pennmush___Win32_MySQL_SSL_Debug" ! # PROP BASE Intermediate_Dir "pennmush___Win32_MySQL_SSL_Debug" ! # PROP BASE Ignore_Export_Lib 0 ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "./game" ! # PROP Intermediate_Dir "./src" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /GX /ZI /I "./win32" /I "./hdrs" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # SUBTRACT BASE CPP /Ox /Ot /Os ! # ADD CPP /nologo /MD /W3 /GX /ZI /I "./win32" /I "./hdrs" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # SUBTRACT CPP /Ox /Ot /Os ! # ADD BASE RSC /l 0xc09 /d "_DEBUG" ! # ADD RSC /l 0xc09 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib user32.lib winmm.lib wsock32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib user32.lib winmm.lib wsock32.lib ssleay32.lib libeay32.lib libmysql.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # Begin Custom Build - Copying Necessary Files ! ProjDir=. ! InputPath=.\game\pennmush.exe ! SOURCE="$(InputPath)" ! ! BuildCmds= \ ! IF NOT EXIST $(ProjDir)\src\cmdlocal.c copy $(ProjDir)\src\cmdlocal.dst $(ProjDir)\src\cmdlocal.c \ ! IF NOT EXIST $(ProjDir)\src\flaglocal.c copy $(ProjDir)\src\flaglocal.dst $(ProjDir)\src\flaglocal.c \ ! IF NOT EXIST $(ProjDir)\src\funlocal.c copy $(ProjDir)\src\funlocal.dst $(ProjDir)\src\funlocal.c \ ! IF NOT EXIST $(ProjDir)\src\local.c copy $(ProjDir)\src\local.dst $(ProjDir)\src\local.c \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf echo Don't forget to customize mush.cnf! \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf copy $(ProjDir)\game\mushcnf.dst $(ProjDir)\game\mush.cnf \ ! copy $(ProjDir)\win32\cmds.h $(ProjDir)\hdrs\cmds.h \ ! copy $(ProjDir)\win32\funs.h $(ProjDir)\hdrs\funs.h \ ! echo If any *local.c files failed to build, run build again. \ ! ! ! "$(ProjDir)\src\cmdlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\flaglocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\funlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\local.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\game\mush.cnf" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\cmds.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\funs.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! # End Custom Build ! ! !ELSEIF "$(CFG)" == "pennmush - Win32 MySQL SSL Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "pennmush___Win32_MySQL_SSL_Release" ! # PROP BASE Intermediate_Dir "pennmush___Win32_MySQL_SSL_Release" ! # PROP BASE Ignore_Export_Lib 0 ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "./game" ! # PROP Intermediate_Dir "./src" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /GX /O2 /Ob0 /I "./hdrs" /I "./" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /I /Win32" " /c ! # ADD CPP /nologo /MD /W3 /GX /O2 /Ob0 /I "./hdrs" /I "./" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /I /Win32" " /c ! # ADD BASE RSC /l 0xc09 /d "NDEBUG" ! # ADD RSC /l 0xc09 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 user32.lib winmm.lib wsock32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /pdb:"pennmush.pdb" /machine:I386 ! # SUBTRACT BASE LINK32 /pdb:none ! # ADD LINK32 user32.lib winmm.lib wsock32.lib ssleay32.lib libeay32.lib libmysql.lib /nologo /subsystem:console /pdb:"pennmush.pdb" /machine:I386 ! # SUBTRACT LINK32 /pdb:none ! # Begin Custom Build - Copying Necessary Files ! ProjDir=. ! InputPath=.\game\pennmush.exe ! SOURCE="$(InputPath)" ! ! BuildCmds= \ ! IF NOT EXIST $(ProjDir)\src\cmdlocal.c copy $(ProjDir)\src\cmdlocal.dst $(ProjDir)\src\cmdlocal.c \ ! IF NOT EXIST $(ProjDir)\src\flaglocal.c copy $(ProjDir)\src\flaglocal.dst $(ProjDir)\src\flaglocal.c \ ! IF NOT EXIST $(ProjDir)\src\funlocal.c copy $(ProjDir)\src\funlocal.dst $(ProjDir)\src\funlocal.c \ ! IF NOT EXIST $(ProjDir)\src\local.c copy $(ProjDir)\src\local.dst $(ProjDir)\src\local.c \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf echo Don't forget to customize mush.cnf! \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf copy $(ProjDir)\game\mushcnf.dst $(ProjDir)\game\mush.cnf \ ! copy $(ProjDir)\win32\cmds.h $(ProjDir)\hdrs\cmds.h \ ! copy $(ProjDir)\win32\funs.h $(ProjDir)\hdrs\funs.h \ ! echo If any *local.c files failed to build, run build again. \ ! ! ! "$(ProjDir)\src\cmdlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\flaglocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\funlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\local.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\game\mush.cnf" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\cmds.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\funs.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! # End Custom Build ! ! !ELSEIF "$(CFG)" == "pennmush - Win32 MySQL Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "pennmush___Win32_MySQL_Debug" ! # PROP BASE Intermediate_Dir "pennmush___Win32_MySQL_Debug" ! # PROP BASE Ignore_Export_Lib 0 ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "./game" ! # PROP Intermediate_Dir "./src" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /GX /ZI /I "./win32" /I "./hdrs" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # SUBTRACT BASE CPP /Ox /Ot /Os ! # ADD CPP /nologo /MD /W3 /GX /ZI /I "./win32" /I "./hdrs" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # SUBTRACT CPP /Ox /Ot /Os ! # ADD BASE RSC /l 0xc09 /d "_DEBUG" ! # ADD RSC /l 0xc09 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib user32.lib winmm.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib user32.lib winmm.lib wsock32.lib libmysql.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # Begin Custom Build - Copying Necessary Files ! ProjDir=. ! InputPath=.\game\pennmush.exe ! SOURCE="$(InputPath)" ! ! BuildCmds= \ ! IF NOT EXIST $(ProjDir)\src\cmdlocal.c copy $(ProjDir)\src\cmdlocal.dst $(ProjDir)\src\cmdlocal.c \ ! IF NOT EXIST $(ProjDir)\src\flaglocal.c copy $(ProjDir)\src\flaglocal.dst $(ProjDir)\src\flaglocal.c \ ! IF NOT EXIST $(ProjDir)\src\funlocal.c copy $(ProjDir)\src\funlocal.dst $(ProjDir)\src\funlocal.c \ ! IF NOT EXIST $(ProjDir)\src\local.c copy $(ProjDir)\src\local.dst $(ProjDir)\src\local.c \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf echo Don't forget to customize mush.cnf! \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf copy $(ProjDir)\game\mushcnf.dst $(ProjDir)\game\mush.cnf \ ! copy $(ProjDir)\win32\cmds.h $(ProjDir)\hdrs\cmds.h \ ! copy $(ProjDir)\win32\funs.h $(ProjDir)\hdrs\funs.h \ ! echo If any *local.c files failed to build, run build again. \ ! ! ! "$(ProjDir)\src\cmdlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\flaglocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\funlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\local.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\game\mush.cnf" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\cmds.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\funs.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! # End Custom Build ! ! !ELSEIF "$(CFG)" == "pennmush - Win32 MySQL Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "pennmush___Win32_MySQL_Release" ! # PROP BASE Intermediate_Dir "pennmush___Win32_MySQL_Release" ! # PROP BASE Ignore_Export_Lib 0 ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "./game" ! # PROP Intermediate_Dir "./src" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /GX /O2 /Ob0 /I "./hdrs" /I "./" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /I /Win32" " /c ! # ADD CPP /nologo /MD /W3 /GX /O2 /Ob0 /I "./hdrs" /I "./" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /I /Win32" " /c ! # ADD BASE RSC /l 0xc09 /d "NDEBUG" ! # ADD RSC /l 0xc09 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 user32.lib winmm.lib wsock32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 user32.lib winmm.lib wsock32.lib libmysql.lib /nologo /subsystem:console /machine:I386 ! # Begin Custom Build - Copying Necessary Files ! ProjDir=. ! InputPath=.\game\pennmush.exe ! SOURCE="$(InputPath)" ! ! BuildCmds= \ ! IF NOT EXIST $(ProjDir)\src\cmdlocal.c copy $(ProjDir)\src\cmdlocal.dst $(ProjDir)\src\cmdlocal.c \ ! IF NOT EXIST $(ProjDir)\src\flaglocal.c copy $(ProjDir)\src\flaglocal.dst $(ProjDir)\src\flaglocal.c \ ! IF NOT EXIST $(ProjDir)\src\funlocal.c copy $(ProjDir)\src\funlocal.dst $(ProjDir)\src\funlocal.c \ ! IF NOT EXIST $(ProjDir)\src\local.c copy $(ProjDir)\src\local.dst $(ProjDir)\src\local.c \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf echo Don't forget to customize mush.cnf! \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf copy $(ProjDir)\game\mushcnf.dst $(ProjDir)\game\mush.cnf \ ! copy $(ProjDir)\win32\cmds.h $(ProjDir)\hdrs\cmds.h \ ! copy $(ProjDir)\win32\funs.h $(ProjDir)\hdrs\funs.h \ ! echo If any *local.c files failed to build, run build again. \ ! ! ! "$(ProjDir)\src\cmdlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\flaglocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\funlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\local.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\game\mush.cnf" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\cmds.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\funs.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! # End Custom Build ! ! !ELSEIF "$(CFG)" == "pennmush - Win32 SSL Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "pennmush___Win32_SSL_Debug" ! # PROP BASE Intermediate_Dir "pennmush___Win32_SSL_Debug" ! # PROP BASE Ignore_Export_Lib 0 ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "./game" ! # PROP Intermediate_Dir "./src" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /GX /ZI /I "./win32" /I "./hdrs" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # SUBTRACT BASE CPP /Ox /Ot /Os ! # ADD CPP /nologo /MD /W3 /GX /ZI /I "./win32" /I "./hdrs" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # SUBTRACT CPP /Ox /Ot /Os ! # ADD BASE RSC /l 0xc09 /d "_DEBUG" ! # ADD RSC /l 0xc09 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib user32.lib winmm.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib user32.lib winmm.lib wsock32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # Begin Custom Build - Copying Necessary Files ! ProjDir=. ! InputPath=.\game\pennmush.exe ! SOURCE="$(InputPath)" ! ! BuildCmds= \ ! IF NOT EXIST $(ProjDir)\src\cmdlocal.c copy $(ProjDir)\src\cmdlocal.dst $(ProjDir)\src\cmdlocal.c \ ! IF NOT EXIST $(ProjDir)\src\flaglocal.c copy $(ProjDir)\src\flaglocal.dst $(ProjDir)\src\flaglocal.c \ ! IF NOT EXIST $(ProjDir)\src\funlocal.c copy $(ProjDir)\src\funlocal.dst $(ProjDir)\src\funlocal.c \ ! IF NOT EXIST $(ProjDir)\src\local.c copy $(ProjDir)\src\local.dst $(ProjDir)\src\local.c \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf echo Don't forget to customize mush.cnf! \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf copy $(ProjDir)\game\mushcnf.dst $(ProjDir)\game\mush.cnf \ ! copy $(ProjDir)\win32\cmds.h $(ProjDir)\hdrs\cmds.h \ ! copy $(ProjDir)\win32\funs.h $(ProjDir)\hdrs\funs.h \ ! echo If any *local.c files failed to build, run build again. \ ! ! ! "$(ProjDir)\src\cmdlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\flaglocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\funlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\local.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\game\mush.cnf" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\cmds.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\funs.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! # End Custom Build ! ! !ELSEIF "$(CFG)" == "pennmush - Win32 SSL Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "pennmush___Win32_SSL_Release" ! # PROP BASE Intermediate_Dir "pennmush___Win32_SSL_Release" ! # PROP BASE Ignore_Export_Lib 0 ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "./game" ! # PROP Intermediate_Dir "./src" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /GX /O2 /Ob0 /I "./hdrs" /I "./" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /I /Win32" " /c ! # ADD CPP /nologo /MD /W3 /GX /O2 /Ob0 /I "./hdrs" /I "./" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /I /Win32" " /c ! # ADD BASE RSC /l 0xc09 /d "NDEBUG" ! # ADD RSC /l 0xc09 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 user32.lib winmm.lib wsock32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 user32.lib winmm.lib wsock32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /pdb:"pennmush.pdb" /machine:I386 ! # SUBTRACT LINK32 /pdb:none ! # Begin Custom Build - Copying Necessary Files ! ProjDir=. ! InputPath=.\game\pennmush.exe ! SOURCE="$(InputPath)" ! ! BuildCmds= \ ! IF NOT EXIST $(ProjDir)\src\cmdlocal.c copy $(ProjDir)\src\cmdlocal.dst $(ProjDir)\src\cmdlocal.c \ ! IF NOT EXIST $(ProjDir)\src\flaglocal.c copy $(ProjDir)\src\flaglocal.dst $(ProjDir)\src\flaglocal.c \ ! IF NOT EXIST $(ProjDir)\src\funlocal.c copy $(ProjDir)\src\funlocal.dst $(ProjDir)\src\funlocal.c \ ! IF NOT EXIST $(ProjDir)\src\local.c copy $(ProjDir)\src\local.dst $(ProjDir)\src\local.c \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf echo Don't forget to customize mush.cnf! \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf copy $(ProjDir)\game\mushcnf.dst $(ProjDir)\game\mush.cnf \ ! copy $(ProjDir)\win32\cmds.h $(ProjDir)\hdrs\cmds.h \ ! copy $(ProjDir)\win32\funs.h $(ProjDir)\hdrs\funs.h \ ! echo If any *local.c files failed to build, run build again. \ ! ! ! "$(ProjDir)\src\cmdlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\flaglocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\funlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\local.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\game\mush.cnf" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\cmds.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\funs.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! # End Custom Build ! ! !ELSEIF "$(CFG)" == "pennmush - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "./game" ! # PROP Intermediate_Dir "./src" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /MD /W3 /GX /ZI /I "./win32" /I "./hdrs" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # SUBTRACT CPP /Ox /Ot /Os ! # ADD BASE RSC /l 0xc09 /d "_DEBUG" ! # ADD RSC /l 0xc09 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib user32.lib winmm.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # Begin Custom Build - Copying Necessary Files ! ProjDir=. ! InputPath=.\game\pennmush.exe ! SOURCE="$(InputPath)" ! ! BuildCmds= \ ! IF NOT EXIST $(ProjDir)\src\cmdlocal.c copy $(ProjDir)\src\cmdlocal.dst $(ProjDir)\src\cmdlocal.c \ ! IF NOT EXIST $(ProjDir)\src\flaglocal.c copy $(ProjDir)\src\flaglocal.dst $(ProjDir)\src\flaglocal.c \ ! IF NOT EXIST $(ProjDir)\src\funlocal.c copy $(ProjDir)\src\funlocal.dst $(ProjDir)\src\funlocal.c \ ! IF NOT EXIST $(ProjDir)\src\local.c copy $(ProjDir)\src\local.dst $(ProjDir)\src\local.c \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf echo Don't forget to customize mush.cnf! \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf copy $(ProjDir)\game\mushcnf.dst $(ProjDir)\game\mush.cnf \ ! copy $(ProjDir)\win32\cmds.h $(ProjDir)\hdrs\cmds.h \ ! copy $(ProjDir)\win32\funs.h $(ProjDir)\hdrs\funs.h \ ! echo If any *local.c files failed to build, run build again. \ ! ! ! "$(ProjDir)\src\cmdlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\flaglocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\funlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\local.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\game\mush.cnf" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\cmds.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\funs.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! # End Custom Build ! ! !ELSEIF "$(CFG)" == "pennmush - Win32 Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "Release" ! # PROP BASE Intermediate_Dir "Release" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "./game" ! # PROP Intermediate_Dir "./src" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /MD /W3 /GX /O2 /Ob0 /I "./hdrs" /I "./" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /I /Win32" " /c ! # ADD BASE RSC /l 0xc09 /d "NDEBUG" ! # ADD RSC /l 0xc09 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 user32.lib winmm.lib wsock32.lib /nologo /subsystem:console /machine:I386 ! # Begin Custom Build - Copying Necessary Files ! ProjDir=. ! InputPath=.\game\pennmush.exe ! SOURCE="$(InputPath)" ! ! BuildCmds= \ ! IF NOT EXIST $(ProjDir)\src\cmdlocal.c copy $(ProjDir)\src\cmdlocal.dst $(ProjDir)\src\cmdlocal.c \ ! IF NOT EXIST $(ProjDir)\src\flaglocal.c copy $(ProjDir)\src\flaglocal.dst $(ProjDir)\src\flaglocal.c \ ! IF NOT EXIST $(ProjDir)\src\funlocal.c copy $(ProjDir)\src\funlocal.dst $(ProjDir)\src\funlocal.c \ ! IF NOT EXIST $(ProjDir)\src\local.c copy $(ProjDir)\src\local.dst $(ProjDir)\src\local.c \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf echo Don't forget to customize mush.cnf! \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf copy $(ProjDir)\game\mushcnf.dst $(ProjDir)\game\mush.cnf \ ! copy $(ProjDir)\win32\cmds.h $(ProjDir)\hdrs\cmds.h \ ! copy $(ProjDir)\win32\funs.h $(ProjDir)\hdrs\funs.h \ ! echo If any *local.c files failed to build, run build again. \ ! ! ! "$(ProjDir)\src\cmdlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\flaglocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\funlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\local.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\game\mush.cnf" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\cmds.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\funs.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! # End Custom Build ! ! !ENDIF ! ! # Begin Target ! ! # Name "pennmush - Win32 MySQL SSL Debug" ! # Name "pennmush - Win32 MySQL SSL Release" ! # Name "pennmush - Win32 MySQL Debug" ! # Name "pennmush - Win32 MySQL Release" ! # Name "pennmush - Win32 SSL Debug" ! # Name "pennmush - Win32 SSL Release" ! # Name "pennmush - Win32 Debug" ! # Name "pennmush - Win32 Release" ! # Begin Source File ! ! SOURCE=.\src\access.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\atr_tab.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\attrib.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\boolexp.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\bsd.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\bufferq.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\chunk.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\cmdlocal.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\cmds.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\command.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\compress.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\conf.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\cque.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\create.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\db.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\destroy.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\extchat.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\extmail.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\filecopy.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\flaglocal.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\flags.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\funcrypt.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\function.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\fundb.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\funlist.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\funlocal.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\funmath.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\funmisc.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\funstr.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\funtime.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\funufun.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\game.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\help.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\htab.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\ident.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\local.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\lock.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\log.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\look.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\malias.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\match.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\memcheck.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\move.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\mycrypt.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\mymalloc.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\mysocket.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\myssl.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\notify.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\parse.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\pcre.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\player.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\plyrlist.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\predicat.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\privtab.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\ptab.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\rob.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\services.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\set.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\shs.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\sig.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\speech.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\sql.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\strdup.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\strtree.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\strutil.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\tables.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\timer.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\unparse.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\utils.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\version.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\warnings.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\wild.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\wiz.c ! # End Source File ! # End Target ! # End Project --- 1,854 ---- ! # Microsoft Developer Studio Project File - Name="pennmush" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=pennmush - Win32 MySQL Debug ! !MESSAGE This is not a valid makefile. To build this project using NMAKE, ! !MESSAGE use the Export Makefile command and run ! !MESSAGE ! !MESSAGE NMAKE /f "pennmush.mak". ! !MESSAGE ! !MESSAGE You can specify a configuration when running NMAKE ! !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE ! !MESSAGE NMAKE /f "pennmush.mak" CFG="pennmush - Win32 MySQL Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "pennmush - Win32 MySQL SSL Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "pennmush - Win32 MySQL SSL Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "pennmush - Win32 MySQL Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "pennmush - Win32 MySQL Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "pennmush - Win32 SSL Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "pennmush - Win32 SSL Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "pennmush - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "pennmush - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE ! ! # Begin Project ! # PROP AllowPerConfigDependencies 0 ! # PROP Scc_ProjName "" ! # PROP Scc_LocalPath "" ! CPP=cl.exe ! RSC=rc.exe ! ! !IF "$(CFG)" == "pennmush - Win32 MySQL SSL Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "pennmush___Win32_MySQL_SSL_Debug" ! # PROP BASE Intermediate_Dir "pennmush___Win32_MySQL_SSL_Debug" ! # PROP BASE Ignore_Export_Lib 0 ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "./game" ! # PROP Intermediate_Dir "./src" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /GX /ZI /I "./win32" /I "./hdrs" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # SUBTRACT BASE CPP /Ox /Ot /Os ! # ADD CPP /nologo /MD /W3 /GX /ZI /I "./win32" /I "./hdrs" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # SUBTRACT CPP /Ox /Ot /Os ! # ADD BASE RSC /l 0xc09 /d "_DEBUG" ! # ADD RSC /l 0xc09 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib user32.lib winmm.lib wsock32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib user32.lib winmm.lib wsock32.lib ssleay32.lib libeay32.lib libmysql.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # Begin Custom Build - Copying Necessary Files ! ProjDir=. ! InputPath=.\game\pennmush.exe ! SOURCE="$(InputPath)" ! ! BuildCmds= \ ! IF NOT EXIST $(ProjDir)\src\cmdlocal.c copy $(ProjDir)\src\cmdlocal.dst $(ProjDir)\src\cmdlocal.c \ ! IF NOT EXIST $(ProjDir)\src\flaglocal.c copy $(ProjDir)\src\flaglocal.dst $(ProjDir)\src\flaglocal.c \ ! IF NOT EXIST $(ProjDir)\src\funlocal.c copy $(ProjDir)\src\funlocal.dst $(ProjDir)\src\funlocal.c \ ! IF NOT EXIST $(ProjDir)\src\local.c copy $(ProjDir)\src\local.dst $(ProjDir)\src\local.c \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf echo Don't forget to customize mush.cnf! \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf copy $(ProjDir)\game\mushcnf.dst $(ProjDir)\game\mush.cnf \ ! copy $(ProjDir)\win32\cmds.h $(ProjDir)\hdrs\cmds.h \ ! copy $(ProjDir)\win32\funs.h $(ProjDir)\hdrs\funs.h \ ! echo If any *local.c files failed to build, run build again. \ ! ! ! "$(ProjDir)\src\cmdlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\flaglocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\funlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\local.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\game\mush.cnf" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\cmds.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\funs.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! # End Custom Build ! ! !ELSEIF "$(CFG)" == "pennmush - Win32 MySQL SSL Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "pennmush___Win32_MySQL_SSL_Release" ! # PROP BASE Intermediate_Dir "pennmush___Win32_MySQL_SSL_Release" ! # PROP BASE Ignore_Export_Lib 0 ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "./game" ! # PROP Intermediate_Dir "./src" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /GX /O2 /Ob0 /I "./hdrs" /I "./" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /I /Win32" " /c ! # ADD CPP /nologo /MD /W3 /GX /O2 /Ob0 /I "./hdrs" /I "./" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /I /Win32" " /c ! # ADD BASE RSC /l 0xc09 /d "NDEBUG" ! # ADD RSC /l 0xc09 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 user32.lib winmm.lib wsock32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /pdb:"pennmush.pdb" /machine:I386 ! # SUBTRACT BASE LINK32 /pdb:none ! # ADD LINK32 user32.lib winmm.lib wsock32.lib ssleay32.lib libeay32.lib libmysql.lib /nologo /subsystem:console /pdb:"pennmush.pdb" /machine:I386 ! # SUBTRACT LINK32 /pdb:none ! # Begin Custom Build - Copying Necessary Files ! ProjDir=. ! InputPath=.\game\pennmush.exe ! SOURCE="$(InputPath)" ! ! BuildCmds= \ ! IF NOT EXIST $(ProjDir)\src\cmdlocal.c copy $(ProjDir)\src\cmdlocal.dst $(ProjDir)\src\cmdlocal.c \ ! IF NOT EXIST $(ProjDir)\src\flaglocal.c copy $(ProjDir)\src\flaglocal.dst $(ProjDir)\src\flaglocal.c \ ! IF NOT EXIST $(ProjDir)\src\funlocal.c copy $(ProjDir)\src\funlocal.dst $(ProjDir)\src\funlocal.c \ ! IF NOT EXIST $(ProjDir)\src\local.c copy $(ProjDir)\src\local.dst $(ProjDir)\src\local.c \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf echo Don't forget to customize mush.cnf! \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf copy $(ProjDir)\game\mushcnf.dst $(ProjDir)\game\mush.cnf \ ! copy $(ProjDir)\win32\cmds.h $(ProjDir)\hdrs\cmds.h \ ! copy $(ProjDir)\win32\funs.h $(ProjDir)\hdrs\funs.h \ ! echo If any *local.c files failed to build, run build again. \ ! ! ! "$(ProjDir)\src\cmdlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\flaglocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\funlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\local.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\game\mush.cnf" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\cmds.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\funs.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! # End Custom Build ! ! !ELSEIF "$(CFG)" == "pennmush - Win32 MySQL Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "pennmush___Win32_MySQL_Debug" ! # PROP BASE Intermediate_Dir "pennmush___Win32_MySQL_Debug" ! # PROP BASE Ignore_Export_Lib 0 ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "./game" ! # PROP Intermediate_Dir "./src" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /GX /ZI /I "./win32" /I "./hdrs" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # SUBTRACT BASE CPP /Ox /Ot /Os ! # ADD CPP /nologo /MD /W3 /GX /ZI /I "./win32" /I "./hdrs" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # SUBTRACT CPP /Ox /Ot /Os ! # ADD BASE RSC /l 0xc09 /d "_DEBUG" ! # ADD RSC /l 0xc09 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib user32.lib winmm.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib user32.lib winmm.lib wsock32.lib libmysql.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # Begin Custom Build - Copying Necessary Files ! ProjDir=. ! InputPath=.\game\pennmush.exe ! SOURCE="$(InputPath)" ! ! BuildCmds= \ ! IF NOT EXIST $(ProjDir)\src\cmdlocal.c copy $(ProjDir)\src\cmdlocal.dst $(ProjDir)\src\cmdlocal.c \ ! IF NOT EXIST $(ProjDir)\src\flaglocal.c copy $(ProjDir)\src\flaglocal.dst $(ProjDir)\src\flaglocal.c \ ! IF NOT EXIST $(ProjDir)\src\funlocal.c copy $(ProjDir)\src\funlocal.dst $(ProjDir)\src\funlocal.c \ ! IF NOT EXIST $(ProjDir)\src\local.c copy $(ProjDir)\src\local.dst $(ProjDir)\src\local.c \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf echo Don't forget to customize mush.cnf! \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf copy $(ProjDir)\game\mushcnf.dst $(ProjDir)\game\mush.cnf \ ! copy $(ProjDir)\win32\cmds.h $(ProjDir)\hdrs\cmds.h \ ! copy $(ProjDir)\win32\funs.h $(ProjDir)\hdrs\funs.h \ ! echo If any *local.c files failed to build, run build again. \ ! ! ! "$(ProjDir)\src\cmdlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\flaglocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\funlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\local.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\game\mush.cnf" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\cmds.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\funs.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! # End Custom Build ! ! !ELSEIF "$(CFG)" == "pennmush - Win32 MySQL Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "pennmush___Win32_MySQL_Release" ! # PROP BASE Intermediate_Dir "pennmush___Win32_MySQL_Release" ! # PROP BASE Ignore_Export_Lib 0 ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "./game" ! # PROP Intermediate_Dir "./src" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /GX /O2 /Ob0 /I "./hdrs" /I "./" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /I /Win32" " /c ! # ADD CPP /nologo /MD /W3 /GX /O2 /Ob0 /I "./hdrs" /I "./" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /I /Win32" " /c ! # ADD BASE RSC /l 0xc09 /d "NDEBUG" ! # ADD RSC /l 0xc09 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 user32.lib winmm.lib wsock32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 user32.lib winmm.lib wsock32.lib libmysql.lib /nologo /subsystem:console /machine:I386 ! # Begin Custom Build - Copying Necessary Files ! ProjDir=. ! InputPath=.\game\pennmush.exe ! SOURCE="$(InputPath)" ! ! BuildCmds= \ ! IF NOT EXIST $(ProjDir)\src\cmdlocal.c copy $(ProjDir)\src\cmdlocal.dst $(ProjDir)\src\cmdlocal.c \ ! IF NOT EXIST $(ProjDir)\src\flaglocal.c copy $(ProjDir)\src\flaglocal.dst $(ProjDir)\src\flaglocal.c \ ! IF NOT EXIST $(ProjDir)\src\funlocal.c copy $(ProjDir)\src\funlocal.dst $(ProjDir)\src\funlocal.c \ ! IF NOT EXIST $(ProjDir)\src\local.c copy $(ProjDir)\src\local.dst $(ProjDir)\src\local.c \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf echo Don't forget to customize mush.cnf! \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf copy $(ProjDir)\game\mushcnf.dst $(ProjDir)\game\mush.cnf \ ! copy $(ProjDir)\win32\cmds.h $(ProjDir)\hdrs\cmds.h \ ! copy $(ProjDir)\win32\funs.h $(ProjDir)\hdrs\funs.h \ ! echo If any *local.c files failed to build, run build again. \ ! ! ! "$(ProjDir)\src\cmdlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\flaglocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\funlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\local.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\game\mush.cnf" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\cmds.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\funs.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! # End Custom Build ! ! !ELSEIF "$(CFG)" == "pennmush - Win32 SSL Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "pennmush___Win32_SSL_Debug" ! # PROP BASE Intermediate_Dir "pennmush___Win32_SSL_Debug" ! # PROP BASE Ignore_Export_Lib 0 ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "./game" ! # PROP Intermediate_Dir "./src" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /GX /ZI /I "./win32" /I "./hdrs" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # SUBTRACT BASE CPP /Ox /Ot /Os ! # ADD CPP /nologo /MD /W3 /GX /ZI /I "./win32" /I "./hdrs" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # SUBTRACT CPP /Ox /Ot /Os ! # ADD BASE RSC /l 0xc09 /d "_DEBUG" ! # ADD RSC /l 0xc09 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib user32.lib winmm.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib user32.lib winmm.lib wsock32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # Begin Custom Build - Copying Necessary Files ! ProjDir=. ! InputPath=.\game\pennmush.exe ! SOURCE="$(InputPath)" ! ! BuildCmds= \ ! IF NOT EXIST $(ProjDir)\src\cmdlocal.c copy $(ProjDir)\src\cmdlocal.dst $(ProjDir)\src\cmdlocal.c \ ! IF NOT EXIST $(ProjDir)\src\flaglocal.c copy $(ProjDir)\src\flaglocal.dst $(ProjDir)\src\flaglocal.c \ ! IF NOT EXIST $(ProjDir)\src\funlocal.c copy $(ProjDir)\src\funlocal.dst $(ProjDir)\src\funlocal.c \ ! IF NOT EXIST $(ProjDir)\src\local.c copy $(ProjDir)\src\local.dst $(ProjDir)\src\local.c \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf echo Don't forget to customize mush.cnf! \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf copy $(ProjDir)\game\mushcnf.dst $(ProjDir)\game\mush.cnf \ ! copy $(ProjDir)\win32\cmds.h $(ProjDir)\hdrs\cmds.h \ ! copy $(ProjDir)\win32\funs.h $(ProjDir)\hdrs\funs.h \ ! echo If any *local.c files failed to build, run build again. \ ! ! ! "$(ProjDir)\src\cmdlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\flaglocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\funlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\local.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\game\mush.cnf" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\cmds.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\funs.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! # End Custom Build ! ! !ELSEIF "$(CFG)" == "pennmush - Win32 SSL Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "pennmush___Win32_SSL_Release" ! # PROP BASE Intermediate_Dir "pennmush___Win32_SSL_Release" ! # PROP BASE Ignore_Export_Lib 0 ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "./game" ! # PROP Intermediate_Dir "./src" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /GX /O2 /Ob0 /I "./hdrs" /I "./" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /I /Win32" " /c ! # ADD CPP /nologo /MD /W3 /GX /O2 /Ob0 /I "./hdrs" /I "./" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /I /Win32" " /c ! # ADD BASE RSC /l 0xc09 /d "NDEBUG" ! # ADD RSC /l 0xc09 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 user32.lib winmm.lib wsock32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 user32.lib winmm.lib wsock32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /pdb:"pennmush.pdb" /machine:I386 ! # SUBTRACT LINK32 /pdb:none ! # Begin Custom Build - Copying Necessary Files ! ProjDir=. ! InputPath=.\game\pennmush.exe ! SOURCE="$(InputPath)" ! ! BuildCmds= \ ! IF NOT EXIST $(ProjDir)\src\cmdlocal.c copy $(ProjDir)\src\cmdlocal.dst $(ProjDir)\src\cmdlocal.c \ ! IF NOT EXIST $(ProjDir)\src\flaglocal.c copy $(ProjDir)\src\flaglocal.dst $(ProjDir)\src\flaglocal.c \ ! IF NOT EXIST $(ProjDir)\src\funlocal.c copy $(ProjDir)\src\funlocal.dst $(ProjDir)\src\funlocal.c \ ! IF NOT EXIST $(ProjDir)\src\local.c copy $(ProjDir)\src\local.dst $(ProjDir)\src\local.c \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf echo Don't forget to customize mush.cnf! \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf copy $(ProjDir)\game\mushcnf.dst $(ProjDir)\game\mush.cnf \ ! copy $(ProjDir)\win32\cmds.h $(ProjDir)\hdrs\cmds.h \ ! copy $(ProjDir)\win32\funs.h $(ProjDir)\hdrs\funs.h \ ! echo If any *local.c files failed to build, run build again. \ ! ! ! "$(ProjDir)\src\cmdlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\flaglocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\funlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\local.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\game\mush.cnf" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\cmds.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\funs.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! # End Custom Build ! ! !ELSEIF "$(CFG)" == "pennmush - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "./game" ! # PROP Intermediate_Dir "./src" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /MD /W3 /GX /ZI /I "./win32" /I "./hdrs" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # SUBTRACT CPP /Ox /Ot /Os ! # ADD BASE RSC /l 0xc09 /d "_DEBUG" ! # ADD RSC /l 0xc09 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib user32.lib winmm.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # Begin Custom Build - Copying Necessary Files ! ProjDir=. ! InputPath=.\game\pennmush.exe ! SOURCE="$(InputPath)" ! ! BuildCmds= \ ! IF NOT EXIST $(ProjDir)\src\cmdlocal.c copy $(ProjDir)\src\cmdlocal.dst $(ProjDir)\src\cmdlocal.c \ ! IF NOT EXIST $(ProjDir)\src\flaglocal.c copy $(ProjDir)\src\flaglocal.dst $(ProjDir)\src\flaglocal.c \ ! IF NOT EXIST $(ProjDir)\src\funlocal.c copy $(ProjDir)\src\funlocal.dst $(ProjDir)\src\funlocal.c \ ! IF NOT EXIST $(ProjDir)\src\local.c copy $(ProjDir)\src\local.dst $(ProjDir)\src\local.c \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf echo Don't forget to customize mush.cnf! \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf copy $(ProjDir)\game\mushcnf.dst $(ProjDir)\game\mush.cnf \ ! copy $(ProjDir)\win32\cmds.h $(ProjDir)\hdrs\cmds.h \ ! copy $(ProjDir)\win32\funs.h $(ProjDir)\hdrs\funs.h \ ! echo If any *local.c files failed to build, run build again. \ ! ! ! "$(ProjDir)\src\cmdlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\flaglocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\funlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\local.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\game\mush.cnf" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\cmds.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\funs.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! # End Custom Build ! ! !ELSEIF "$(CFG)" == "pennmush - Win32 Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "Release" ! # PROP BASE Intermediate_Dir "Release" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "./game" ! # PROP Intermediate_Dir "./src" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /MD /W3 /GX /O2 /Ob0 /I "./hdrs" /I "./" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /I /Win32" " /c ! # ADD BASE RSC /l 0xc09 /d "NDEBUG" ! # ADD RSC /l 0xc09 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 user32.lib winmm.lib wsock32.lib /nologo /subsystem:console /machine:I386 ! # Begin Custom Build - Copying Necessary Files ! ProjDir=. ! InputPath=.\game\pennmush.exe ! SOURCE="$(InputPath)" ! ! BuildCmds= \ ! IF NOT EXIST $(ProjDir)\src\cmdlocal.c copy $(ProjDir)\src\cmdlocal.dst $(ProjDir)\src\cmdlocal.c \ ! IF NOT EXIST $(ProjDir)\src\flaglocal.c copy $(ProjDir)\src\flaglocal.dst $(ProjDir)\src\flaglocal.c \ ! IF NOT EXIST $(ProjDir)\src\funlocal.c copy $(ProjDir)\src\funlocal.dst $(ProjDir)\src\funlocal.c \ ! IF NOT EXIST $(ProjDir)\src\local.c copy $(ProjDir)\src\local.dst $(ProjDir)\src\local.c \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf echo Don't forget to customize mush.cnf! \ ! IF NOT EXIST $(ProjDir)\game\mush.cnf copy $(ProjDir)\game\mushcnf.dst $(ProjDir)\game\mush.cnf \ ! copy $(ProjDir)\win32\cmds.h $(ProjDir)\hdrs\cmds.h \ ! copy $(ProjDir)\win32\funs.h $(ProjDir)\hdrs\funs.h \ ! echo If any *local.c files failed to build, run build again. \ ! ! ! "$(ProjDir)\src\cmdlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\flaglocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\funlocal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\src\local.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\game\mush.cnf" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\cmds.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! ! "$(ProjDir)\hdrs\funs.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" ! $(BuildCmds) ! # End Custom Build ! ! !ENDIF ! ! # Begin Target ! ! # Name "pennmush - Win32 MySQL SSL Debug" ! # Name "pennmush - Win32 MySQL SSL Release" ! # Name "pennmush - Win32 MySQL Debug" ! # Name "pennmush - Win32 MySQL Release" ! # Name "pennmush - Win32 SSL Debug" ! # Name "pennmush - Win32 SSL Release" ! # Name "pennmush - Win32 Debug" ! # Name "pennmush - Win32 Release" ! # Begin Source File ! ! SOURCE=.\src\access.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\atr_tab.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\attrib.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\boolexp.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\bsd.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\bufferq.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\chunk.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\cmdlocal.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\cmds.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\command.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\compress.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\conf.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\cque.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\create.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\db.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\destroy.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\extchat.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\extmail.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\filecopy.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\flaglocal.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\flags.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\funcrypt.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\function.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\fundb.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\funlist.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\funlocal.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\funmath.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\funmisc.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\funstr.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\funtime.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\funufun.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\game.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\help.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\htab.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\ident.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\local.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\lock.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\log.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\look.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\malias.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\match.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\memcheck.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\move.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\mycrypt.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\mymalloc.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\mysocket.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\myssl.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\notify.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\parse.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\pcre.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\player.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\plyrlist.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\predicat.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\privtab.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\ptab.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\rob.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\services.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\set.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\shs.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\sig.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\speech.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\sql.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\strdup.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\strtree.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\strutil.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\tables.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\timer.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\unparse.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\utils.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\version.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\warnings.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\wild.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\src\wiz.c ! # End Source File ! # End Target ! # End Project *** 1_7_7.1146/win32/confmagic.h Sat, 12 Aug 2000 09:28:45 -0500 dunemush (pennmush/f/13_confmagic. 1.1 660) --- 1_7_7.1169(w)/win32/confmagic.h Thu, 12 Aug 2004 12:51:44 -0500 dunemush (pennmush/f/13_confmagic. 1.3 640) *************** *** 1,111 **** ! /* ! * This file was produced by running metaconfig and is intended to be included ! * after config.h and after all the other needed includes have been dealt with. ! * ! * This file may be empty, and should not be edited. Rerun metaconfig instead. ! * If you wish to get rid of this magic, remove this file and rerun metaconfig ! * without the -M option. ! * ! * $Id: confmagic.h 1.1 Sat, 12 Aug 2000 09:28:45 -0500 dunemush $ ! */ ! ! #ifndef _confmagic_h_ ! #define _confmagic_h_ ! ! #ifndef HAS_BCOPY ! #ifndef bcopy ! #define bcopy(s,d,l) memcpy((d),(s),(l)) ! #endif ! #endif ! ! #ifndef HAS_BZERO ! #ifndef bzero ! #define bzero(s,l) memset((s),0,(l)) ! #endif ! #endif ! ! /* If your system doesn't have the crypt(3) DES encryption code, ! * (which isn't exportable from the U.S.), then don't encrypt ! */ ! #ifndef HAS_CRYPT ! #define crypt(s,t) (s) ! #endif ! ! #ifdef HAS_HUGE_VAL ! #define HUGE_INT HUGE_VAL ! #define HUGE_DOUBLE HUGE_VAL ! #else ! #ifdef HAS_HUGE ! #define HUGE_INT HUGE ! #define HUGE_DOUBLE HUGE ! #else ! #ifdef HAS_INT_MAX ! #define HUGE_INT INT_MAX ! #else ! #ifdef HAS_MAXINT ! #define HUGE_INT MAXINT ! #else ! #define HUGE_INT 2000000000 ! #endif ! #endif ! #ifdef HAS_MAXDOUBLE ! #define HUGE_DOUBLE MAXDOUBLE ! #else ! #define HUGE_DOUBLE 2000000000 ! #endif ! #endif ! #endif ! ! #ifndef HAS_MEMCPY ! #ifndef memcpy ! #define memcpy(d,s,l) bcopy((s),(d),(l)) ! #endif ! #endif ! ! #ifndef HAS_RANDOM ! #ifndef random ! #ifdef HAS_LRAND48 ! #define random lrand48 ! #define srandom srand48 ! #else ! #ifdef HAS_RAND ! #define random rand ! #define srandom srand ! #endif ! #endif ! #endif ! #endif ! ! #ifndef HAS_SIGCHLD ! #define SIGCHLD SIGCLD ! #endif ! ! #ifndef HAS_SIGCLD ! #define SIGCLD SIGCHLD ! #endif ! ! #ifndef HAS_INDEX ! #ifndef index ! #define index strchr ! #endif ! #endif ! ! #ifndef HAS_STRCHR ! #ifndef strchr ! #define strchr index ! #endif ! #endif ! ! #ifndef HAS_INDEX ! #ifndef rindex ! #define rindex strrchr ! #endif ! #endif ! ! #ifndef HAS_STRCHR ! #ifndef strrchr ! #define strrchr rindex ! #endif ! #endif ! ! #endif --- 1,125 ---- ! /* ! * This file was produced by running metaconfig and is intended to be included ! * after config.h and after all the other needed includes have been dealt with. ! * ! * This file may be empty, and should not be edited. Rerun metaconfig instead. ! * If you wish to get rid of this magic, remove this file and rerun metaconfig ! * without the -M option. ! * ! */ ! ! #ifndef _confmagic_h_ ! #define _confmagic_h_ ! ! #ifndef HAS_BCOPY ! #ifndef bcopy ! #define bcopy(s,d,l) memcpy((d),(s),(l)) ! #endif ! #endif ! ! #ifndef HAS_BZERO ! #ifndef bzero ! #define bzero(s,l) memset((s),0,(l)) ! #endif ! #endif ! ! /* If your system doesn't have the crypt(3) DES encryption code, ! * (which isn't exportable from the U.S.), then don't encrypt ! */ ! #ifndef HAS_CRYPT ! #define crypt(s,t) (s) ! #endif ! ! #ifdef HAS_HUGE_VAL ! #define HUGE_DOUBLE HUGE_VAL ! #else ! #ifdef HAS_HUGE ! #define HUGE_DOUBLE HUGE ! #else ! #ifdef HAS_MAXDOUBLE ! #define HUGE_DOUBLE MAXDOUBLE ! #else ! #define HUGE_DOUBLE 2000000000 ! #endif ! #endif ! #endif ! #ifdef HAS_INT_MAX ! #define HUGE_INT INT_MAX ! #else ! #ifdef HAS_MAXINT ! #define HUGE_INT MAXINT ! #else ! #define HUGE_INT 2000000000 ! #endif ! #endif ! ! #ifndef HAS_MEMCPY ! #ifndef memcpy ! #define memcpy(d,s,l) bcopy((s),(d),(l)) ! #endif ! #endif ! ! #ifndef HAS_MEMMOVE ! #ifndef memmove ! #define memmove(d,s,l) bcopy((s),(d),(l)) ! #endif ! #endif ! ! #ifndef HAS_RANDOM ! #ifndef random ! #ifdef HAS_LRAND48 ! #define random lrand48 ! #define srandom srand48 ! #else ! #ifdef HAS_RAND ! #define random rand ! #define srandom srand ! #endif ! #endif ! #endif ! #endif ! ! #ifndef HAS_SIGCHLD ! #define SIGCHLD SIGCLD ! #endif ! ! #ifndef HAS_SIGCLD ! #define SIGCLD SIGCHLD ! #endif ! ! #ifndef HAS_INDEX ! #ifndef index ! #define index strchr ! #endif ! #endif ! ! #ifndef HAS_STRCHR ! #ifndef strchr ! #define strchr index ! #endif ! #endif ! ! #ifndef HAS_INDEX ! #ifndef rindex ! #define rindex strrchr ! #endif ! #endif ! ! #ifndef HAS_STRCHR ! #ifndef strrchr ! #define strrchr rindex ! #endif ! #endif ! ! #ifndef HAS_STRCOLL ! #undef strcoll ! #define strcoll strcmp ! #endif ! ! #if !defined(WIN32) && !defined(HAS_STRXFRM) ! #define strncoll strncmp ! #define strncasecoll strncasecmp ! #define strcasecoll strcasecmp ! #endif ! ! #endif *** 1_7_7.1146/win32/pennmush.vcproj Sun, 15 Feb 2004 13:28:39 -0600 dunemush (pennmush/g/18_pennmush.v 1.7 660) --- 1_7_7.1169(w)/win32/msvc.net/pennmush.vcproj Sun, 08 Aug 2004 16:05:02 -0500 dunemush (pennmush/g/18_pennmush.v 1.8 600) *************** *** 1,488 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !