diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-16 17:11:14 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-16 17:11:14 +0000 |
| commit | b689251097ca68c7a6dad3ed3eac4ec0c144271a (patch) | |
| tree | 1534eef000bc2ec2f8744ef0f781353d129d5a1c /crawl-ref/source | |
| parent | 4dbca72b9ff21d9e8534f8c18ae1d67d3e154203 (diff) | |
| download | crawl-ref-b689251097ca68c7a6dad3ed3eac4ec0c144271a.tar.gz crawl-ref-b689251097ca68c7a6dad3ed3eac4ec0c144271a.zip | |
Backported Guus' Debian patch to the 0.2 branch.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1327 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/describe.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/dungeon.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/effects.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/it_use3.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/libunix.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/randart.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/tags.cc | 1 |
7 files changed, 10 insertions, 5 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 0140545dd3..8df39effd4 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -82,7 +82,7 @@ static void append_value( std::string & description, int valu, bool plussed ) //--------------------------------------------------------------- static void print_description( const std::string &d ) { - unsigned int nextLine = std::string::npos; + std::string::size_type nextLine = std::string::npos; unsigned int currentPos = 0; const unsigned int lineWidth = 70; diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index e45c2b5686..7a34e3d561 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -3538,7 +3538,7 @@ void give_armour(monsters *mon, int level) break; case MONS_ORC_WARLORD: - // being at the top has it's priviledges + // being at the top has its privileges if (one_chance_in(3)) level = MAKE_GOOD_ITEM; // deliberate fall through diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 85f6fec71c..30dbc1be0c 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -13,6 +13,7 @@ #include "AppHdr.h" #include "effects.h" +#include <cstdlib> #include <string.h> #include <stdio.h> diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc index 5d93ce8aeb..de46385874 100644 --- a/crawl-ref/source/it_use3.cc +++ b/crawl-ref/source/it_use3.cc @@ -16,6 +16,7 @@ #include "AppHdr.h" #include "it_use3.h" +#include <cstdlib> #include <string.h> #include "externs.h" diff --git a/crawl-ref/source/libunix.cc b/crawl-ref/source/libunix.cc index 1ef0d2ea45..65eac622ef 100644 --- a/crawl-ref/source/libunix.cc +++ b/crawl-ref/source/libunix.cc @@ -332,6 +332,9 @@ void unixcurses_startup( void ) void unixcurses_shutdown() { + // resetty(); + endwin(); + tcsetattr(0, TCSAFLUSH, &def_term); #ifdef USE_UNIX_SIGNALS @@ -343,9 +346,6 @@ void unixcurses_shutdown() signal(SIGINT, SIG_DFL); #endif #endif - - // resetty(); - endwin(); } diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc index 11ba9180c6..c1086cf7f3 100644 --- a/crawl-ref/source/randart.cc +++ b/crawl-ref/source/randart.cc @@ -17,6 +17,8 @@ #include "AppHdr.h" #include "randart.h" +#include <cstdlib> +#include <climits> #include <string.h> #include <stdio.h> diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc index 6dae67aca2..f5eb692c4c 100644 --- a/crawl-ref/source/tags.cc +++ b/crawl-ref/source/tags.cc @@ -55,6 +55,7 @@ */ +#include <cstdlib> #include <stdio.h> #include <string.h> // for memcpy |