From a39711e25670b366ed76534cc926ac70ea6c1edd Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 31 Aug 2002 13:29:10 +0000 Subject: fixed compilation on Mac OS X; some cleanup; moved header file scumm/smusH/rect.h to common/rect.h svn-id: r4877 --- common/config-file.cpp | 13 ++++++ common/engine.h | 12 ++++++ common/file.cpp | 44 +++++++++----------- common/gameDetector.cpp | 9 +++-- common/gameDetector.h | 2 +- common/main.cpp | 4 +- common/rect.h | 104 ++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 156 insertions(+), 32 deletions(-) create mode 100644 common/rect.h (limited to 'common') diff --git a/common/config-file.cpp b/common/config-file.cpp index b56630f5c5..17b9fb2b4f 100644 --- a/common/config-file.cpp +++ b/common/config-file.cpp @@ -30,6 +30,19 @@ #define xfree(p) {if (p) free(p);} +#ifdef NEED_STRDUP +char *strdup(const char *s) { + if (s) { + int len = strlen(s) + 1; + char *d = (char *)malloc(len); + if (d) + memcpy(d, s, len); + return d; + } + return NULL; +} +#endif /* NEED_STRDUP */ + static char *ltrim(char *t) { diff --git a/common/engine.h b/common/engine.h index 6241d70a7f..8ca47dd17e 100644 --- a/common/engine.h +++ b/common/engine.h @@ -56,5 +56,17 @@ public: static Engine *createFromDetector(GameDetector *detector, OSystem *syst); }; +#if defined(__GNUC__) +void CDECL error(const char *s, ...) NORETURN; +#else +void CDECL NORETURN error(const char *s, ...); +#endif + +void CDECL warning(const char *s, ...); + +void CDECL debug(int level, const char *s, ...); +void checkHeap(); + #endif + diff --git a/common/file.cpp b/common/file.cpp index a5c1608210..faa09dde1e 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -21,19 +21,6 @@ #include "file.h" -#ifdef NEED_STRDUP -char *strdup(const char *s) { - if (s) { - int len = strlen(s) + 1; - char *d = (char *)malloc(len); - if (d) - memcpy(d, s, len); - return d; - } - return NULL; -} -#endif /* NEED_STRDUP */ - File::File() { _handle = NULL; _readFailed = false; @@ -45,28 +32,35 @@ File::~File() { } bool File::open(const char *filename, int mode, byte encbyte) { - char * buf; + char buf[256], *ptr; if (_handle) { debug(2, "File %s already opened", filename); return false; } clearReadFailed(); - buf = strdup(filename); + strcpy(buf, filename); if (mode == 1) { _handle = fopen(buf, "rb"); if (_handle == NULL) { - _handle = fopen(strupr(buf), "rb"); - if (_handle == NULL) { - _handle = fopen(strlwr(buf), "rb"); - } - else { - debug(2, "File %s not found", filename); - return false; - } + ptr = buf; + do + *ptr++ = toupper(*ptr); + while (*ptr); + _handle = fopen(buf, "rb"); } - } - else { + if (_handle == NULL) { + ptr = buf; + do + *ptr++ = tolower(*ptr); + while (*ptr); + _handle = fopen(buf, "rb"); + } + if (_handle == NULL) { + debug(2, "File %s not found", filename); + return false; + } + } else { warning("Only read mode supported!"); return false; } diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp index 581767c58d..237dbf663f 100644 --- a/common/gameDetector.cpp +++ b/common/gameDetector.cpp @@ -29,6 +29,9 @@ #include "common/config-file.h" +extern uint16 _debugLevel; + + #define CHECK_OPTION() if ((current_option != NULL) || (*s != '\0')) goto ShowHelpAndExit #define HANDLE_OPTION() if ((*s == '\0') && (current_option == NULL)) goto ShowHelpAndExit; \ if ((*s != '\0') && (current_option != NULL)) goto ShowHelpAndExit; \ @@ -450,14 +453,14 @@ bool GameDetector::detectGame() return true; } -char *GameDetector::getGameName() +const char *GameDetector::getGameName() { if (_gameText == NULL) { char buf[256]; sprintf(buf, "Unknown game: \"%s\"", _exe_name); - return strdup(buf); + _gameText = strdup(buf); } - return strdup(_gameText); + return _gameText; } int GameDetector::detectMain(int argc, char **argv) diff --git a/common/gameDetector.h b/common/gameDetector.h index 4cbfa3453f..6393440863 100644 --- a/common/gameDetector.h +++ b/common/gameDetector.h @@ -31,7 +31,7 @@ public: int detectMain(int argc, char **argv); void parseCommandLine(int argc, char **argv); bool detectGame(void); - char *getGameName(void); + const char *getGameName(void); bool _fullScreen; byte _gameId; diff --git a/common/main.cpp b/common/main.cpp index 43fd2e4563..9a43a58212 100644 --- a/common/main.cpp +++ b/common/main.cpp @@ -130,12 +130,10 @@ int main(int argc, char *argv[]) OSystem *system = detector.createSystem(); { - char *s = detector.getGameName(); OSystem::Property prop; - prop.caption = s; + prop.caption = detector.getGameName(); system->property(OSystem::PROP_SET_WINDOW_CAPTION, &prop); - free(s); } // Create the game engine diff --git a/common/rect.h b/common/rect.h new file mode 100644 index 0000000000..0dbc8ab6b6 --- /dev/null +++ b/common/rect.h @@ -0,0 +1,104 @@ +/* ScummVM - Scumm Interpreter + * Copyright (C) 2001/2002 The ScummVM project + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Header$ + * + */ + +#ifndef COMMON_RECT_H +#define COMMON_RECT_H + +#include "scummsys.h" + +namespace ScummVM { + +/*! @brief simple class for handling both 2D position and size + + This small class is an helper for position and size values. +*/ +class Point { + friend class Rect; +private: + int32 _x; //!< The horizontal part of the point + int32 _y; //!< The vertical part of the point +public: + Point() : _x(0), _y(0) {}; + Point(const Point & p) : _x(p._x), _y(p._y) {}; + explicit Point(int32 x, int32 y) : _x(x), _y(y) {}; + Point & operator=(const Point & p) { _x = p._x; _y = p._y; return *this; }; + bool operator==(const Point & p) const { return _x == p._x && _y == p._y; }; + const int32 & getX() const { return _x; }; + const int32 & getY() const { return _y; }; + int32 & getX() { return _x; }; + int32 & getY() { return _y; }; + Point operator+(const Point & p) const { return Point(_x + p._x, _y+p._y); }; + Point operator-(const Point & p) const { return Point(_x - p._x, _y-p._y); }; + Point & operator+=(const Point & p) { _x += p._x; _y += p._y; return *this; }; + Point & operator-=(const Point & p) { _x -= p._x; _y -= p._y; return *this; }; + bool isOrigin() const { return _x == 0 && _y == 0; }; + void set(int32 x, int32 y) { _x = x; _y = y; } +}; + +/*! @brief simple class for handling a rectangular zone. + + This small class is an helper for rectangles. + It is mostly used by the blitter class. +*/ +class Rect { +private: + Point _topLeft; //!< The point at the top left of the rectangle + Point _bottomRight; //!< The point at the bottom right of the rectangle +public: + Rect() : _topLeft(0, 0), _bottomRight(0,0) {} + Rect(int32 x, int32 y) : _topLeft(0, 0), _bottomRight(x, y) {} + Rect(int32 x1, int32 y1, int32 x2, int32 y2) : _topLeft(x1, y1), _bottomRight(x2, y2) {} + Point size() const { return (_bottomRight - _topLeft); }; + int32 width() const { return size()._x; } + int32 height() const { return size()._y; } + int32 left() const { return _topLeft._x; } + int32 right() const { return _bottomRight._x; } + int32 top() const { return _topLeft._y; } + int32 bottom() const { return _bottomRight._y; } + const Point & topLeft() const { return _topLeft; } + const Point & bottomRight() const { return _bottomRight; } + + /*! @brief check if given position is inside the rectangle + + @param x the horizontal position to check + @param y the vertical position to check + + @return true if the given position is inside the rectangle, false otherwise + */ + bool isInside(int32 x, int32 y) const { + return (_topLeft._x <= x) && (_bottomRight._x > x) && (_topLeft._y <= y) && (_bottomRight._y > y); + } + /*! @brief check if given point is inside the rectangle + + @param p the point to check + + @return true if the given point is inside the rectangle, false otherwise + */ + bool isInside(const Point & p) const { + return (_topLeft._x <= p._x) && (_bottomRight._x > p._x) && (_topLeft._y <= p._y) && (_bottomRight._y > p._y); + } + + bool clip(Rect & r) const; +}; + +}; // End of namespace ScummVM + +#endif -- cgit v1.2.3