From a6d9a37ef77083ddbba6c9b4ea3d9621140209cc Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 16 Sep 2009 15:57:08 +0000 Subject: [PATCH] - 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. SVN r1847 (trunk) --- docs/rh-log.txt | 8 ++++++++ src/g_shared/a_pickups.cpp | 5 +---- src/g_shared/a_pickups.h | 2 +- src/g_shared/a_randomspawner.cpp | 2 ++ src/p_acs.cpp | 1 + wadsrc/static/actors/doom/dog.txt | 2 +- wadsrc/static/sndinfo.txt | 14 +++++++------- wadsrc/static/sprites/PLS1A0.png | Bin 329 -> 329 bytes wadsrc/static/sprites/PLS1B0.png | Bin 332 -> 332 bytes wadsrc/static/sprites/PLS1C0.png | Bin 329 -> 329 bytes wadsrc/static/sprites/PLS1D0.png | Bin 331 -> 331 bytes wadsrc/static/sprites/PLS1E0.png | Bin 843 -> 843 bytes wadsrc/static/sprites/PLS1F0.png | Bin 844 -> 844 bytes wadsrc/static/sprites/PLS1G0.png | Bin 581 -> 581 bytes wadsrc/static/sprites/PLS2A0.png | Bin 273 -> 273 bytes wadsrc/static/sprites/PLS2B0.png | Bin 261 -> 261 bytes wadsrc/static/sprites/PLS2C0.png | Bin 297 -> 297 bytes wadsrc/static/sprites/PLS2D0.png | Bin 253 -> 253 bytes wadsrc/static/sprites/PLS2E0.png | Bin 267 -> 267 bytes 19 files changed, 21 insertions(+), 13 deletions(-) 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 b1617e46cd4cbfdf9bf80fe4d3f78d97c5a16042..029d0bc75d1f903a2d912beb0b7842ad3f02e11b 100644 GIT binary patch delta 15 XcmX@fbdqU8D=Wty@pV%tcI^iMF#HCo delta 15 WcmX@fbdqU8D=W|Ls;r)gUHbts?*_sE diff --git a/wadsrc/static/sprites/PLS1B0.png b/wadsrc/static/sprites/PLS1B0.png index 40b628f13f01df44a78fd6166fb1a6ad0e44ef6b..d50f0d7d545e7ea06fce2e685849e0707fd61d27 100644 GIT binary patch delta 15 WcmX@ZbcSg{D=SB1dAsVwu0sGXa|S>F delta 15 WcmX@ZbcSg{D=SZ%l(Wsmu0sGUkOjX0 diff --git a/wadsrc/static/sprites/PLS1C0.png b/wadsrc/static/sprites/PLS1C0.png index b1617e46cd4cbfdf9bf80fe4d3f78d97c5a16042..029d0bc75d1f903a2d912beb0b7842ad3f02e11b 100644 GIT binary patch delta 15 XcmX@fbdqU8D=Wty@pV%tcI^iMF#HCo delta 15 WcmX@fbdqU8D=W|Ls;r)gUHbts?*_sE diff --git a/wadsrc/static/sprites/PLS1D0.png b/wadsrc/static/sprites/PLS1D0.png index 98dfeb0dcc28f4ca47a3c5f63e27d4fb008d362d..ed08ba37135f1b18c42d17fcd8f6e660e086fb7d 100644 GIT binary patch delta 15 WcmX@jbed^GD=SB1dAsVwu7dzCRt7x) delta 15 WcmX@jbed^GD=SZ%l(Wsmu7dz9a|OHr diff --git a/wadsrc/static/sprites/PLS1E0.png b/wadsrc/static/sprites/PLS1E0.png index dca03ceff306789d3211a0e57ede2e0b7c47f23a..a3a688631bb903190adcb37594454052ccb0090d 100644 GIT binary patch delta 16 YcmX@jcA9NM0jtQ@X+AGDmR@5506g0Vc>n+a delta 16 YcmX@jcA9NM0juf~51&gLORq5j061I*)c^nh diff --git a/wadsrc/static/sprites/PLS1F0.png b/wadsrc/static/sprites/PLS1F0.png index e43de905fed032ab923fa8f0de63b74f1fc0a227..dbacdc85aae939d4eece16f53073856b21291571 100644 GIT binary patch delta 16 YcmX@Zc7|<20jtQ@X+AGDmR@H906hB#d;kCd delta 16 YcmX@Zc7|<20juf~51&gLORqBl062UG*Z=?k diff --git a/wadsrc/static/sprites/PLS1G0.png b/wadsrc/static/sprites/PLS1G0.png index 5a2c9db1da4a8267581dada9c702926f9923ddaa..fef4459d2072a181c96e55001662107057910663 100644 GIT binary patch delta 16 XcmX@ga+GC4BCA-8MYzbuwEK(zFa!ma delta 16 XcmX@ga+GC4BCA$$xc20YY4;fcGrR^e diff --git a/wadsrc/static/sprites/PLS2A0.png b/wadsrc/static/sprites/PLS2A0.png index bc82af045788035af80ead0f1b17e44c5509a9d6..cab771a20cc4839fe632d9c274397eb8430c4273 100644 GIT binary patch delta 15 XcmbQpG?8h-L{|27KUA(xoK_70E>Z@S delta 15 XcmbQpG?8h-L{_c~o)H-nr&R+0Dvkxx diff --git a/wadsrc/static/sprites/PLS2B0.png b/wadsrc/static/sprites/PLS2B0.png index 5e187595307ec9a3d546c29522a8a5f90b804e70..324b02b18710e1f11c49c7e49181d95e572f9c1e 100644 GIT binary patch delta 15 WcmZo=YGs-GqITyH&y@uDK!Ol delta 15 XcmZ3Smgd#mb$uul4`L{5b$CGzMh= delta 15 WcmeBX>Smgd#VYXPwvX_{{5b$B=LP5h