diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 89fc05c25..e8325e4a3 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,12 @@ September 16, 2009 (Changes by Graf Zahl) +- Gez's misc. bugs patch: +* Moves the dog sound out of the Doom-specific sounds in SNDINFO to address this, +* Renames the dog actor to MBFHelperDog to prevent name conflicts, +* Adds APROP_Score to CheckActorProperty, +* Completes the randomspawner update (the reason I moved the recursion counter out of + special1 was that I found some projectiles had this set to them, for example in + A_LichAttack, but I forgot to add transfer for them), +* Provides centered sprites for beta plasma balls if this is deemed deserving correction. - Added some pieces of MBF's friendly AI. - Cleaned up A_LookEx code and merged most of it with the base functions. The major difference was a common piece of code that was repeated 5 times diff --git a/src/g_shared/a_pickups.cpp b/src/g_shared/a_pickups.cpp index 045e5bf92..e9d9e2003 100644 --- a/src/g_shared/a_pickups.cpp +++ b/src/g_shared/a_pickups.cpp @@ -1741,10 +1741,7 @@ IMPLEMENT_CLASS(AScoreItem) // // AScoreItem :: TryPickup // -// This function does nothing much. Theoretically, the player could have a -// score property which would be incremented by the score items' own score -// property (probably using the Amount property for that), but that is not -// needed for the moment. +// Adds the value (Amount) of the item to the toucher's Score property. // //=========================================================================== diff --git a/src/g_shared/a_pickups.h b/src/g_shared/a_pickups.h index 6ccc8cd5e..8832161d1 100644 --- a/src/g_shared/a_pickups.h +++ b/src/g_shared/a_pickups.h @@ -477,7 +477,7 @@ public: // A score item is picked up without being added to the inventory. -// Contrarily to FakeInventory, it does nothing. +// It differs from FakeInventory by doing nothing more than increasing the player's score. class AScoreItem : public AInventory { DECLARE_CLASS (AScoreItem, AInventory) diff --git a/src/g_shared/a_randomspawner.cpp b/src/g_shared/a_randomspawner.cpp index b4b9176ae..a5ffa9251 100644 --- a/src/g_shared/a_randomspawner.cpp +++ b/src/g_shared/a_randomspawner.cpp @@ -111,6 +111,8 @@ class ARandomSpawner : public AActor newmobj->args[2] = args[2]; newmobj->args[3] = args[3]; newmobj->args[4] = args[4]; + newmobj->special1 = special1; + newmobj->special2 = special2; newmobj->SpawnFlags = SpawnFlags; newmobj->HandleSpawnFlags(); newmobj->tid = tid; diff --git a/src/p_acs.cpp b/src/p_acs.cpp index e45f92752..3f24ad0ed 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -2684,6 +2684,7 @@ int DLevelScript::CheckActorProperty (int tid, int property, int value) case APROP_Gravity: case APROP_SpawnHealth: case APROP_JumpZ: + case APROP_Score: return (GetActorProperty(tid, property) == value); // Boolean values need to compare to a binary version of value diff --git a/wadsrc/static/actors/doom/dog.txt b/wadsrc/static/actors/doom/dog.txt index ea1e72231..0feb393f5 100644 --- a/wadsrc/static/actors/doom/dog.txt +++ b/wadsrc/static/actors/doom/dog.txt @@ -1,4 +1,4 @@ -ACTOR Dog 888 +ACTOR MBFHelperDog 888 { Game Doom Health 500 diff --git a/wadsrc/static/sndinfo.txt b/wadsrc/static/sndinfo.txt index 2838be889..c8840310e 100644 --- a/wadsrc/static/sndinfo.txt +++ b/wadsrc/static/sndinfo.txt @@ -50,6 +50,13 @@ misc/icebreak icebrk1a // Retail Doom and Strife use 200. $rolloff * 200 1200 +// Marine's Best Friend -- not just for marines anymore! +dog/active dsdgact +dog/attack dsdgatk +dog/death dsdgdth +dog/pain dsdgpain +dog/sight dsdgsit + /****************************************************************************/ /* */ /* DOOM SOUNDS */ @@ -425,13 +432,6 @@ brain/cube dsboscub brain/cubeboom dsfirxpl $alias brain/spawn misc/teleport -// Marine's Best Friend -dog/active dsdgact -dog/attack dsdgatk -dog/death dsdgdth -dog/pain dsdgpain -dog/sight dsdgsit - //============================================================================ // diff --git a/wadsrc/static/sprites/PLS1A0.png b/wadsrc/static/sprites/PLS1A0.png index b1617e46c..029d0bc75 100644 Binary files a/wadsrc/static/sprites/PLS1A0.png and b/wadsrc/static/sprites/PLS1A0.png differ diff --git a/wadsrc/static/sprites/PLS1B0.png b/wadsrc/static/sprites/PLS1B0.png index 40b628f13..d50f0d7d5 100644 Binary files a/wadsrc/static/sprites/PLS1B0.png and b/wadsrc/static/sprites/PLS1B0.png differ diff --git a/wadsrc/static/sprites/PLS1C0.png b/wadsrc/static/sprites/PLS1C0.png index b1617e46c..029d0bc75 100644 Binary files a/wadsrc/static/sprites/PLS1C0.png and b/wadsrc/static/sprites/PLS1C0.png differ diff --git a/wadsrc/static/sprites/PLS1D0.png b/wadsrc/static/sprites/PLS1D0.png index 98dfeb0dc..ed08ba371 100644 Binary files a/wadsrc/static/sprites/PLS1D0.png and b/wadsrc/static/sprites/PLS1D0.png differ diff --git a/wadsrc/static/sprites/PLS1E0.png b/wadsrc/static/sprites/PLS1E0.png index dca03ceff..a3a688631 100644 Binary files a/wadsrc/static/sprites/PLS1E0.png and b/wadsrc/static/sprites/PLS1E0.png differ diff --git a/wadsrc/static/sprites/PLS1F0.png b/wadsrc/static/sprites/PLS1F0.png index e43de905f..dbacdc85a 100644 Binary files a/wadsrc/static/sprites/PLS1F0.png and b/wadsrc/static/sprites/PLS1F0.png differ diff --git a/wadsrc/static/sprites/PLS1G0.png b/wadsrc/static/sprites/PLS1G0.png index 5a2c9db1d..fef4459d2 100644 Binary files a/wadsrc/static/sprites/PLS1G0.png and b/wadsrc/static/sprites/PLS1G0.png differ diff --git a/wadsrc/static/sprites/PLS2A0.png b/wadsrc/static/sprites/PLS2A0.png index bc82af045..cab771a20 100644 Binary files a/wadsrc/static/sprites/PLS2A0.png and b/wadsrc/static/sprites/PLS2A0.png differ diff --git a/wadsrc/static/sprites/PLS2B0.png b/wadsrc/static/sprites/PLS2B0.png index 5e1875953..324b02b18 100644 Binary files a/wadsrc/static/sprites/PLS2B0.png and b/wadsrc/static/sprites/PLS2B0.png differ diff --git a/wadsrc/static/sprites/PLS2C0.png b/wadsrc/static/sprites/PLS2C0.png index 532c7efe4..1d4148d1d 100644 Binary files a/wadsrc/static/sprites/PLS2C0.png and b/wadsrc/static/sprites/PLS2C0.png differ diff --git a/wadsrc/static/sprites/PLS2D0.png b/wadsrc/static/sprites/PLS2D0.png index e1ae4c659..b5be3aaf1 100644 Binary files a/wadsrc/static/sprites/PLS2D0.png and b/wadsrc/static/sprites/PLS2D0.png differ diff --git a/wadsrc/static/sprites/PLS2E0.png b/wadsrc/static/sprites/PLS2E0.png index 099f67ea6..842d3dc3c 100644 Binary files a/wadsrc/static/sprites/PLS2E0.png and b/wadsrc/static/sprites/PLS2E0.png differ