thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Early in the morning, strrev() looks like a more difficult problem than it

Browse source 
really is. It's actually quite simple. In fact, the only magical thing about
Bob's version was the way it swapped variables without using any temporary
variable. Rewrote the function to use our SWAP() instead, since that actually
makes it readable. Moved it to util.cpp (outside the Common namespace, for
consistency with scumm_stricmp()) since Kirben knew of other places where it
could be used.

svn-id: r28231
This commit is contained in:
Torbjörn Andersson 2007-07-27 05:15:24 +00:00
parent 548a1394e1
commit c2516db9ac
3 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
common/util.cpp
View file

@ -592,3 +592,16 @@ void CDECL warning(const char *s, ...) {
#endif
#endif
}
char *scumm_strrev(char *str) {
if (!str)
return str;
int len = strlen(str);
if (len < 2)
return str;
char *p1, *p2;
for (p1 = str, p2 = str + len - 1; p1 < p2; p1++, p2--) {
SWAP(*p1, *p2);
}
return str;
}

1
common/util.h
View file

@ -289,5 +289,6 @@ void CDECL debugC(int level, uint32 engine_level, const char *s, ...) GCC_PRINTF
extern int gDebugLevel;
char *scumm_strrev(char *str);
#endif

19
engines/drascula/drascula.cpp
View file

@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $UR$
* $URL$
* $Id$
*
*/
@ -29,6 +29,7 @@
#include "common/file.h"
#include "common/savefile.h"
#include "common/config-manager.h"
//#include "common/util.h"
#include "base/plugins.h"
#include "base/version.h"
@ -2080,22 +2081,6 @@ char DrasculaEngine::LimitaVGA(char valor) {
return (valor & 0x3F) * (valor > 0);
}
// Public domain strrev() function by Bob Stout.
// Should perhaps be moved to common/util.cpp or similar.
static char *scumm_strrev(char *str) {
char *p1, *p2;
if (!str || !*str)
return str;
for (p1 = str, p2 = str + strlen(str) - 1; p2 > p1; ++p1, --p2) {
*p1 ^= *p2;
*p2 ^= *p1;
*p1 ^= *p2;
}
return str;
}
void DrasculaEngine::centra_texto(char mensaje[], int x_texto, int y_texto) {
char bb[190], m2[190], m1[190] ,mb[10][40];
char m3[190];