diff options
| author | Lars Persson | 2005-06-21 22:08:21 +0000 |
|---|---|---|
| committer | Lars Persson | 2005-06-21 22:08:21 +0000 |
| commit | 1c69696a9a8878971c4fa925b074498dab757857 (patch) | |
| tree | d8f4f2cfea1a3e01bb7f5f5c58fb812d8029ca96 /simon | |
| parent | 4564f0d3bf0d40f5a2ca125df0682969adc8431c (diff) | |
| download | scummvm-rg350-1c69696a9a8878971c4fa925b074498dab757857.tar.gz scummvm-rg350-1c69696a9a8878971c4fa925b074498dab757857.tar.bz2 scummvm-rg350-1c69696a9a8878971c4fa925b074498dab757857.zip | |
Patches needed to build for SYMBIAN32 WINS/GCC added.
Test built for Symbian and run on P910i without any major problems.
Test built for MSVC6. Changed parts seems to compile ok but there are some problems with MSVC6 and some of the targets which the EPOC build does n't support (KYRA,SAGA).
svn-id: r18430
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/debugger.h | 1 | ||||
| -rw-r--r-- | simon/simon.cpp | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/simon/debugger.h b/simon/debugger.h index 975a4489a0..c4e230608e 100644 --- a/simon/debugger.h +++ b/simon/debugger.h @@ -31,6 +31,7 @@ class SimonEngine; class Debugger : public Common::Debugger<Debugger> { public: Debugger(SimonEngine *vm); + virtual ~Debugger() {} // we need this for __SYMBIAN32__ archaic gcc/UIQ protected: SimonEngine *_vm; diff --git a/simon/simon.cpp b/simon/simon.cpp index ccb8ddfc6d..4a998fcc83 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -268,7 +268,7 @@ static const char* bad_versions[3] = { SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) : Engine(syst), midi(syst) { - + int j =0; _vcPtr = 0; _vc_get_out_of_code = 0; _gameOffsetsPtr = 0; @@ -321,11 +321,11 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) if (Common::md5_file(buf, md5sum)) { char md5str[32+1]; - for (int j = 0; j < 16; j++) { + for (j = 0; j < 16; j++) { sprintf(md5str + j*2, "%02x", (int)md5sum[j]); } - for (int j = 0; j < 3; j++) { + for (j = 0; j < 3; j++) { if (!strcmp(md5str, bad_versions[j])) error("Cracked versions aren't supported"); } @@ -1697,6 +1697,7 @@ uint SimonEngine::get_fcs_ptr_3_index(FillOrCopyStruct *fcs) { return i; error("get_fcs_ptr_3_index: not found"); + return 0; } void SimonEngine::lock() { @@ -2280,6 +2281,7 @@ TextLocation *SimonEngine::getTextLocation(uint a) { default: error("text, invalid value %d", a); } + return NULL; } void SimonEngine::o_print_str() { @@ -3040,6 +3042,7 @@ uint SimonEngine::itemPtrToID(Item *id) { if (_itemArrayPtr[i] == id) return i; error("itemPtrToID: not found"); + return 0; } void SimonEngine::o_pathfind(int x, int y, uint var_1, uint var_2) { |