summaryrefslogtreecommitdiff
path: root/library/resource.cpp
Unidiff
Diffstat (limited to 'library/resource.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--library/resource.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/library/resource.cpp b/library/resource.cpp
index dc19880..0915c45 100644
--- a/library/resource.cpp
+++ b/library/resource.cpp
@@ -68,7 +68,7 @@ QBitmap Resource::loadBitmap( const QString &pix )
68 68
69/*! 69/*!
70 Returns the filename of a pixmap named \a pix. You should avoid including 70 Returns the filename of a pixmap named \a pix. You should avoid including
71 any filename type extension (eg. .png, .xpm). 71 any filename type extension (eg. .png, .xpm .jpg .jpeg).
72 72
73 Normally you will use loadPixmap() rather than this function. 73 Normally you will use loadPixmap() rather than this function.
74*/ 74*/
@@ -78,6 +78,10 @@ QString Resource::findPixmap( const QString &pix )
78 78
79 if ( QFile( picsPath + pix + ".png").exists() ) 79 if ( QFile( picsPath + pix + ".png").exists() )
80 return picsPath + pix + ".png"; 80 return picsPath + pix + ".png";
81 else if ( QFile( picsPath + pix + ".jpeg").exists() )
82 return picsPath + pix + ".jpeg";
83 else if ( QFile( picsPath + pix + ".jpg").exists() )
84 return picsPath + pix + ".jpg";
81 else if ( QFile( picsPath + pix + ".xpm").exists() ) 85 else if ( QFile( picsPath + pix + ".xpm").exists() )
82 return picsPath + pix + ".xpm"; 86 return picsPath + pix + ".xpm";
83 else if ( QFile( picsPath + pix ).exists() ) 87 else if ( QFile( picsPath + pix ).exists() )
@@ -117,7 +121,7 @@ QStringList Resource::allSounds()
117 121
118/*! 122/*!
119 Returns the QImage named \a name. You should avoid including 123 Returns the QImage named \a name. You should avoid including
120 any filename type extension (eg. .png, .xpm). 124 any filename type extension (eg. .png, .xpm .jpg).
121*/ 125*/
122QImage Resource::loadImage( const QString &name) 126QImage Resource::loadImage( const QString &name)
123{ 127{