diff options
| author | Paweł Kołodziejski | 2005-01-27 21:34:21 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2005-01-27 21:34:21 +0000 |
| commit | dd2f9da1a84e722d850747756f57cd273d435a7f (patch) | |
| tree | 11699478b344d4944d5d0c7f538ba16c585db834 | |
| parent | c0c9a68fe5d5a61ec53774249e678385aef283ac (diff) | |
| download | scummvm-rg350-dd2f9da1a84e722d850747756f57cd273d435a7f.tar.gz scummvm-rg350-dd2f9da1a84e722d850747756f57cd273d435a7f.tar.bz2 scummvm-rg350-dd2f9da1a84e722d850747756f57cd273d435a7f.zip | |
fix compilation
svn-id: r16651
| -rw-r--r-- | backends/wince/CEActionsPocket.cpp | 6 | ||||
| -rw-r--r-- | backends/wince/portdefs.h | 4 | ||||
| -rw-r--r-- | sky/compact.cpp | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/backends/wince/CEActionsPocket.cpp b/backends/wince/CEActionsPocket.cpp index 42d960d004..2f348208a7 100644 --- a/backends/wince/CEActionsPocket.cpp +++ b/backends/wince/CEActionsPocket.cpp @@ -190,9 +190,9 @@ bool CEActionsPocket::perform(ActionType action, bool pushed) { case POCKET_ACTION_CURSOR: _mainSystem->swap_mouse_visibility(); return true; - case ACTION_FREELOOK: - _mainSystem->swap_freeLook(); - return true; + case POCKET_ACTION_FREELOOK: + _mainSystem->swap_freeLook(); + return true; case POCKET_ACTION_ZOOM_UP: _mainSystem->swap_zoom_up(); return true; diff --git a/backends/wince/portdefs.h b/backends/wince/portdefs.h index c8aba1a0f8..ead2437586 100644 --- a/backends/wince/portdefs.h +++ b/backends/wince/portdefs.h @@ -45,7 +45,6 @@ char *strpbrk(const char *s, const char *accept); void *bsearch(const void *, const void *, size_t, size_t, int (*x) (const void *, const void *)); char *getcwd(char *buf, int size); - #include <windows.h> #include <stdio.h> #include <stdlib.h> @@ -64,4 +63,7 @@ char *getcwd(char *buf, int size); void drawError(char*); +#define vsnprintf _vsnprintf + + #endif diff --git a/sky/compact.cpp b/sky/compact.cpp index 8ceaf2c20a..53671ae296 100644 --- a/sky/compact.cpp +++ b/sky/compact.cpp @@ -184,7 +184,8 @@ SkyCompact::SkyCompact(void) { uint16 *dlincPos = dlincBuf; _cptFile->read(dlincBuf, numDlincs * 2 * sizeof(uint16)); // these compacts don't actually exist but only point to other ones... - for (uint16 cnt = 0; cnt < numDlincs; cnt++) { + uint16 cnt; + for (cnt = 0; cnt < numDlincs; cnt++) { uint16 dlincId = READ_LE_UINT16(dlincPos++); uint16 destId = READ_LE_UINT16(dlincPos++); assert(((dlincId >> 12) < _numDataLists) && ((dlincId & 0xFFF) < _dataListLen[dlincId >> 12]) && (_compacts[dlincId >> 12][dlincId & 0xFFF] == NULL)); @@ -219,7 +220,7 @@ SkyCompact::SkyCompact(void) { _numSaveIds = _cptFile->readUint16LE(); _saveIds = (uint16*)malloc(_numSaveIds * sizeof(uint16)); _cptFile->read(_saveIds, _numSaveIds * sizeof(uint16)); - for (uint16 cnt = 0; cnt < _numSaveIds; cnt++) + for (cnt = 0; cnt < _numSaveIds; cnt++) _saveIds[cnt] = FROM_LE_16(_saveIds[cnt]); _resetDataPos = _cptFile->pos(); } |