diff options
author | 2010-07-26 10:04:43 +0200 | |
---|---|---|
committer | 2010-07-26 10:04:43 +0200 | |
commit | fe3f99c92a8437a353ba12075d6c3273d04c4e3f (patch) | |
tree | 34d97babbe5696f21779866fafad217b60c2bead /plugins/adplug/adplug/rad.h | |
parent | 4deca01c3a7edaf66374bd35e6fb50d4d9564b17 (diff) |
merged non-android-specific changes from android branch
Diffstat (limited to 'plugins/adplug/adplug/rad.h')
-rw-r--r-- | plugins/adplug/adplug/rad.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/adplug/adplug/rad.h b/plugins/adplug/adplug/rad.h index 07814b8a..f93d28d7 100644 --- a/plugins/adplug/adplug/rad.h +++ b/plugins/adplug/adplug/rad.h @@ -30,13 +30,13 @@ public: : CmodPlayer(newopl) { *desc = '\0'; }; - bool load(const std::string &filename, const CFileProvider &fp); + bool load(const char *filename, const CFileProvider &fp); float getrefresh(); - std::string gettype() - { return std::string("Reality ADlib Tracker"); }; - std::string getdesc() - { return std::string(desc); }; + const char * gettype() + { return "Reality ADlib Tracker"; }; + const char * getdesc() + { return desc; }; private: unsigned char version,radflags; |