Merge pull request #3053 from Ghabry/fix/spritesheet

Picture: Consider spritesheet when calculating the origin

src/game_pictures.cpp

@@ -410,8 +410,8 @@ void Game_Pictures::Picture::ApplyOrigin(bool is_move) {
 		y = data.current_y;
 	}
 
-	double width = sprite->GetWidth();
-	double height = sprite->GetHeight();
+	double width = sprite->GetFrameWidth();
+	double height = sprite->GetFrameHeight();
 
 	switch (origin) {
 		case 1:

src/sprite_picture.cpp

@@ -161,3 +161,31 @@ void Sprite_Picture::Draw(Bitmap& dst) {
 
 	Sprite::Draw(dst);
 }
+
+int Sprite_Picture::GetFrameWidth() const {
+	const auto& pic = Main_Data::game_pictures->GetPicture(pic_id);
+	const auto& data = pic.data;
+
+	auto& bitmap = GetBitmap();
+	assert(bitmap);
+
+	if (feature_spritesheet && pic.NumSpriteSheetFrames() > 1) {
+		return bitmap->GetWidth() / data.spritesheet_cols;
+	} else {
+		return bitmap->GetWidth();
+	}
+}
+
+int Sprite_Picture::GetFrameHeight() const {
+	const auto& pic = Main_Data::game_pictures->GetPicture(pic_id);
+	const auto& data = pic.data;
+
+	auto& bitmap = GetBitmap();
+	assert(bitmap);
+
+	if (feature_spritesheet && pic.NumSpriteSheetFrames() > 1) {
+		return bitmap->GetHeight() / data.spritesheet_rows;
+	} else {
+		return bitmap->GetHeight();
+	}
+}

src/sprite_picture.h

@@ -38,6 +38,12 @@ class Sprite_Picture : public Sprite {
 
 	void OnPictureShow();
 
+	/** @return Width of a single spritesheet frame or the entire width if the picture has no spritesheet */
+	int GetFrameWidth() const;
+
+	/** @return Height of a single spritesheet frame or the entire width if the picture has no spritesheet */
+	int GetFrameHeight() const;
+
 private:
 	int last_spritesheet_frame = -1;
 	const int pic_id = 0;