This should be my last batch of these big fixes.
That's not to say there aren't still more things to fix. There
certainly are. But, I expect my future fixes will be smaller.
Full internationalization would be much cooler, but that's never going
to happen. Given that, this will at least prevent folks from constantly
having to look and switch between typing "armor" and "armour", depending
on which zone each item originated in, etc.
I could flip these either way, but a survey of the current state shows
that about 80% of the mixed cases use the American spellings, while 20%
use the British. And, most words *only* exist in this data in their
American forms. So, it seems the majority prefer these spellings.
In case anyone likes trivia:
* The most common mixed words in here were "armour" and "colour", each of
which occured about half as often as "armor" and "color", respectively.
* The most British word in here was "theatre" (including other forms),
which occured about twice as often as "theater".
This stanardizes all of these (and other forms of these same words):
* armour -> armor
* colour -> color
* favour -> favor
* honour -> honor
* civilise -> civilize
* centre -> center
* theatre -> theater
* defence -> defense
* offence -> offense
* realise -> realize
Functionally, this is a non-change.
This just conforms a few odd cases to be the same as the rest.
`git show -w` shows nothing (this is a whitespace-only change).
Since circle/tba is not case-sensitive, this should be a non-change.
I confirmed this by verifying that `diff -i` shows zero changes.
So, to tba, this is just a cosmetic cleanup.
However, to others that use this data, the case might be important.
...this includes my own separate MUD codebase. :)
This just converts the few DOS text files still in here to standard text files (line-endings),
removes all the trailing spaces on lines, removes all the trailing blank lines, and replaces
all the tabs (except in .zon files, where they seem to be common) with expanded spaces.
It's easy to confirm this is actually a non-change, except for whitespace:
* `git show -w` shows this commit as only removing 8 trailing blank lines.
This should make no difference to tbaMUD itself, but it will make working on these files,
especially with scripts and automated tools, much easier.
This is the base change for a set of other changes I will put up once/if this merges,
without this, the others are just too complicated to wrangle.
These are mostly cases of confusion between the "on the body"
and "about the body" slots (5 and 12).
But, there are also some that seem to just be misconfigured,
like non-weapons being wielded, worn items being unwearable,
weapons being worn instead of wielded, and items being worn
instead of held.
I have an independent MUD codebase that reads these files, and
so this gives me an ability to somewhat orthogonally test these,
and easily find this sort of issue.
I did avoid all the cases where it was clear this was done
intentionally, like all the cases where the second neck was
used for the missing face slot (masks, etc).
The ones fixed here all seem to really be (minor) bugs.
I don't know dg_script well at all, so I could be mistaken.
But, I think these are just minor errors in this script.
I have a separately-implemented mud codebase that interprets the
worlds from tbamud, and it flags these as errors, and some other
issues I might chose to fix later, depending on how this PR goes. :)
Of course, it's possible this is really a bug in my own codebase, and
not in these scripts... but I don't think so - and the documentation
I've managed to find seems to confirm my suspicion.
I am guessing some script or tool used upstream is doing an unsafe
search-and-replace for '@' with TAB, and accidentally changing these.
They seem to have been creeping into the repo for years.
I produced this fix commit automatically with:
sed -i 's|\t\([bcdgmnoruwyBCDGMRWY]\)|@\1|g' tba/*/*.*
...and then a few files' changes had to be undone.
I looked through all of the rest, and they look like correct fixes.
I also ran all the other letters, and they only make incorrect "fixes".
* make Makefile more portable
tbamud doesn't build on FreeBSD or OpenBSD. This series of commits are meant to make those builds work by making the Makefile more portable.
I should mention that I've never used tbamud before today, so please read my pull request carefully.
This commit itself fixes the first issue encountered. I assume wildcard and patsubst are gmake-only.
* Update Makefile.in
It turns out using the backslash to escape newlines in this situation is not portable.
* Delete Makefile.in
Will re-add. There are problems with this file. It's marked executable when it shouldn't be, and has ^M characters which prevent builds on OpenBSD.
* re-add Makefile.in
* Add build generated files to .gitignore
* Fix error in "last all" output and resolve Wunused-result warnings
- Check return value of several standard library calls that could
return error states.
- Fix issue with "last all" command (it sent tabs for alignment
that were reinterpreted as colors).
* Fix buffer overflow in do_export_zone command
* Replace a few strcat/sprintf instances with bounded variants
Also cleaned up the whitespace in the parse_edit_action function as it was
not consistent.
Fix bug in editor format command introduced in earlier commit
* Fix bug in editor toggle command when an escaped @ is in the buffer
Previously, toggling between @ and \t would always try to convert
@ to \t, even if already toggled, iff an escaped @ was present in the
buffer (i.e. '@@').
Replace a few sprintf calls with snprintf to prevent buffer overflow.
Added error messages to the logs where buffer size prevents a room,
object, mobile, or quest from being saved to disk.
* Fix several misleading indentation warnings on GCC 8.1.1
* Fix reliance on undefined strcpy/sprintf behavior (-Wrestrict warnings)
The standard states that strcpy results in undefined behavior when the source
and destination buffers overlap. I resolved this with a combination of memmove
and strlen. Note that the resulting code is slightly less efficient.
Similarly, sprintf's behavior is undefined when copying takes place between
objects that overlap. I replaced most of these with a simple strcat, though
one required a temp buffer.
* Fix format in improved-edit.c to match surrounding code
Made detach able to remove triggers from rooms you are not in. Made its argument handling better match the usage syntax when targeting rooms. Removed player attachable script check because it is possible to have scripts attached from before the functionality was deactivated. Made confirmation messages more informative.
* Increase ID space
DG Scripts uses tiny idspace that results in wacky bugs when the mud is
running too long.
* Overhaul script ids
All references to GET_ID(ch/obj) were removed and replaced by
char_script_id() and obj_script_id(), which don’t assign ids until they
are needed. The ch->id and obj->id variable names were changed to
script_id to prevent accidental errors for future programmers. This
change greatly increases how long the mud can run before it runs out of
ID space.
* Fix extraction count
This prevents an error log where it has over-counted the extractions
pending. It now behaves correctly when the same mob is %purge%’d or
extract_char()’d twice.
* Added %log%, and made %send%, %echo%, etc. not force capitalization.
* Fixed Previous Commit
* Really fixed this time.
* Fixed look 2.mail
Also reverted CMMAND_TERMS, was increased in previous commit when it didn't need to be due to the removed of marena.
* Fixed add_to_lookup_table
Fixed as per Welcor https://www.tbamud.com/forum/2-general/4307-crash-bug-need-assistance-with-gdb?start=20#7390
* Fixed two crash bugs
Fixed tw crash bugs Welcor found here https://www.tbamud.com/forum/4-development/4300-simple-list-forced-to-reset-itself
* wizhelp changes
Cleared buf in columns_list that was getting garbage data in it. Removed wizhelp subcommand from do_commands, and removed buf and sprintf line that were never sent to anyone and replaced it with a send_to_char. Removed arg capability from do_commands as it's no longer useful without the wizhelp subcommand. Replaced wizhelp subcommand with separate do_wizhelp command that sorts commands by their level and shows all imms all imm commands regardless of their level.
* Fix
Fixed previous commit
* Trigedit Mostly
Changed attributes to persist across logout when changed in trigedit. Made strength now loer for GRGOD and above when wearing equipment. Added npcflag field to trigedit. Fixed %actor.vnum()%
* Log Files
Fixed Farbled Data in Logfiles. Fix from Prool on forums.
* Mudlog, Trigedit, New Pref Toggle
Skimmed every call of mudlog for missing GET_INVIS_LEV and other obvious inconsistencies. Added affect_total() cals to dg_variables so stats adjust properly. Added zoneresets toggle to prefedit because syslog complete is super spammy as a result of zone resets so tey're now separate from other syslog options.
* npcflag fix
Just fixing a warning.
* Added %log%, and made %send%, %echo%, etc. not force capitalization.
* Fixed Previous Commit
* Really fixed this time.
* Fixed look 2.mail
Also reverted CMMAND_TERMS, was increased in previous commit when it didn't need to be due to the removed of marena.
* Fixed add_to_lookup_table
Fixed as per Welcor https://www.tbamud.com/forum/2-general/4307-crash-bug-need-assistance-with-gdb?start=20#7390
* Fixed two crash bugs
Fixed tw crash bugs Welcor found here https://www.tbamud.com/forum/4-development/4300-simple-list-forced-to-reset-itself
* wizhelp changes
Cleared buf in columns_list that was getting garbage data in it. Removed wizhelp subcommand from do_commands, and removed buf and sprintf line that were never sent to anyone and replaced it with a send_to_char. Removed arg capability from do_commands as it's no longer useful without the wizhelp subcommand. Replaced wizhelp subcommand with separate do_wizhelp command that sorts commands by their level and shows all imms all imm commands regardless of their level.
* Fix
Fixed previous commit
* Trigedit Mostly
Changed attributes to persist across logout when changed in trigedit. Made strength now loer for GRGOD and above when wearing equipment. Added npcflag field to trigedit. Fixed %actor.vnum()%
* Log Files
Fixed Farbled Data in Logfiles. Fix from Prool on forums.
* Mudlog, Trigedit, New Pref Toggle
Skimmed every call of mudlog for missing GET_INVIS_LEV and other obvious inconsistencies. Added affect_total() cals to dg_variables so stats adjust properly. Added zoneresets toggle to prefedit because syslog complete is super spammy as a result of zone resets so tey're now separate from other syslog options.
* Added %log%, and made %send%, %echo%, etc. not force capitalization.
* Fixed Previous Commit
* Really fixed this time.
* Fixed look 2.mail
Also reverted CMMAND_TERMS, was increased in previous commit when it didn't need to be due to the removed of marena.
* Fixed add_to_lookup_table
Fixed as per Welcor https://www.tbamud.com/forum/2-general/4307-crash-bug-need-assistance-with-gdb?start=20#7390
* Fixed two crash bugs
Fixed tw crash bugs Welcor found here https://www.tbamud.com/forum/4-development/4300-simple-list-forced-to-reset-itself
* wizhelp changes
Cleared buf in columns_list that was getting garbage data in it. Removed wizhelp subcommand from do_commands, and removed buf and sprintf line that were never sent to anyone and replaced it with a send_to_char. Removed arg capability from do_commands as it's no longer useful without the wizhelp subcommand. Replaced wizhelp subcommand with separate do_wizhelp command that sorts commands by their level and shows all imms all imm commands regardless of their level.
* Fix
Fixed previous commit
* Trigedit Mostly
Changed attributes to persist across logout when changed in trigedit. Made strength now loer for GRGOD and above when wearing equipment. Added npcflag field to trigedit. Fixed %actor.vnum()%
* Added %log%, and made %send%, %echo%, etc. not force capitalization.
* Fixed Previous Commit
* Really fixed this time.
* Fixed look 2.mail
Also reverted CMMAND_TERMS, was increased in previous commit when it didn't need to be due to the removed of marena.
* Fixed add_to_lookup_table
Fixed as per Welcor https://www.tbamud.com/forum/2-general/4307-crash-bug-need-assistance-with-gdb?start=20#7390
* Fixed two crash bugs
Fixed tw crash bugs Welcor found here https://www.tbamud.com/forum/4-development/4300-simple-list-forced-to-reset-itself
* wizhelp changes
Cleared buf in columns_list that was getting garbage data in it. Removed wizhelp subcommand from do_commands, and removed buf and sprintf line that were never sent to anyone and replaced it with a send_to_char. Removed arg capability from do_commands as it's no longer useful without the wizhelp subcommand. Replaced wizhelp subcommand with separate do_wizhelp command that sorts commands by their level and shows all imms all imm commands regardless of their level.
* Fix
Fixed previous commit
* Added %log%, and made %send%, %echo%, etc. not force capitalization.
* Fixed Previous Commit
* Really fixed this time.
* Fixed look 2.mail
Also reverted CMMAND_TERMS, was increased in previous commit when it didn't need to be due to the removed of marena.
* Fixed add_to_lookup_table
Fixed as per Welcor https://www.tbamud.com/forum/2-general/4307-crash-bug-need-assistance-with-gdb?start=20#7390
* Fixed two crash bugs
Fixed tw crash bugs Welcor found here https://www.tbamud.com/forum/4-development/4300-simple-list-forced-to-reset-itself
* wizhelp changes
Cleared buf in columns_list that was getting garbage data in it. Removed wizhelp subcommand from do_commands, and removed buf and sprintf line that were never sent to anyone and replaced it with a send_to_char. Removed arg capability from do_commands as it's no longer useful without the wizhelp subcommand. Replaced wizhelp subcommand with separate do_wizhelp command that sorts commands by their level and shows all imms all imm commands regardless of their level.
* Added %log%, and made %send%, %echo%, etc. not force capitalization.
* Fixed Previous Commit
* Really fixed this time.
* Fixed look 2.mail
Also reverted CMMAND_TERMS, was increased in previous commit when it didn't need to be due to the removed of marena.
* Fixed add_to_lookup_table
Fixed as per Welcor https://www.tbamud.com/forum/2-general/4307-crash-bug-need-assistance-with-gdb?start=20#7390
* Added %log%, and made %send%, %echo%, etc. not force capitalization.
* Fixed Previous Commit
* Really fixed this time.
* Fixed look 2.mail
Also reverted CMMAND_TERMS, was increased in previous commit when it didn't need to be due to the removed of marena.
