diff options
author | Alexey Yakovenko <wakeroid@gmail.com> | 2010-07-26 10:04:43 +0200 |
---|---|---|
committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-07-26 10:04:43 +0200 |
commit | fe3f99c92a8437a353ba12075d6c3273d04c4e3f (patch) | |
tree | 34d97babbe5696f21779866fafad217b60c2bead /plugins/adplug/adplug/rat.cpp | |
parent | 4deca01c3a7edaf66374bd35e6fb50d4d9564b17 (diff) |
merged non-android-specific changes from android branch
Diffstat (limited to 'plugins/adplug/adplug/rat.cpp')
-rw-r--r-- | plugins/adplug/adplug/rat.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/adplug/adplug/rat.cpp b/plugins/adplug/adplug/rat.cpp index 34f97cb6..c20780fd 100644 --- a/plugins/adplug/adplug/rat.cpp +++ b/plugins/adplug/adplug/rat.cpp @@ -29,7 +29,7 @@ comment : there are bug in original replayer's adlib_init(): wrong frequency registers. */ -#include <cstring> +#include <string.h> #include "rat.h" #include "debug.h" @@ -254,14 +254,14 @@ float CxadratPlayer::xadplayer_getrefresh() return 60.0f; } -std::string CxadratPlayer::xadplayer_gettype() +const char * CxadratPlayer::xadplayer_gettype() { - return (std::string("xad: rat player")); + return "xad: rat player"; } -std::string CxadratPlayer::xadplayer_gettitle() +const char * CxadratPlayer::xadplayer_gettitle() { - return (std::string(rat.hdr.title,32)); + return rat.hdr.title; } unsigned int CxadratPlayer::xadplayer_getinstruments() |