From e8042923461e6a0e00556368384f8a7baeabe78e Mon Sep 17 00:00:00 2001 From: ZoriaRPG Date: Sun, 19 Apr 2020 00:13:13 +0100 Subject: [PATCH] 2.8.15 Added __GH_FIX_255_ANONE to fix issues where the tiles for enemies using Animation Style 'None' in 2.55.0 (and possibly in 2.53.1) do not have visual bugs. --- changelog.txt | 16 +++++++++++++++- header/autoGhostReadme.txt | 2 +- header/ghost.zh | 5 ++++- header/ghostYR.zh | 5 ++++- header/ghostZHChangelog.txt | 16 +++++++++++++++- header/ghost_zh/2.8/ghost2_common.zh | 2 +- header/ghost_zh/2.8/ghost2_deprecated.zh | 2 +- header/ghost_zh/2.8/ghost2_drawing.zh | 2 +- header/ghost_zh/2.8/ghost2_eweapon.zh | 2 +- header/ghost_zh/2.8/ghost2_eweaponDeath.zh | 2 +- header/ghost_zh/2.8/ghost2_eweaponMovement.zh | 2 +- header/ghost_zh/2.8/ghost2_flags.zh | 2 +- header/ghost_zh/2.8/ghost2_global.zh | 2 +- header/ghost_zh/2.8/ghost2_init.zh | 6 +++++- header/ghost_zh/2.8/ghost2_modification.zh | 2 +- header/ghost_zh/2.8/ghost2_movement.zh | 2 +- header/ghost_zh/2.8/ghost2_other.zh | 2 +- header/ghost_zh/2.8/ghost2_scripts.zs | 2 +- header/ghost_zh/2.8/ghost2_update.zh | 2 +- header/ghost_zh/2.8/ghost2_updateYR.zh | 2 +- header/ghost_zh/2.8/ghost2_yuurand.zh | 2 +- 21 files changed, 59 insertions(+), 21 deletions(-) diff --git a/changelog.txt b/changelog.txt index 1833f49..8758b87 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,19 @@ ghost.zh -Version 2.8.12 +Version 2.8.15 + +2.8.15 + ( 2020-19-APRIL ) +* Added __GH_FIX_255_ANONE to fix issues where the tiles for enemies +* using Animation Style 'None' in 2.55.0 (and possibly in 2.53.1) +* do not have visual bugs. + +2.8.14 + ( 2020-23-MARCH ) + * Added some YuuRand-specific fixes. +2.8.13 + ( 2020-28-JAN ) +* Further optimised AutoGHost, plus tabbing/spacing clean-up. +* Optimised int __AutoGhostParseName() and __IsScriptNameChar() 2.8.12 (2020-27-JAN) diff --git a/header/autoGhostReadme.txt b/header/autoGhostReadme.txt index 1ffdbf7..289ae23 100644 --- a/header/autoGhostReadme.txt +++ b/header/autoGhostReadme.txt @@ -1,5 +1,5 @@ ghost.zh -Version 2.8.12 +Version 2.8.15 General setup: diff --git a/header/ghost.zh b/header/ghost.zh index 0c8e1f3..4204914 100644 --- a/header/ghost.zh +++ b/header/ghost.zh @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.12 +// Version 2.8.15 // Use this for 2.53.1, and later versions of ZQuest // See ghost_zh_docs/index.html for documentation. @@ -100,6 +100,9 @@ const int __GH_DEFAULT_IMPRECISION = 2; // ZC version than 2.50.3 RC1. const int __GH_CLEAR_FFC_LINK = 0; +// For ZC Versions where Animation Style (None) does not set ->Tile, enable this. +const int __GH_FIX_255_ANONE = 1; + // Set to 1 to make ghost ffcs Ethereal so that they cannot block // other combo types/flags on the screen. // Added in 2.8.12. The prior versions did not have this. diff --git a/header/ghostYR.zh b/header/ghostYR.zh index c3728c3..0a71e33 100644 --- a/header/ghostYR.zh +++ b/header/ghostYR.zh @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.7 +// Version 2.8.15 // See ghost_zh_docs/index.html for documentation. @@ -41,6 +41,9 @@ const int GH_PREFER_GHOST_ZH_SHADOWS = 0; // 0 = No, 1 = Yes // Top-left corner of a 4x4 block of blank tiles const int GH_BLANK_TILE = 65456; // Min: 0, Max: 65456 +// For ZC Versions where Animation Style (None) does not set ->Tile, enable this. +const int GH_FIX_255_ANONE = 1; + // Invisible combo with no properties set const int GH_INVISIBLE_COMBO = 1; // Min: 1, Max: 65279 diff --git a/header/ghostZHChangelog.txt b/header/ghostZHChangelog.txt index 1833f49..8758b87 100644 --- a/header/ghostZHChangelog.txt +++ b/header/ghostZHChangelog.txt @@ -1,5 +1,19 @@ ghost.zh -Version 2.8.12 +Version 2.8.15 + +2.8.15 + ( 2020-19-APRIL ) +* Added __GH_FIX_255_ANONE to fix issues where the tiles for enemies +* using Animation Style 'None' in 2.55.0 (and possibly in 2.53.1) +* do not have visual bugs. + +2.8.14 + ( 2020-23-MARCH ) + * Added some YuuRand-specific fixes. +2.8.13 + ( 2020-28-JAN ) +* Further optimised AutoGHost, plus tabbing/spacing clean-up. +* Optimised int __AutoGhostParseName() and __IsScriptNameChar() 2.8.12 (2020-27-JAN) diff --git a/header/ghost_zh/2.8/ghost2_common.zh b/header/ghost_zh/2.8/ghost2_common.zh index 0e3aec1..452755a 100644 --- a/header/ghost_zh/2.8/ghost2_common.zh +++ b/header/ghost_zh/2.8/ghost2_common.zh @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.9 +// Version 2.8.15 // Used for DrawGhostFFCs() const int __GHI_DRAW_COMBO = 0; diff --git a/header/ghost_zh/2.8/ghost2_deprecated.zh b/header/ghost_zh/2.8/ghost2_deprecated.zh index e6d4890..98a9674 100644 --- a/header/ghost_zh/2.8/ghost2_deprecated.zh +++ b/header/ghost_zh/2.8/ghost2_deprecated.zh @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.9 +// Version 2.8.15 // The functions and constants in this file are provided only for backward // compatibility. They should not be used in new scripts. diff --git a/header/ghost_zh/2.8/ghost2_drawing.zh b/header/ghost_zh/2.8/ghost2_drawing.zh index 4192d98..003bbca 100644 --- a/header/ghost_zh/2.8/ghost2_drawing.zh +++ b/header/ghost_zh/2.8/ghost2_drawing.zh @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.9 +// Version 2.8.15 int __ghzhDrawData[1000]; diff --git a/header/ghost_zh/2.8/ghost2_eweapon.zh b/header/ghost_zh/2.8/ghost2_eweapon.zh index 95fe312..64e1915 100644 --- a/header/ghost_zh/2.8/ghost2_eweapon.zh +++ b/header/ghost_zh/2.8/ghost2_eweapon.zh @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.9 +// Version 2.8.15 // Arguments to SetEWeaponMovement() const int EWM_SINE_WAVE = 1; diff --git a/header/ghost_zh/2.8/ghost2_eweaponDeath.zh b/header/ghost_zh/2.8/ghost2_eweaponDeath.zh index b1747f6..a52f545 100644 --- a/header/ghost_zh/2.8/ghost2_eweaponDeath.zh +++ b/header/ghost_zh/2.8/ghost2_eweaponDeath.zh @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.9 +// Version 2.8.15 // All the EWeapon death effect functions are in this file. diff --git a/header/ghost_zh/2.8/ghost2_eweaponMovement.zh b/header/ghost_zh/2.8/ghost2_eweaponMovement.zh index 4a3dabf..cd42128 100644 --- a/header/ghost_zh/2.8/ghost2_eweaponMovement.zh +++ b/header/ghost_zh/2.8/ghost2_eweaponMovement.zh @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.12 +// Version 2.8.15 // All the EWeapon movement update functions are in this file. diff --git a/header/ghost_zh/2.8/ghost2_flags.zh b/header/ghost_zh/2.8/ghost2_flags.zh index 44c51f9..5cc87b6 100644 --- a/header/ghost_zh/2.8/ghost2_flags.zh +++ b/header/ghost_zh/2.8/ghost2_flags.zh @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.9 +// Version 2.8.15 // Old flags - 16 bits, can be ORed together const int GHF_KNOCKBACK = 0000000000000001b; diff --git a/header/ghost_zh/2.8/ghost2_global.zh b/header/ghost_zh/2.8/ghost2_global.zh index 2dcff55..adbf6ab 100644 --- a/header/ghost_zh/2.8/ghost2_global.zh +++ b/header/ghost_zh/2.8/ghost2_global.zh @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.12 +// Version 2.8.15 void StartGhostZH() { diff --git a/header/ghost_zh/2.8/ghost2_init.zh b/header/ghost_zh/2.8/ghost2_init.zh index eec4ae9..b3703eb 100644 --- a/header/ghost_zh/2.8/ghost2_init.zh +++ b/header/ghost_zh/2.8/ghost2_init.zh @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.10 +// Version 2.8.15 void Ghost_Init(ffc this, npc ghost) @@ -286,6 +286,10 @@ void __Ghost_InitInternal(ffc this, npc ghost, bool useEnemyPos, int combo, int else ghost->Extend=4; // Disables built-in shadows ghost->OriginalTile=GH_BLANK_TILE; + if ( __GH_FIX_255_ANONE ) + { + ghost->OriginalTile=GH_BLANK_TILE; + } ghost->TileWidth=Ghost_TileWidth; ghost->TileHeight=Ghost_TileHeight; ghost->HitWidth=16*Ghost_TileWidth; diff --git a/header/ghost_zh/2.8/ghost2_modification.zh b/header/ghost_zh/2.8/ghost2_modification.zh index 9aa8e6d..d9c3b88 100644 --- a/header/ghost_zh/2.8/ghost2_modification.zh +++ b/header/ghost_zh/2.8/ghost2_modification.zh @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.9 +// Version 2.8.15 void Ghost_Transform(ffc this, npc ghost, int combo, int cset, int tileWidth, int tileHeight) diff --git a/header/ghost_zh/2.8/ghost2_movement.zh b/header/ghost_zh/2.8/ghost2_movement.zh index c8909c3..d1dcd62 100644 --- a/header/ghost_zh/2.8/ghost2_movement.zh +++ b/header/ghost_zh/2.8/ghost2_movement.zh @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.9 +// Version 2.8.15 void Ghost_MoveXY(float xStep, float yStep, int imprecision) diff --git a/header/ghost_zh/2.8/ghost2_other.zh b/header/ghost_zh/2.8/ghost2_other.zh index 6f9eca6..46e1e78 100644 --- a/header/ghost_zh/2.8/ghost2_other.zh +++ b/header/ghost_zh/2.8/ghost2_other.zh @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.10 +// Version 2.8.15 int FindSpawnPoint(bool landOK, bool wallsOK, bool waterOK, bool pitsOK) diff --git a/header/ghost_zh/2.8/ghost2_scripts.zs b/header/ghost_zh/2.8/ghost2_scripts.zs index ae98b15..6026cf5 100644 --- a/header/ghost_zh/2.8/ghost2_scripts.zs +++ b/header/ghost_zh/2.8/ghost2_scripts.zs @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.9 +// Version 2.8.15 global script GhostZHActiveScript { diff --git a/header/ghost_zh/2.8/ghost2_update.zh b/header/ghost_zh/2.8/ghost2_update.zh index 0f07432..1f6926a 100644 --- a/header/ghost_zh/2.8/ghost2_update.zh +++ b/header/ghost_zh/2.8/ghost2_update.zh @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.9 +// Version 2.8.15 bool Ghost_Waitframe(ffc this, npc ghost, bool clearOnDeath, bool quitOnDeath) diff --git a/header/ghost_zh/2.8/ghost2_updateYR.zh b/header/ghost_zh/2.8/ghost2_updateYR.zh index 8a8f86b..7bb99ae 100644 --- a/header/ghost_zh/2.8/ghost2_updateYR.zh +++ b/header/ghost_zh/2.8/ghost2_updateYR.zh @@ -1,5 +1,5 @@ // ghost.zh -// Version 2.8.8 +// Version 2.8.15 bool Ghost_Waitframe(ffc this, npc ghost, bool clearOnDeath, bool quitOnDeath) diff --git a/header/ghost_zh/2.8/ghost2_yuurand.zh b/header/ghost_zh/2.8/ghost2_yuurand.zh index d53f461..3e4f724 100644 --- a/header/ghost_zh/2.8/ghost2_yuurand.zh +++ b/header/ghost_zh/2.8/ghost2_yuurand.zh @@ -1,4 +1,4 @@ -//Yuurand Functions +//Yuurand Functions v2.8.15 void UpdateGhostZH1_YR() {