summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-19 17:46:25 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-19 17:46:25 +0000
commit5904e93aa4220ebb102df0510f11f21980ed6ffa (patch)
tree69bc3c045337dd4fb0e109f379946ac87a73811a
parent8b5ae1fa034a8ca37d40721737215a9012294a8d (diff)
downloadcrawl-ref-5904e93aa4220ebb102df0510f11f21980ed6ffa.tar.gz
crawl-ref-5904e93aa4220ebb102df0510f11f21980ed6ffa.zip
Add whitespace fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10732 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/CREDITS.txt4
-rw-r--r--crawl-ref/README.txt4
-rw-r--r--crawl-ref/docs/034_changes.txt4
-rw-r--r--crawl-ref/docs/crawl_manual.txt6
-rw-r--r--crawl-ref/docs/macros_guide.txt10
-rw-r--r--crawl-ref/docs/mt19937.txt8
-rw-r--r--crawl-ref/docs/quickstart.txt2
-rw-r--r--crawl-ref/docs/ssh_guide.txt76
-rw-r--r--crawl-ref/source/arena.cc2
-rw-r--r--crawl-ref/source/directn.cc2
-rw-r--r--crawl-ref/source/makefile2
-rw-r--r--crawl-ref/source/makefile.mgw_unix4
-rw-r--r--crawl-ref/source/makeitem.cc2
-rw-r--r--crawl-ref/source/mon-spll.h12
-rw-r--r--crawl-ref/source/tilepick.cc2
15 files changed, 70 insertions, 70 deletions
diff --git a/crawl-ref/CREDITS.txt b/crawl-ref/CREDITS.txt
index 87c93ac59d..c2eeb83e7d 100644
--- a/crawl-ref/CREDITS.txt
+++ b/crawl-ref/CREDITS.txt
@@ -1,6 +1,6 @@
-The Dungeon Crawl Stone Soup team (Peter Berger, Matthew Cline, Paul Du Bois,
-Eino Keskitalo, Nat Lanza, Haran Pilpel, David Ploog, Johanna Ploog, David
+The Dungeon Crawl Stone Soup team (Peter Berger, Matthew Cline, Paul Du Bois,
+Eino Keskitalo, Nat Lanza, Haran Pilpel, David Ploog, Johanna Ploog, David
Lawrence Ramsey, Enne Walker) would like to thank:
* Linley Henzell, the author of Dungeon Crawl, for writing this great game.
diff --git a/crawl-ref/README.txt b/crawl-ref/README.txt
index e5f61c9a6b..1cbce59ae4 100644
--- a/crawl-ref/README.txt
+++ b/crawl-ref/README.txt
@@ -115,8 +115,8 @@ of ways to do so:
* Playtesting.
At any time, there will be bugs -- playing and reporting these is a great help.
-There is a beta server at http://crawl.develz.org. Besides pointing out bugs,
-new ideas on how to improve interface or gameplay are welcome. You can mention
+There is a beta server at http://crawl.develz.org. Besides pointing out bugs,
+new ideas on how to improve interface or gameplay are welcome. You can mention
them at the homepage, http://crawl-ref.sourceforge.net.
* Vault making.
diff --git a/crawl-ref/docs/034_changes.txt b/crawl-ref/docs/034_changes.txt
index c30f42396c..ca0a34ad6e 100644
--- a/crawl-ref/docs/034_changes.txt
+++ b/crawl-ref/docs/034_changes.txt
@@ -20,7 +20,7 @@ mostly in 0.4, some more in 0.5. Among them:
Ctrl-Q quit (was Q)
* Changed the commands for travel exclusions in the level map:
- e set exclusion (was Ctrl-X)
+ e set exclusion (was Ctrl-X)
E cycle exclusions (was x)
* Added some new commands:
@@ -50,7 +50,7 @@ mostly in 0.4, some more in 0.5. Among them:
can be sacrificed with 'pca'.
* When targeting, the functions of '!' and '.' have been swapped. Thus
- firing with '.' will now stop at the target, whereas '!' will shoot
+ firing with '.' will now stop at the target, whereas '!' will shoot
further if the target was missed. Enter etc. still behave as in 0.3.4.
You can now target using the monster list; Cltr-L toggles this option.
You can quiver an item, meaning that you will preferably fire this
diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt
index 1f17197005..91423389c0 100644
--- a/crawl-ref/docs/crawl_manual.txt
+++ b/crawl-ref/docs/crawl_manual.txt
@@ -59,7 +59,7 @@ gameplay and design, to be accessed by pressing '?Q' in the game.
While Dungeon Crawl is a strict single player game, you can play on a
server together with many others. These are the relevant webpage and
-telnet and ssh addresses (akrasiac.org is situated in Northern America,
+telnet and ssh addresses (akrasiac.org is situated in Northern America,
while develz.org is located in Europe):
http://crawl.akrasiac.org
@@ -80,7 +80,7 @@ running and no one has lost their save file yet. :) More information
is available at the URLs above.
There is also a lively IRC channel dedicated to Crawl at ##crawl on
-freenode. You can ask for help and there will always be someone to
+freenode. You can ask for help and there will always be someone to
supervise your game and give hints if you happen to play on a server.
@@ -1524,7 +1524,7 @@ Mountain Dwarves
In general, they are not capable of dealing with magic, and are
suspectible to charms and enchantments. However, they are very
proficient at earth and fire magics. Thus, many a Mountain Dwarf
- started career as an elementalist in those schools. They advance in
+ started career as an elementalist in those schools. They advance in
levels at a similar rate to Deep Elves.
Deep Dwarves
diff --git a/crawl-ref/docs/macros_guide.txt b/crawl-ref/docs/macros_guide.txt
index adeb5d506a..b8df7284be 100644
--- a/crawl-ref/docs/macros_guide.txt
+++ b/crawl-ref/docs/macros_guide.txt
@@ -44,8 +44,8 @@ Defining keymaps works in exactly the same way. Just press 'k'
(default), 'x' (level-map), 't' (targeting) or 'c' (confirmation)
instead of 'm' after pressing '~'.
-After defining such a macro or keymap, you should test it. If you are
-comfortable with it, you should then save the macro. To save all macros
+After defining such a macro or keymap, you should test it. If you are
+comfortable with it, you should then save the macro. To save all macros
and keymaps, press '~' and then 's' to save macros at the tilde prompt).
@@ -75,9 +75,9 @@ separated by empty lines.
For keymaps just replace the "M:" on the first line of the definiton
with one of the following:
-"K:" default,
-"K1:" level-map,
-"K2:" targeting or
+"K:" default,
+"K1:" level-map,
+"K2:" targeting or
"K3:" confirmation.
diff --git a/crawl-ref/docs/mt19937.txt b/crawl-ref/docs/mt19937.txt
index 64e301687f..228e4a8fd1 100644
--- a/crawl-ref/docs/mt19937.txt
+++ b/crawl-ref/docs/mt19937.txt
@@ -1,11 +1,11 @@
A C-program for MT19937, with initialization improved 2002/1/26.
Coded by Takuji Nishimura and Makoto Matsumoto.
-Before using, initialize the state by using init_genrand(seed)
+Before using, initialize the state by using init_genrand(seed)
or init_by_array(init_key, key_length).
Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-All rights reserved.
+All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -18,8 +18,8 @@ are met:
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- 3. The names of its contributors may not be used to endorse or promote
- products derived from this software without specific prior written
+ 3. The names of its contributors may not be used to endorse or promote
+ products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
diff --git a/crawl-ref/docs/quickstart.txt b/crawl-ref/docs/quickstart.txt
index 895965744a..4b18bb4c35 100644
--- a/crawl-ref/docs/quickstart.txt
+++ b/crawl-ref/docs/quickstart.txt
@@ -143,7 +143,7 @@ Before long, you'll probably end up dead.
Death in Crawl is permanent; you cannot just reload a saved game and start
again where you left off. The 'S' (save) command exists only to let you leave
-a game part-way through and come back to it later. Quitting ('Ctrl-Q') lets
+a game part-way through and come back to it later. Quitting ('Ctrl-Q') lets
you commit suicide if you can't even be bothered to help your character escape
alive.
diff --git a/crawl-ref/docs/ssh_guide.txt b/crawl-ref/docs/ssh_guide.txt
index 10ded00052..02875416f2 100644
--- a/crawl-ref/docs/ssh_guide.txt
+++ b/crawl-ref/docs/ssh_guide.txt
@@ -2,7 +2,7 @@ Guide to online play
====================
The following guide explains, in layman's terms, how to access server
-play for Dungeon Crawl. It is directed at Windows users as we expect
+play for Dungeon Crawl. It is directed at Windows users as we expect
Linux and OS/X users to have simple access to ssh.
Written up by Archibald, with modifications by Butch.
@@ -23,7 +23,7 @@ allows you to do:
So you've downloaded the latest version of Crawl Stone Soup and have
been playing offline (or 'local') and you thoroughly enjoy it. You
may have noticed from the akrasiac homepage, http://crawl.akrasiac.org/
-or posts in forums that there is a way to enhance your gaming experience
+or posts in forums that there is a way to enhance your gaming experience
by playing 'online' using something called 'SSH'.
If only you could figure out how. Well, if like me (to begin with)
@@ -39,9 +39,9 @@ Oh look! somebody has - done just that! Great, then let's get started.
1. Get the PuTTY program
------------------------
-Firstly you will need a means of accessing the server. The easiest
-and most common method is by using an SSH (Secure SHell) connection,
-we are going to learn here how to use the 'PuTTY' terminal to do this.
+Firstly you will need a means of accessing the server. The easiest
+and most common method is by using an SSH (Secure SHell) connection,
+we are going to learn here how to use the 'PuTTY' terminal to do this.
In laymans terms PuTTY is simply a small programme that acts as your
interface between you (the player) and the server (the host).
@@ -51,14 +51,14 @@ In order to download PuTTY, simply click on the following link:
As you can see, this is the homepage for 'PuTTY: A Free Telnet/SSH
Client'.
-Now go to the downloads section. Scroll down to the Windows downloads
-section and look for the first option down - you will see that it is
+Now go to the downloads section. Scroll down to the Windows downloads
+section and look for the first option down - you will see that it is
called 'PuTTY'.
-That's the one you want, so click on the 'putty.exe' download link and
-choose to save it to your desktop (well, that's how I did it anyway).
+That's the one you want, so click on the 'putty.exe' download link and
+choose to save it to your desktop (well, that's how I did it anyway).
This should place an icon on your desktop that resembles two blue screens
-with a yellow connection/electricity bolt joining them - it should be
+with a yellow connection/electricity bolt joining them - it should be
named 'putty'.
2. Configure PuTTY connection: SSH, port 22
@@ -80,23 +80,23 @@ IP address)'. Here you need to type in the following:
crawl.akrasiac.org
Done that? We next need to set one option: There are five radio buttons
-underneath the 'Host Name (or IP address)' fields, called 'Connection
+underneath the 'Host Name (or IP address)' fields, called 'Connection
type:' Here you need to choose the SSH button; it should be highlighted
-green. If it's not already, simply click on it so that it is green.
+green. If it's not already, simply click on it so that it is green.
When SSH is selected, the Port field will automatically change to 22.
-Finally, enable SSH compression by using
-Category: Connection > SSH > Protocol Options > Enable compression.
+Finally, enable SSH compression by using
+Category: Connection > SSH > Protocol Options > Enable compression.
It's disabled by default but helps on a busy server as akrasiac.
3. Set controls to 'Nethack'
----------------------------
Next we need to ensure our keyboard will work properly, once connected.
-So, to the left of the interface (the 'Category' tree) you need to
-click/select the 'keyboard' option. Doing this will change the options
+So, to the left of the interface (the 'Category' tree) you need to
+click/select the 'keyboard' option. Doing this will change the options
on the right-hand side to 'Options controlling the effects of keys'.
-Mid-way down that section under 'Application keypad settings:', click on
+Mid-way down that section under 'Application keypad settings:', click on
the 'Nethack' radio button so it is highlighted.
4. Saving these options
@@ -117,8 +117,8 @@ We're ready! Make sure you are connected to the internet and simply
click on 'Open' and you will have a black console screen open up and be
asked to 'login as:', here you need to type in the word 'joshua'. This
is the default log-in name set by the administrator to connect to CAO.
-Once entered, you will be asked to enter 'jos...@crawl.akrasiac.org.'s
-password:' - again, type in the word 'joshua' (yes, you guessed it - the
+Once entered, you will be asked to enter 'jos...@crawl.akrasiac.org.'s
+password:' - again, type in the word 'joshua' (yes, you guessed it - the
default password!).
The screen will refresh and you will now be presented with the
@@ -152,8 +152,8 @@ account. The rest should be self explanatory and easy to follow.
7. Playing online
-----------------
-Each time you want to play all you have to do is open PuTTY, log-in
-to CAO with (joshua/joshua) and then log-in with your player details.
+Each time you want to play all you have to do is open PuTTY, log-in
+to CAO with (joshua/joshua) and then log-in with your player details.
Dead easy!
For in-game instructions hit '?' and you may need to toggle the
@@ -163,40 +163,40 @@ Happy Crawling!
-Below, we list steps that make logging into the server more convenient.
+Below, we list steps that make logging into the server more convenient.
8.1 Automatic 'joshua' (login)
------------------------------
-If you do not want to enter the user name 'joshua' every time you start
-a new session, just go to 'Session' (the initial display) in the Category
+If you do not want to enter the user name 'joshua' every time you start
+a new session, just go to 'Session' (the initial display) in the Category
tree and type 'joshua@crawl.akrasiac.org' in the 'Host name (or IP address)'
-input box (as opposed to 'crawl.akrasiac.org' you typed earlier, if you
-were following the guide).
+input box (as opposed to 'crawl.akrasiac.org' you typed earlier, if you
+were following the guide).
8.2 Automatic 'joshua' (password)
---------------------------------
-If you do not want to enter the password 'joshua' every time you start a
+If you do not want to enter the password 'joshua' every time you start a
new session, then download the file 'cao_key.ppk' from
http://crawl.akrasiac.org/cao_key.ppk
and put it in your PuTTY directory. Then start PuTTY, load your stored
-session and go to 'Connection' ---> 'SSH' ---> 'Auth' in the Category
-tree. Press the 'Browse' button near the input box labelled 'Private key
-file for authentication', choose the 'cao_key.ppk' file you have just
+session and go to 'Connection' ---> 'SSH' ---> 'Auth' in the Category
+tree. Press the 'Browse' button near the input box labelled 'Private key
+file for authentication', choose the 'cao_key.ppk' file you have just
downloaded and press the 'Open' button. Save the changes as in step 4.
8.3 A shortcut for Windows
--------------------------
-Once you are satisfied with the configuration, you may speed up things
-further: go to your PuTTY directory and create a shortcut to putty.exe.
-Then open the Properties of the newly created shortcut and add
+Once you are satisfied with the configuration, you may speed up things
+further: go to your PuTTY directory and create a shortcut to putty.exe.
+Then open the Properties of the newly created shortcut and add
-load "your_session_name"
-(including spaces and quotation marks; replace "your_session_name" by
-"Crawl" if you followed this guide so far) to the Target object input box
+(including spaces and quotation marks; replace "your_session_name" by
+"Crawl" if you followed this guide so far) to the Target object input box
at the end of the path, for example,
C:\PuTTY\putty.exe -load "Crawl"
-Now you can rename the shortcut (to for example 'CAO'). Double-clicking
-the shortcut will immediately start your saved session. If you followed
-this guide from the beginning, after a while you will arrive at the DGL
+Now you can rename the shortcut (to for example 'CAO'). Double-clicking
+the shortcut will immediately start your saved session. If you followed
+this guide from the beginning, after a while you will arrive at the DGL
initial display without the need to type a word.
diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc
index b706eae19b..6898d5323a 100644
--- a/crawl-ref/source/arena.cc
+++ b/crawl-ref/source/arena.cc
@@ -1063,7 +1063,7 @@ void arena_placed_monster(monsters *monster)
monster->name(DESC_PLAIN, true).c_str());
more();
}
-
+
if (monster->type == MONS_TEST_SPAWNER)
{
if (monster->attitude == ATT_FRIENDLY)
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 58b2bae261..49a014ba95 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -1079,7 +1079,7 @@ void direction(dist& moves, targeting_type restricts,
}
}
}
-
+
bool show_prompt = true;
bool moved_with_keys = true;
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile
index 5d809d31c9..8b40a64ea3 100644
--- a/crawl-ref/source/makefile
+++ b/crawl-ref/source/makefile
@@ -20,7 +20,7 @@ MAKEFILE ?= makefile.unix
# cuts build time a lot on multi-cpu machines
# Note: do not use enable this for builds of the tiles version.
#OTHER=-j2
-
+
all:
$(MAKE) $(OTHER) -f $(MAKEFILE)
diff --git a/crawl-ref/source/makefile.mgw_unix b/crawl-ref/source/makefile.mgw_unix
index 22399d06cf..036b90109e 100644
--- a/crawl-ref/source/makefile.mgw_unix
+++ b/crawl-ref/source/makefile.mgw_unix
@@ -41,7 +41,7 @@ PCRELIBA := lib$(PCRELIB).a
LIB = -static -L$(HOME)/source/mingw32/lib -lwinmm -L$(LUASRC) -l$(LUALIB) -L$(SQLSRC) -l$(SQLLIB) -L$(PCRESRC) -l$(PCRELIB)
INCLUDES := -Iutil -I. -I$(HOME)/source/mingw32/include -I$(LUASRC) -I$(SQLSRC) -I$(PCRESRC)
-CFWARN := -Wwrite-strings
+CFWARN := -Wwrite-strings
CFOTHERS := -fsigned-char \
-fstrict-aliasing \
@@ -198,7 +198,7 @@ profile: $(GAME_DEPENDS)
${CXX} -g -p ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(APPNAME) $(LIB)
$(OPATH)/%.o: %.cc
- ${CXX} ${CFLAGS} -o $@ -c $<
+ ${CXX} ${CFLAGS} -o $@ -c $<
$(OPATH)/%.o: $(UTIL)%.cc
$(CXX) $(YCFLAGS) -o $@ -c $<
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 829d971a2d..41c0f2f6f7 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -4348,7 +4348,7 @@ void give_armour(monsters *mon, int level)
case MONS_WIZARD:
case MONS_ILSUIW:
if (item_race == MAKE_ITEM_RANDOM_RACE)
- item_race = MAKE_ITEM_NO_RACE;
+ item_race = MAKE_ITEM_NO_RACE;
item.base_type = OBJ_ARMOUR;
item.sub_type = ARM_ROBE;
break;
diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h
index 2cec050c91..cb44ce64c7 100644
--- a/crawl-ref/source/mon-spll.h
+++ b/crawl-ref/source/mon-spll.h
@@ -1092,12 +1092,12 @@
{ MST_DOWAN,
{
- SPELL_THROW_FROST,
- SPELL_BACKLIGHT,
- SPELL_HASTE,
- SPELL_THROW_FLAME,
- SPELL_BLINK,
- SPELL_MINOR_HEALING,
+ SPELL_THROW_FROST,
+ SPELL_BACKLIGHT,
+ SPELL_HASTE,
+ SPELL_THROW_FLAME,
+ SPELL_BLINK,
+ SPELL_MINOR_HEALING,
}
},
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index ac1f1d7239..91f8c9946b 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -353,7 +353,7 @@ int tileidx_monster_base(const monsters *mon, bool detected)
return TILEP_MONS_MINOTAUR;
// ugly things ('u')
- case MONS_UGLY_THING :
+ case MONS_UGLY_THING:
return TILEP_MONS_UGLY_THING ;
case MONS_VERY_UGLY_THING:
return TILEP_MONS_VERY_UGLY_THING;