• R/O
  • SSH
  • HTTPS

project200805us: 提交


Commit MetaInfo

修订版3208 (tree)
时间2017-01-06 04:16:28
作者hogepiyo

Log Message

sprite id

更改概述

差异

--- DXProject/HPLDXLib/src/AbstractDXStaticData.h (revision 3207)
+++ DXProject/HPLDXLib/src/AbstractDXStaticData.h (revision 3208)
@@ -53,7 +53,6 @@
5353 * @param[in] nImageInformation //!
5454 */
5555 int getImageHandle( int nSpriteType, int nSequenceIndex, int nImageInformationIndex = -1 );
56-
5756 public:
5857 /** 即座にマップ切替をする準備。
5958 * これを実施後にchangeImmediately()を実行
--- DXProject/HPLDXLib/src/HPLDXImageSetContainer.cpp (revision 3207)
+++ DXProject/HPLDXLib/src/HPLDXImageSetContainer.cpp (revision 3208)
@@ -428,6 +428,7 @@
428428 //int nWidth = 0;
429429 //int nHeight = 0;
430430 int nPerLine = 10;
431+ bool bIsCombined = nSeqType == HPL::SeqLoadType::COMBINED;
431432
432433 for( int i = 0; i < MAX_FRAMES; i ++ ) {
433434
@@ -497,7 +498,7 @@
497498 HPLImageInformation info = this->createImageInformation(
498499 nIndex, atoi(vecFrames.at(i).c_str()),
499500 rSrcRect );
500- if( nCombinedImageIndex >= 0 && nPerLine > 0 ) {
501+ if (bIsCombined && nCombinedImageIndex >= 0 && nPerLine > 0) {
501502 rSrcRect.setLeftTop( i % nPerLine * rSrcRect.getWidth(),
502503 i / nPerLine * rSrcRect.getHeight());
503504 }
Show on old repository browser