diff --git a/Build/Sprites/Action.png b/Build/Sprites/Action.png index 146bf95b60c91c4c621338525331f82f17d42112..69de8009306d48e57574e8b45c5d19ac64d3b3fa 100755 Binary files a/Build/Sprites/Action.png and b/Build/Sprites/Action.png differ diff --git a/Build/Sprites/Actor.png b/Build/Sprites/Actor.png index 41b8da1a116b30a873f3bce71475fd669c4a0ce1..e38d35c15cb5f1eff0f2338f75e7e5883650a518 100755 Binary files a/Build/Sprites/Actor.png and b/Build/Sprites/Actor.png differ diff --git a/Build/Sprites/ActorMover.png b/Build/Sprites/ActorMover.png index 48df6e9b660a3009bae29ad8acd2deb3699f277a..dc831b99b9b8b01901f53fb8a802a51d2b6fc74d 100755 Binary files a/Build/Sprites/ActorMover.png and b/Build/Sprites/ActorMover.png differ diff --git a/Build/Sprites/Anchor.png b/Build/Sprites/Anchor.png index 3367cd022bff43b445d18ef37897c5b6a2e7070e..41964348c3416c4638e3dee20cb7aacef15d6c70 100755 Binary files a/Build/Sprites/Anchor.png and b/Build/Sprites/Anchor.png differ diff --git a/Build/Sprites/Arrow.png b/Build/Sprites/Arrow.png index e7e97e86ff9d194a516ea2d49c0de7bcd8896326..5d2bb8eed26663a4258d61f9daf252b641fbbd9a 100755 Binary files a/Build/Sprites/Arrow.png and b/Build/Sprites/Arrow.png differ diff --git a/Build/Sprites/Bridge.png b/Build/Sprites/Bridge.png index 73afdf576bbf628813597492bf3d3193cd050906..5f69e2236a216b9bef88ae00f614fe320c20ade5 100755 Binary files a/Build/Sprites/Bridge.png and b/Build/Sprites/Bridge.png differ diff --git a/Build/Sprites/Camera.png b/Build/Sprites/Camera.png index 6a54317295ca9dff462173026c4f070e90ef797c..f6d5411ec2666d4e28770574f738d8b6dc783a05 100755 Binary files a/Build/Sprites/Camera.png and b/Build/Sprites/Camera.png differ diff --git a/Build/Sprites/Decal.png b/Build/Sprites/Decal.png index 139de294da4a9d18d1257bab31ef49247ad6dfad..ea41df8d002cc1b5915a17bea33c62d3695ac2c5 100755 Binary files a/Build/Sprites/Decal.png and b/Build/Sprites/Decal.png differ diff --git a/Build/Sprites/DeepWater.png b/Build/Sprites/DeepWater.png index 091c4fdb1ca87dac9ee8e4a94a982e7c07fecda8..fb73630f8be3538b5ca895cbf332488cb60bc1a3 100755 Binary files a/Build/Sprites/DeepWater.png and b/Build/Sprites/DeepWater.png differ diff --git a/Build/Sprites/InterpolationPoint.png b/Build/Sprites/InterpolationPoint.png index f08167969f5ec56282c544eec71c9ee770b8bd7e..1d4c2a16d7f209686f3408559b3ba6a50aa95a31 100755 Binary files a/Build/Sprites/InterpolationPoint.png and b/Build/Sprites/InterpolationPoint.png differ diff --git a/Build/Sprites/InterpolationSpecial.png b/Build/Sprites/InterpolationSpecial.png index a2c2d71b92fbf732b3db34b4270b5a521f35f48f..bdcb108af43a85e31eaf620fabb64a3def07b937 100755 Binary files a/Build/Sprites/InterpolationSpecial.png and b/Build/Sprites/InterpolationSpecial.png differ diff --git a/Build/Sprites/Light.png b/Build/Sprites/Light.png index 01d2313f9e8b936eee8bf4991ace6c79c7cb5cd5..6359c27ccb949bf56f7b36c5f1185c6549c1bc25 100755 Binary files a/Build/Sprites/Light.png and b/Build/Sprites/Light.png differ diff --git a/Build/Sprites/MapSpot.png b/Build/Sprites/MapSpot.png index b711f6a710149229afb6a759a0dc0ece95540217..cb183d36c99826a31d58c3ff22c0cfe01d97407a 100755 Binary files a/Build/Sprites/MapSpot.png and b/Build/Sprites/MapSpot.png differ diff --git a/Build/Sprites/MapSpotGravity.png b/Build/Sprites/MapSpotGravity.png index 3055fa8ad1ba86815fc3ef2f9b987ff4e90df1c9..ac4aa93a69c72dd43f20f44dc448e4f0740af9e7 100755 Binary files a/Build/Sprites/MapSpotGravity.png and b/Build/Sprites/MapSpotGravity.png differ diff --git a/Build/Sprites/PathFollower.png b/Build/Sprites/PathFollower.png index 361cebb815814b7c0d192e5b6c2a5ded0612ab07..081e99a153f92796d46b69da39b86cea2eac53a5 100755 Binary files a/Build/Sprites/PathFollower.png and b/Build/Sprites/PathFollower.png differ diff --git a/Build/Sprites/PointPuller.png b/Build/Sprites/PointPuller.png index 60a2c03daa5b096f056fad4882a291802d666365..9314ec1d1d150130d2360e9e6caa87308bc4d721 100755 Binary files a/Build/Sprites/PointPuller.png and b/Build/Sprites/PointPuller.png differ diff --git a/Build/Sprites/PointPusher.png b/Build/Sprites/PointPusher.png index 55bec889a5f1f2289ce5226d8e2160a5fdf0e74f..4e880838d67eb7f81c090eb47114d765e2f55247 100755 Binary files a/Build/Sprites/PointPusher.png and b/Build/Sprites/PointPusher.png differ diff --git a/Build/Sprites/Portal_lower.png b/Build/Sprites/Portal_lower.png index e4874a122bcc3ee3af09a7cdd28bb8ed7a79e055..56b84f80ecd5a24246fd53f83dc91f962154b498 100755 Binary files a/Build/Sprites/Portal_lower.png and b/Build/Sprites/Portal_lower.png differ diff --git a/Build/Sprites/Portal_upper.png b/Build/Sprites/Portal_upper.png index 4d5293d60ac4509ad52a4d808f75e323bc08f3cb..a59559d01132ec5afbb7cbc054436d1babff2fd8 100755 Binary files a/Build/Sprites/Portal_upper.png and b/Build/Sprites/Portal_upper.png differ diff --git a/Build/Sprites/Secret.png b/Build/Sprites/Secret.png index f2bb04d44cc91984a0c8e41840d50331108ab504..b197eca1df340d38dfff0ad369b13e755d8b2f7a 100755 Binary files a/Build/Sprites/Secret.png and b/Build/Sprites/Secret.png differ diff --git a/Build/Sprites/SilentSector.png b/Build/Sprites/SilentSector.png index e7594bbf9cb6c85ef47a0cb097e6efdf225fcdbf..ef1179002083a3e55f46a030391d41dc0becc494 100755 Binary files a/Build/Sprites/SilentSector.png and b/Build/Sprites/SilentSector.png differ diff --git a/Build/Sprites/SkyboxPicker.png b/Build/Sprites/SkyboxPicker.png index e6890655efdf9ddfd9ec72146b624520870f8ccb..5bf8074808711cfb8a1b47cc4a0fab593f178693 100755 Binary files a/Build/Sprites/SkyboxPicker.png and b/Build/Sprites/SkyboxPicker.png differ diff --git a/Build/Sprites/SkyboxViewpoint.png b/Build/Sprites/SkyboxViewpoint.png index f3d530429958257cc448c54f989db911e624d2c3..cb0eddf80f6008afd414951979a399ab94b2a7ee 100755 Binary files a/Build/Sprites/SkyboxViewpoint.png and b/Build/Sprites/SkyboxViewpoint.png differ diff --git a/Build/Sprites/Slope.png b/Build/Sprites/Slope.png index b0ac54679969186e8f7bb7e381d393ceab50a603..df6edaa1387c43e7500cf4387c5e71f7280fd044 100755 Binary files a/Build/Sprites/Slope.png and b/Build/Sprites/Slope.png differ diff --git a/Build/Sprites/Sound.png b/Build/Sprites/Sound.png index 1c30b955b84dbaa4df811afe4763ba7f9649339f..69dec35b19ea53b14e1cae53a5cdc0f4f67d29ab 100755 Binary files a/Build/Sprites/Sound.png and b/Build/Sprites/Sound.png differ diff --git a/Build/Sprites/Sparkle.png b/Build/Sprites/Sparkle.png index 3903be5b17c357a652377d3adec75037ef7b0d94..0c6a739ab8fbbdf162f234e6312c7da0e3c61bb2 100755 Binary files a/Build/Sprites/Sparkle.png and b/Build/Sprites/Sparkle.png differ diff --git a/Build/Sprites/Target.png b/Build/Sprites/Target.png index 1637d171c20c0a40831ccd4b5583f209b67dbb39..9b3459d8f1462551979390834e050d088bb16d90 100755 Binary files a/Build/Sprites/Target.png and b/Build/Sprites/Target.png differ diff --git a/Build/Sprites/Teleport.png b/Build/Sprites/Teleport.png index c7c0375c41afc99b0abf41aca7d04d7b84bf9afe..9c4af79314d0082a8bf375b18a50f391c3363947 100755 Binary files a/Build/Sprites/Teleport.png and b/Build/Sprites/Teleport.png differ diff --git a/Build/Sprites/ZDDomPointA.png b/Build/Sprites/ZDDomPointA.png index a5728ead4cbaa88869cd7b210f797b392bf892e9..124412bcd7a866ab1492b238b0166176d3820adb 100755 Binary files a/Build/Sprites/ZDDomPointA.png and b/Build/Sprites/ZDDomPointA.png differ diff --git a/Build/Sprites/ZDDomPointB.png b/Build/Sprites/ZDDomPointB.png index 58a4664f70925e945f6f029a001d7e5c16ee117f..ac16cb38e80f11ea305770a5af65ea434e92cdcf 100755 Binary files a/Build/Sprites/ZDDomPointB.png and b/Build/Sprites/ZDDomPointB.png differ diff --git a/Build/Sprites/ZDDomPointC.png b/Build/Sprites/ZDDomPointC.png index fb317737f5d526cf43b13af382cd370d636aeb57..d2af1f5de5ec265c940b37bbb533b6c4f090c7a2 100755 Binary files a/Build/Sprites/ZDDomPointC.png and b/Build/Sprites/ZDDomPointC.png differ diff --git a/Build/Sprites/ZandFlagBlue.png b/Build/Sprites/ZandFlagBlue.png index 0a5d993e014f42bd0c0d36f107df9fa9a3508996..b0986603d828a9ea51ec3cbd639c48eebab63557 100755 Binary files a/Build/Sprites/ZandFlagBlue.png and b/Build/Sprites/ZandFlagBlue.png differ diff --git a/Build/Sprites/ZandFlagGold.png b/Build/Sprites/ZandFlagGold.png index d53364393eed084aa2af1f920967962aef883509..270fbecd2b7d0428a36f1df55daa51697c0c55e2 100755 Binary files a/Build/Sprites/ZandFlagGold.png and b/Build/Sprites/ZandFlagGold.png differ diff --git a/Build/Sprites/ZandFlagGreen.png b/Build/Sprites/ZandFlagGreen.png index 45815c18ec3645a0e594035c985a3d1dbe1d76d8..e05e5b1f98fb30779ad301cd18f0cfd571ff3923 100755 Binary files a/Build/Sprites/ZandFlagGreen.png and b/Build/Sprites/ZandFlagGreen.png differ diff --git a/Build/Sprites/ZandFlagRed.png b/Build/Sprites/ZandFlagRed.png index 27bd2e87e58a77d5e4e71d21408d0f96c6dd8e9b..9bc588db37ab6ad0afc95eeeb6d7c7f353a99cef 100755 Binary files a/Build/Sprites/ZandFlagRed.png and b/Build/Sprites/ZandFlagRed.png differ diff --git a/Build/Sprites/ZandFlagWhite.png b/Build/Sprites/ZandFlagWhite.png index c12a857e3acb3696c83454baf921e204e936e04a..2474cc5241e06cae14f081bd03b08e115de3b347 100755 Binary files a/Build/Sprites/ZandFlagWhite.png and b/Build/Sprites/ZandFlagWhite.png differ diff --git a/Build/Sprites/ZandRuneDrain.png b/Build/Sprites/ZandRuneDrain.png index 52336d0054e7facf7703f4b3d9bd9ca2b6770d1b..52a79e734a9813aef7f7ae7a9815ce28fc594c03 100755 Binary files a/Build/Sprites/ZandRuneDrain.png and b/Build/Sprites/ZandRuneDrain.png differ diff --git a/Build/Sprites/ZandRuneHaste.png b/Build/Sprites/ZandRuneHaste.png index 542961288d28490f18738c80a8347d298ee034a5..d59b3ef57492f589af7d23c2793836479989ae2d 100755 Binary files a/Build/Sprites/ZandRuneHaste.png and b/Build/Sprites/ZandRuneHaste.png differ diff --git a/Build/Sprites/ZandRuneHighJump.png b/Build/Sprites/ZandRuneHighJump.png index 66263d1ac8f01eae7a57c6fda606c984022dcf13..92038f531dccba39948bdc5a6f0dd35b7020a009 100755 Binary files a/Build/Sprites/ZandRuneHighJump.png and b/Build/Sprites/ZandRuneHighJump.png differ diff --git a/Build/Sprites/ZandRuneProsperity.png b/Build/Sprites/ZandRuneProsperity.png index 9f5f6e23cc630b15c1739804c467447964100034..7e414ca11123115e4c8a9c78000ee0ced585beb9 100755 Binary files a/Build/Sprites/ZandRuneProsperity.png and b/Build/Sprites/ZandRuneProsperity.png differ diff --git a/Build/Sprites/ZandRuneRage.png b/Build/Sprites/ZandRuneRage.png index 409c397fdc536d7c2a449c5a194cd94656602b64..64e55813cf7a8bd27e97f8468fa78dfe05d2d10a 100755 Binary files a/Build/Sprites/ZandRuneRage.png and b/Build/Sprites/ZandRuneRage.png differ diff --git a/Build/Sprites/ZandRuneReflection.png b/Build/Sprites/ZandRuneReflection.png index ec662f13d3cd05ee8a2f64e508791255ae257963..8b787b4593039e498d22c9a1c7d95237570a05f8 100755 Binary files a/Build/Sprites/ZandRuneReflection.png and b/Build/Sprites/ZandRuneReflection.png differ diff --git a/Build/Sprites/ZandRuneRegeneration.png b/Build/Sprites/ZandRuneRegeneration.png index 5c99fe6c8200be54c8babcd62b7b9150a2d2068a..16cec525e6469f6dbb3cb345385f4e9e7adae8f7 100755 Binary files a/Build/Sprites/ZandRuneRegeneration.png and b/Build/Sprites/ZandRuneRegeneration.png differ diff --git a/Build/Sprites/ZandRuneResistance.png b/Build/Sprites/ZandRuneResistance.png index 55a50a3dbfebe4868cfd47572b78e1142a3c55f8..5fd892a4013d0c312118acec45348e601268e020 100755 Binary files a/Build/Sprites/ZandRuneResistance.png and b/Build/Sprites/ZandRuneResistance.png differ diff --git a/Build/Sprites/ZandRuneSpread.png b/Build/Sprites/ZandRuneSpread.png index e7de298da3c6c08aa04af569d301f98a73e5b87c..8315e61818b0e5f566344e95859cedf73faf01b8 100755 Binary files a/Build/Sprites/ZandRuneSpread.png and b/Build/Sprites/ZandRuneSpread.png differ diff --git a/Build/Sprites/ZandRuneStrength.png b/Build/Sprites/ZandRuneStrength.png index f5b0e476b46991cfe5a76f845a0a711460670c20..4bb76f2c3271e1bbe597a06de150d5a4183b657f 100755 Binary files a/Build/Sprites/ZandRuneStrength.png and b/Build/Sprites/ZandRuneStrength.png differ diff --git a/Build/Sprites/Zone.png b/Build/Sprites/Zone.png index 3d60661ba0824b8ba094c526986658df1aa89ce1..061ede059607dcc2ce76b6c0a7e6f2679e13ce63 100755 Binary files a/Build/Sprites/Zone.png and b/Build/Sprites/Zone.png differ diff --git a/Source/Core/Data/FileImage.cs b/Source/Core/Data/FileImage.cs index a4e3e40cf0b8d7dde9c64a70912474de9eda80d8..bff37bf44f8b01762afb57a010402fb4354dc2a7 100755 --- a/Source/Core/Data/FileImage.cs +++ b/Source/Core/Data/FileImage.cs @@ -160,7 +160,7 @@ namespace CodeImp.DoomBuilder.Data if (filedata != null) { // Get a reader for the data - bitmap = ImageDataFormat.TryLoadImage(filedata, probableformat, General.Map.Data.Palette); + bitmap = ImageDataFormat.TryLoadImage(filedata, probableformat, General.Map.Data.Palette, out offsetx, out offsety); // Not loaded? if (bitmap == null) diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs index 40e096d44bc3cebfe9010614316da9f7506edd40..bc8ad645e6f19e9829512684b1acebb902a9ef56 100755 --- a/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs +++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs @@ -322,8 +322,8 @@ namespace CodeImp.DoomBuilder.BuilderModes // Determine sprite size and offset float radius = sprite.ScaledWidth * 0.5f; float height = sprite.ScaledHeight; - offsets.x = radius - sprite.OffsetX; - offsets.y = sprite.OffsetY - height; + offsets.x = radius - (sprite.OffsetX == int.MinValue ? 0 : sprite.OffsetX); + offsets.y = (sprite.OffsetY == int.MinValue ? 0 : sprite.OffsetY) - height; // Scale by thing type/actor scale // We do this after the offset x/y determination above, because that is entirely in sprite pixels space