summaryrefslogtreecommitdiffstats
path: root/twin4
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-02-19 19:50:33 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-02-19 19:50:33 +0100
commit7136d780c36ef29ea9144610e06c1a5ba21578b5 (patch)
treee8247759ef9d3fe64b02ed898e48044d3904da96 /twin4
parent7b7b75a2244d3130fa8b0c64fba568fc9898dada (diff)
downloadtdegames-7136d780c36ef29ea9144610e06c1a5ba21578b5.tar.gz
tdegames-7136d780c36ef29ea9144610e06c1a5ba21578b5.zip
Fix unintended rename of mask*
Diffstat (limited to 'twin4')
-rw-r--r--twin4/twin4/kspritecache.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/twin4/twin4/kspritecache.cpp b/twin4/twin4/kspritecache.cpp
index 7068c90b..56d0ba65 100644
--- a/twin4/twin4/kspritecache.cpp
+++ b/twin4/twin4/kspritecache.cpp
@@ -221,7 +221,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(TDEConfig *config,TQString
//kdDebug(11002) << " Reading " << number << " frames " << endl;
TQString pixfile=config->readPathEntry(name+"file");
- TQString mastdefile=config->readPathEntry(name+"mask");
+ TQString maskfile=config->readPathEntry(name+"mask");
// Load a given set of images or replace a %d by a sequence if there are
// less image names than number given
@@ -232,7 +232,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(TDEConfig *config,TQString
{
TQString tmpfile,tmpmask;
tmpfile.sprintf(pixfile.latin1(),i);
- tmpmask.sprintf(mastdefile.latin1(),i);
+ tmpmask.sprintf(maskfile.latin1(),i);
pixmap=loadPixmap(tmpfile,tmpmask);
if (!pixmap) kdError() << "Could not create pixmap="<<tmpfile << " with mask " << tmpmask << endl;
@@ -255,9 +255,9 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(TDEConfig *config,TQString
double step;
if (number>1) step=(100.0-finalscale)/100.0/(double)(number-1);
else step=1.0;
- //kdDebug(11002) << " Scaling " << number << " pics axis="<<axis<<" final="<<finalscale<<" file="<<pixfile<< " mask="<<mastdefile<<endl;
+ //kdDebug(11002) << " Scaling " << number << " pics axis="<<axis<<" final="<<finalscale<<" file="<<pixfile<< " mask="<<maskfile<<endl;
- pixmap=loadPixmap(pixfile,mastdefile);
+ pixmap=loadPixmap(pixfile,maskfile);
for (unsigned int j=0;j<(unsigned int)number;j++)
{
TQWMatrix matrix;