From d40c13fe95764014009d8d27081913290ce1391f Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sun, 6 Jul 2008 22:00:57 +0000 Subject: Remove some of my infamous debugging statements (I keep forgetting them!) and move the new pdf files around, renaming contact.pdf to README.pdf since it's the shorter version of readme.txt, also capitalized now. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6435 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/debug.cc | 10 +-- crawl-ref/source/directn.cc | 2 - crawl-ref/source/itemprop.cc | 2 +- crawl-ref/source/randart.cc | 8 +- crawl-ref/source/spl-util.cc | 1 - crawl-ref/source/util/docs/README.tex | 146 +++++++++++++++++++++++++++++++++ crawl-ref/source/util/docs/contact.tex | 146 --------------------------------- 7 files changed, 157 insertions(+), 158 deletions(-) create mode 100644 crawl-ref/source/util/docs/README.tex delete mode 100644 crawl-ref/source/util/docs/contact.tex (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc index f3cb294950..aaf7cce8a4 100644 --- a/crawl-ref/source/debug.cc +++ b/crawl-ref/source/debug.cc @@ -1935,11 +1935,11 @@ void debug_item_scan( void ) _dump_item( name, i, mitm[i] ); } else if ((mitm[i].base_type == OBJ_WEAPONS - && (abs(mitm[i].plus) > 30 - || abs(mitm[i].plus2) > 30 - || !is_random_artefact( mitm[i] ) - && mitm[i].special >= 30 - && mitm[i].special < 181)) + && (abs(mitm[i].plus) > 30 + || abs(mitm[i].plus2) > 30 + || !is_random_artefact( mitm[i] ) + && mitm[i].special >= 30 + && mitm[i].special < 181)) || (mitm[i].base_type == OBJ_MISSILES && (abs(mitm[i].plus) > 25 diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 0729331445..54150223eb 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -1066,8 +1066,6 @@ void direction(dist& moves, targeting_type restricts, else if (moves.isValid || moves.isCancel || yesno("Are you sure you want to fizzle?", false, 'n')) { - mpr("We're done.", MSGCH_DIAGNOSTICS); - // Finalize whatever is inside the loop // (moves-internal finalizations can be done later). moves.choseRay = show_beam; diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 1a1c2b93a3..2327307d4f 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -2660,7 +2660,7 @@ bool is_shield_incompatible(const item_def &weapon, const item_def *shield) std::string item_base_name(const item_def &item) { - switch ( item.base_type ) + switch (item.base_type) { case OBJ_WEAPONS: return Weapon_prop[Weapon_index[item.sub_type]].name; diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc index 63a85194a6..8d35c5f481 100644 --- a/crawl-ref/source/randart.cc +++ b/crawl-ref/source/randart.cc @@ -1309,11 +1309,13 @@ std::string randart_name(const item_def &item, bool appearance) std::string lookup; std::string result; - // use prefix of gifting god, if applicable + // Use prefix of gifting god, if applicable. bool god_gift = false; int item_orig = 0; - if (!appearance) // god prefix not necessary for appearance + if (!appearance) { + // Divine gifts don't look special, so this is only necessary + // for actually naming an item. item_orig = item.orig_monnum; if (item_orig < 0) item_orig = -item_orig - 2; @@ -1351,7 +1353,7 @@ std::string randart_name(const item_def &item, bool appearance) result += appear; result += " "; result += item_base_name(item); - return result; + return (result); } if (_pick_db_name(item)) diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc index 675af72233..6edc0d33a8 100644 --- a/crawl-ref/source/spl-util.cc +++ b/crawl-ref/source/spl-util.cc @@ -792,7 +792,6 @@ bool spell_direction( dist &spelld, bolt &pbolt, if (!spelld.isValid) { - mpr("Not valid after all?", MSGCH_DIAGNOSTICS); // Check for user cancel. canned_msg(MSG_OK); return (false); diff --git a/crawl-ref/source/util/docs/README.tex b/crawl-ref/source/util/docs/README.tex new file mode 100644 index 0000000000..71e73430ea --- /dev/null +++ b/crawl-ref/source/util/docs/README.tex @@ -0,0 +1,146 @@ +\documentclass[a4paper,10pt]{article} + +\usepackage{palatino} +\usepackage{mathpazo} % optional [sc] fuer real small caps +\usepackage[left=3cm,top=3cm,right=3cm,bottom=2cm,nohead,nofoot]{geometry} + +\usepackage{graphicx} + +\newcommand{\key}[1]{{{\texttt{\textbf{#1}}}}} % this does nasty things to underscores +\newcommand{\sex}[1]{{{\textbf{#1}}}} % \sec already defined + +\newcommand{\crawl}{\textsc{Crawl}} +\newcommand{\dungeon}{\textsc{Dungeon}} + +\newcommand{\spacecolumn}{\begin{minipage}[t]{2cm}\phantom{xxxx}\end{minipage}} +\newcommand{\para}{\vspace{1.5ex}} +\setlength{\parindent}{0em} + +\newcommand{\mc}[1]{\multicolumn{2}{l}{#1}} + +\newcounter{abccounter} +\newenvironment{abcliste}{\begin{list}{(\alph{abccounter})} + {\usecounter{abccounter} + \setlength{\topsep}{0ex} + \setlength{\partopsep}{0ex} + \setlength{\listparindent}{0ex} + \setlength{\itemsep}{0ex} + \setlength{\parsep}{0ex} + \setlength{\leftmargin}{2em} + \setlength{\labelwidth}{2em} + \setlength{\parskip}{0ex} + } + }{\end{list}} + +\pagestyle{empty} + +\begin{document} + + +\begin{center}\textbf{\LARGE +\dungeon\ \crawl: Files and Contact +}\end{center} + +This is the reference sheet for the roguelike game \dungeon\ \crawl, +specifically for the current version of the \textsc{Stone Soup} branch. +\crawl\ is a game of dungeon exploration, fighting and magic that is +renowned for its intricate skills and religion systems. Success requires +tactics, strategy, and perseverance. Though \crawl's reputation is +close to devilish, victories were reported\dots + +\para + +This page explains the various important files. The next page lists a +number of important changes introduced in version 0.4. The last two +pages give a very brief introduction to the game, which should be +enough to get you started. If you are completely new to this type of +game and still want to plunge right in, start up a new game and select +a tutorial (press \key{T} when asked for a species). + +\para\para + +\sex{The most important files} + +\para + +\begin{minipage}[t]{7cm} +The file \key{crawl.exe} in \crawl's main folder starts the game. +\\ \\ +The \sex{settings/} directory contains \key{init.txt}, the options file for +\crawl\ (on linux systems there may also be a \key{.crawlrc} in your home +directory). Since the defaults are well suited for playing, you can ignore +these at first. +\\ +This folder also contains \key{macro.txt}, a list of redefined key +bindings and macros. These make playing \crawl\ even more convenient. +You will probably not need to redefine key mappings until after you have +spent some time playing the game. +\end{minipage} +% +\spacecolumn +% +\begin{minipage}[t]{7cm} +The following files in the \sex{docs/} directory may be helpful: +\\ +\key{crawl\_manual.txt} is the full manual. It explains all races, classes, +item types etc. If you do not delight in manuals, you can put off the +reading this file until later. You can browse the manual while playing +(press \key{?}). +\\ +\key{options\_guide.txt} describes all the options in minute detail. While +tweaking these can improve your \crawl\ experience, you will probably prefer +to skip this at first. +\\ +\key{crawl\_macros.txt} explains macros and key bindings. You should probably +ignore this at first, too. + % (Unless you experience serious problems with some keys, in which case should + % look at the keymaps section.) +\end{minipage} + +\para\para + +\sex{Contact} + +\para + +If you have questions concerning the game, or think you have found a bug, +there are several places to contact the developers. First, there is the +newsgroup \key{rec.games.roguelike.misc}. Since other games are +discussed there as well, it is polite to flag your post with \key{-crawl-}. +If you are not familiar with Usenet netiquette, you might want to check +that first, too. +Also try to maintain netiquette to the benefit of your addresses. +\\ +Next, you are encouraged to file bug reports and feature requests on the +\crawl\ homepage at \key{http://crawl-ref.sourceforge.net}. From there, you +can also download the most recent version (both binaries or source, for +Unix, Windows, OS X, and DOS). +\\ +Finally, you can use the mailing list +\key{crawl-ref-discuss@lists.sourceforge.net} +to discuss specific details of the game's design and implementation. + +\para \para + +\sex{Internet play} + +\para + +You can play \crawl\ online, both competing with other players and watching +them. Check the homepage \key{crawl.akrasiac.org} for details, including +information about additional servers. You just need a \texttt{ssh} or +\texttt{telnet} console; on Windows, the \texttt{PuTTY} program works very +well. Read \key{ssh\_guide.txt} in the \key{docs} folder for a step by step +guide on how to set this up. + +\para \para + +\sex{Tiles} + +\para + +\crawl\ features an alternative to the classical ASCII display; Tile-based +Crawl is often a lot more accessible by new players. Tiles are available for +Linux, Windows and OS X. +Unfortunately, it is not yet possible to combine tiles and internet play. +\end{document} diff --git a/crawl-ref/source/util/docs/contact.tex b/crawl-ref/source/util/docs/contact.tex deleted file mode 100644 index 9b158810c4..0000000000 --- a/crawl-ref/source/util/docs/contact.tex +++ /dev/null @@ -1,146 +0,0 @@ -\documentclass[a4paper,10pt]{article} - -\usepackage{palatino} -\usepackage{mathpazo} % optional [sc] fuer real small caps -\usepackage[left=3cm,top=3cm,right=3cm,bottom=2cm,nohead,nofoot]{geometry} - -\usepackage{graphicx} - -\newcommand{\key}[1]{{{\texttt{\textbf{#1}}}}} % this does nasty things to underscores -\newcommand{\sex}[1]{{{\textbf{#1}}}} % \sec already defined - -\newcommand{\crawl}{\textsc{Crawl}} -\newcommand{\dungeon}{\textsc{Dungeon}} - -\newcommand{\spacecolumn}{\begin{minipage}[t]{2cm}\phantom{xxxx}\end{minipage}} -\newcommand{\para}{\vspace{1.5ex}} -\setlength{\parindent}{0em} - -\newcommand{\mc}[1]{\multicolumn{2}{l}{#1}} - -\newcounter{abccounter} -\newenvironment{abcliste}{\begin{list}{(\alph{abccounter})} - {\usecounter{abccounter} - \setlength{\topsep}{0ex} - \setlength{\partopsep}{0ex} - \setlength{\listparindent}{0ex} - \setlength{\itemsep}{0ex} - \setlength{\parsep}{0ex} - \setlength{\leftmargin}{2em} - \setlength{\labelwidth}{2em} - \setlength{\parskip}{0ex} - } - }{\end{list}} - -\pagestyle{empty} - -\begin{document} - - -\begin{center}\textbf{\LARGE -\dungeon\ \crawl: Files and Contact -}\end{center} - -This is the reference sheet for the roguelike game \dungeon\ \crawl, -specifically for the current version of the \textsc{Stone Soup} branch. -\crawl\ is a game of dungeon exploration, fighting and magic that is -renowned for its intricate skills and religion systems. Success requires -tactics, strategy, and perseverance. Though \crawl's reputation is -close to devilish, victories were reported\dots - -\para - -This page explains the various important files. The next page lists a -number of important changes introduced in version 0.4. The last two -pages give a very brief introduction to the game, which should be -enough to get you started. If you are completely new to this type of -game and still want to plunge right in, start up a new game and select -a tutorial (press \key{T} when asked for a species). - -\para\para - -\sex{The most important files} - -\para - -\begin{minipage}[t]{7cm} -The file \key{crawl.exe} in \crawl's main folder starts the game. -\\ \\ -The \sex{settings/} directory contains \key{init.txt}, the options file for -\crawl\ (on linux systems there may also be a \key{.crawlrc} in your home -directory). Since the defaults are well suited for playing, you can ignore -these at first. -\\ -This folder also contains \key{macro.txt}, a list of redefined key -bindings and macros. These make playing \crawl\ even more convenient. -You will probably not need to redefine key mappings until after you have -spent some time playing the game. -\end{minipage} -% -\spacecolumn -% -\begin{minipage}[t]{7cm} -The following files in the \sex{docs/} directory may be helpful: -\\ -\key{crawl\_manual.txt} is the full manual. It explains all races, classes, -item types etc. If you do not delight in manuals, you can put off the -reading this file until later. You can browse the manual while playing -(press \key{?}). -\\ -\key{options\_guide.txt} describes all the options in minute detail. While -tweaking these can improve your \crawl\ experience, you will probably prefer -to skip this at first. -\\ -\key{crawl\_macros.txt} explains macros and key bindings. You should probably -ignore this at first, too. - % (Unless you experience serious problems with some keys, in which case should - % look at the keymaps section.) -\end{minipage} - -\para\para - -\sex{Contact} - -\para - -If you have questions concerning the game, or think you have found a bug, -there are several places to contact the developers. First, there is the -newsgroup \key{rec.games.roguelike.misc}. Since other games are -discussed there as well, it is polite to flag your post with \key{-crawl-}. -If you are not familiar with Usenet netiquette, you might want to check -that first, too. -Also try to maintain netiquette to the benefit of your addresses. -\\ -Next, you are encouraged to file bug reports and feature requests on the -\crawl\ homepage at \key{http://crawl-ref.sourceforge.net}. From there, you -can also download the most recent version (both binaries or source, for -Unix, Windows, OS X, and DOS). -\\ -Finally, you can use the mailing list -\key{crawl-ref-discuss@lists.sourceforge.net} -to discuss specific details of the game's design and implementation. - -\para \para - -\sex{Internet play} - -\para - -You can play \crawl\ online, both competing with other players and watching -them. Check the homepage \key{crawl.akrasiac.org} for details, including -information about additional servers. You just need a \texttt{ssh} or -\texttt{telnet} console; on Windows, the \texttt{PuTTY} program works very -well. Read \key{ssh\_guide.txt} in the \key{docs} folder for a step by step -guide on how to set this up. - -\para \para - -\sex{Tiles} - -\para - -\crawl\ features an alternative to the classical ASCII display; Tile-based -Crawl is often easier accessible by new players. Tiles are available for -Linux, Windows and OS X. -Unfortunately, it is not yet possible to combine tiles and internet play. -\end{document} -- cgit v1.2.3-54-g00ecf