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

Change PalmOS ident

Browse source 
svn-id: r18748
This commit is contained in:
Chris Apers 2005-09-03 16:24:58 +00:00
parent 1d6ecabfbe
commit be9d8951eb
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
backends/fs/palmos/palmos-fs.cpp
View file

@ -18,10 +18,10 @@
* $Header$ * $Header$
*/ */
#if defined(__PALMOS_TRAPS__) #if defined(PALMOS_MODE)
#include "common/stdafx.h" #include "common/stdafx.h"
#include "../fs.h" #include "fs/fs.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -36,7 +36,7 @@ protected:
bool _isValid; bool _isValid;
bool _isPseudoRoot; bool _isPseudoRoot;
String _path; String _path;
public: public:
PalmOSFilesystemNode(); PalmOSFilesystemNode();
PalmOSFilesystemNode(const Char *path); PalmOSFilesystemNode(const Char *path);
@ -71,7 +71,7 @@ void PalmOSFilesystemNode::addFile(FSList &list, ListMode mode, const char *base
if (entry._isDirectory) if (entry._isDirectory)
entry._path += "/"; entry._path += "/";
entry._isValid = true; entry._isValid = true;
entry._isPseudoRoot = false; entry._isPseudoRoot = false;
list.push_back(wrap(new PalmOSFilesystemNode(&entry))); list.push_back(wrap(new PalmOSFilesystemNode(&entry)));
} }
@ -107,11 +107,11 @@ FSList PalmOSFilesystemNode::listDir(ListMode mode) const {
desc.nameP = nameP; desc.nameP = nameP;
desc.nameBufLen = 256; desc.nameBufLen = 256;
e = VFSFileOpen(gVars->volRefNum, _path.c_str(), vfsModeRead, &handle); e = VFSFileOpen(gVars->VFS.volRefNum, _path.c_str(), vfsModeRead, &handle);
if (e) if (e)
return myList; return myList;
while(dirIterator != expIteratorStop) { while(dirIterator != expIteratorStop) {
e = VFSDirEntryEnumerate(handle, &dirIterator, &desc); e = VFSDirEntryEnumerate(handle, &dirIterator, &desc);
if (!e) { if (!e) {
@ -137,11 +137,11 @@ const char *lastPathComponent(const Common::String &str) {
AbstractFilesystemNode *PalmOSFilesystemNode::parent() const { AbstractFilesystemNode *PalmOSFilesystemNode::parent() const {
PalmOSFilesystemNode *p = 0; PalmOSFilesystemNode *p = 0;
if (!_isPseudoRoot) { if (!_isPseudoRoot) {
const char *start = _path.c_str(); const char *start = _path.c_str();
const char *end = lastPathComponent(_path); const char *end = lastPathComponent(_path);
p = new PalmOSFilesystemNode(); p = new PalmOSFilesystemNode();
p->_path = String(start, end - start); p->_path = String(start, end - start);
p->_isValid = true; p->_isValid = true;
@ -152,4 +152,4 @@ AbstractFilesystemNode *PalmOSFilesystemNode::parent() const {
return p; return p;
} }
#endif // __PALMOS_TRAPS__ #endif // PALMOS_MODE

4
graphics/scummfont.cpp
View file

@ -23,7 +23,7 @@
namespace Graphics { namespace Graphics {
#ifdef __PALM_OS__ #ifdef PALMOS_68K
static const byte *guifont; static const byte *guifont;
#else #else
// Built-in font // Built-in font
@ -95,7 +95,7 @@ void ScummFont::drawChar(Surface *dst, byte chr, int tx, int ty, uint32 color) c
} // End of namespace Graphics } // End of namespace Graphics
#ifdef __PALM_OS__ #ifdef PALMOS_68K
#include "scumm_globals.h" #include "scumm_globals.h"
_GINIT(ScummFont) _GINIT(ScummFont)

2
gui/ListWidget.cpp
View file

@ -261,7 +261,7 @@ bool ListWidget::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
_scrollBar->draw(); _scrollBar->draw();
} }
#if !defined(__PALM_OS__) #if !defined(PALMOS_MODE)
// not done on PalmOS because keyboard is emulated and keyup is not generated // not done on PalmOS because keyboard is emulated and keyup is not generated
_currentKeyDown = keycode; _currentKeyDown = keycode;
#endif #endif

2
gui/console.cpp
View file

@ -568,7 +568,7 @@ int ConsoleDialog::printf(const char *format, ...) {
} }
int ConsoleDialog::vprintf(const char *format, va_list argptr) { int ConsoleDialog::vprintf(const char *format, va_list argptr) {
#ifdef __PALM_OS__ #ifdef PALMOS_68K
char buf[256]; char buf[256];
#else #else
char buf[2048]; char buf[2048];

4
gui/options.cpp
View file

@ -33,13 +33,13 @@
#include "sound/mididrv.h" #include "sound/mididrv.h"
#include "sound/mixer.h" #include "sound/mixer.h"
#if (!( defined(__PALM_OS__) || defined(__DC__) || defined(__GP32__) || defined(__amigaos4__) ) && !defined(_MSC_VER)) #if (!( defined(PALMOS_MODE) || defined(__DC__) || defined(__GP32__) || defined(__amigaos4__) ) && !defined(_MSC_VER))
#include <sys/param.h> #include <sys/param.h>
#include <unistd.h> #include <unistd.h>
#endif #endif
#if !(defined(MAXPATHLEN)) #if !(defined(MAXPATHLEN))
#ifndef __PALM_OS__ #ifndef PALMOS_68K
#define MAXPATHLEN 1024 #define MAXPATHLEN 1024
#else #else
#define MAXPATHLEN 256 #define MAXPATHLEN 256