* Remove unnecessary winhdr.h, as pointed out by kotk.

* Special message when piercing actual pigs, patch by hammerbroish.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9699 c06c8d41-db1a-0410-9941-cceddc491573

4 files changed, 11 insertions, 71 deletions

diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index bc7a9b1657..e7195b39ce 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -86,6 +86,7 @@ Interface
 ---------
 * Store message history across saves.
 * Some message condensation for identical messages.
+* Changed quick save command to 'Ctrl-S' (was Ctrl-X).
 * Added stat_colour option to highlight dangerously low stats.
 * New option: Automatically set travel exclusions for statues and oklob plants.
 * Limit travel exclusions to line of sight.
@@ -101,7 +102,7 @@ Interface
 * Added an option to make menu colours apply to shops.
 * Use menu colours for announcements of items found while travelling.
 * Pressing Esc at -More- automatically clears all queued -More- prompts.
-* Improved monster/item view command ('V'), allowing travel to items, features.
+* New monster/item view command ('Ctrl-X'), allowing travel to items, features.
 * Add FAQ to help screen ('?Q').
 * Purchases and donations are noted.
 * The database search also prints armour base AC/EV and weapon plusses.
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index d25c02c28a..b9a417cae1 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -1769,7 +1769,14 @@ int melee_attack::player_weapon_type_modify(int damage)
         else
         {
             attack_verb = "spit";
-            verb_degree = " like a pig";
+            if (defender->atype() == ACT_MONSTER
+                && defender_visible
+                && mons_genus(defender_as_monster()->type) == MONS_HOG)
+            {
+                verb_degree = " like the proverbial pig";
+            }
+            else
+                verb_degree = " like a pig";
         }
         break;
 
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index d9a0e2d6e5..3009a58604 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -798,7 +798,7 @@ static monsterentry mondata[] = {
     MONS_HELL_HOG, 'h', LIGHTRED, "hell-hog",
     M_SPELLCASTER | M_EVIL,
     MR_NO_FLAGS,
-    0, 10, MONS_HELL_HOG, MONS_HELL_HOG, MH_DEMONIC, -3,
+    0, 10, MONS_HOG, MONS_HELL_HOG, MH_DEMONIC, -3,
     { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 11, 3, 5, 0 },
     2, 9, MST_HELL_HOG, CE_CLEAN, Z_NOZOMBIE, S_SILENT, I_ANIMAL,
diff --git a/crawl-ref/source/winhdr.h b/crawl-ref/source/winhdr.h
deleted file mode 100644
index 967d2aba8a..0000000000
--- a/crawl-ref/source/winhdr.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  File:       WinHdr.h
- *  Summary:    OS specific stuff for inclusion into AppHdr.h.
- *  Written by: Jesse Jones
- *
- *  Copyright © 1999 Jesse Jones.
- *
- *  Modified for Crawl Reference by $Author$ on $Date$
- */
-
-
-#ifndef WINHDR_H
-#define WINHDR_H
-
-
-// ===================================================================================
-//      Windows Includes
-// ===================================================================================
-#define WIN32_LEAN_AND_MEAN     // exclude some of the less common APIs
-#define NOSERVICE
-#define NOMCX
-#define NOIME
-
-#define STRICT                                  1       // enable as much type checking as the lame Windows API will allow
-#define NOMINMAX                // don't let Windows define (lower case!) min and max macros (conflicts with STL)
-
-#include <windows.h>
-#include <wtypes.h>
-#include <commdlg.h>
-#include <tchar.h>
-
-
-// ===================================================================================
-//      MSVC Warnings (I'm not sure if these will fly with Crawl)
-// ===================================================================================
-#if _MSC_VER
-#ifndef ENABLE_EXTRA_WARNINGS
-#define ENABLE_EXTRA_WARNINGS   1       // if non-zero selected level 4 warnings are enabled
-#endif
-
-#if ENABLE_EXTRA_WARNINGS
-#pragma warning(error : 4057)   // The pointer expressions used with the given operator had different base types.
-//      #pragma warning(error : 4100)                   // The given formal parameter was never referenced in the body of the function for which it was declared.
-#pragma warning(error : 4130)   // The operator was used with the address of a string literal.
-#pragma warning(error : 4131)   // The specified function declaration is not in prototype form.
-#pragma warning(error : 4132)   // The constant was not initialized.
-#pragma warning(error : 4152)   // A pointer to a function was converted to a pointer to data, or vice versa.
-#pragma warning(error : 4208)   // nonstandard extension used : delete [exp] - exp evaluated but ignored
-#pragma warning(error : 4211)   // nonstandard extension used : redefined extern to static
-#pragma warning(error : 4212)   // nonstandard extension used : function declaration used ellipsis
-#pragma warning(error : 4222)   // nonstandard extension used : 'identifier' : 'static' should not be used on member functions defined at file scope
-#pragma warning(error : 4223)   // nonstandard extension used : non-lvalue array converted to pointer
-#pragma warning(error : 4355)   // 'this' : used in base member initializer list
-#pragma warning(error : 4663)   // C++ language change: to explicitly specialize class template 'identifier' use the following syntax:
-#pragma warning(error : 4665)   // C++ language change: assuming 'declaration' is an explicit specialization of a function template
-#pragma warning(error : 4701)   // local variable 'name' may be used without having been initialized
-#pragma warning(error : 4705)   // statement has no effect
-#pragma warning(error : 4706)   // assignment within conditional expression
-#endif
-
-#pragma warning(disable : 4800) // casting integer to bool
-#pragma warning(disable : 4786) // identifier was truncated to '255' characters in the browser
-
-#endif
-
-
-
-#endif