Fixed the spaces before tabs.
svn-id: r30667
This commit is contained in:
parent
66e9d4f5e8
commit
d6c34bdc4b
207 changed files with 6067 additions and 6067 deletions
|
@ -96,7 +96,7 @@ DefaultEventManager::DefaultEventManager(OSystem *boss) :
|
||||||
_modifierState(0),
|
_modifierState(0),
|
||||||
_shouldQuit(false) {
|
_shouldQuit(false) {
|
||||||
|
|
||||||
assert(_boss);
|
assert(_boss);
|
||||||
|
|
||||||
_recordFile = NULL;
|
_recordFile = NULL;
|
||||||
_recordTimeFile = NULL;
|
_recordTimeFile = NULL;
|
||||||
|
|
|
@ -53,8 +53,8 @@ protected:
|
||||||
* handle this gracefully by returning 0.
|
* handle this gracefully by returning 0.
|
||||||
*
|
*
|
||||||
* Example:
|
* Example:
|
||||||
* Calling getChild() for a node with path "/foo/bar" using name="file.txt",
|
* Calling getChild() for a node with path "/foo/bar" using name="file.txt",
|
||||||
* would produce a new node with "/foo/bar/file.txt" as path.
|
* would produce a new node with "/foo/bar/file.txt" as path.
|
||||||
*
|
*
|
||||||
* @note This function will append a separator char (\ or /) to the end of the
|
* @note This function will append a separator char (\ or /) to the end of the
|
||||||
* path if needed.
|
* path if needed.
|
||||||
|
@ -106,8 +106,8 @@ public:
|
||||||
* Returns the last component of the path pointed by this FilesystemNode.
|
* Returns the last component of the path pointed by this FilesystemNode.
|
||||||
*
|
*
|
||||||
* Examples (POSIX):
|
* Examples (POSIX):
|
||||||
* /foo/bar.txt would return /bar.txt
|
* /foo/bar.txt would return /bar.txt
|
||||||
* /foo/bar/ would return /bar/
|
* /foo/bar/ would return /bar/
|
||||||
*
|
*
|
||||||
* @note This method is very architecture dependent, please check the concrete implementation for more information.
|
* @note This method is very architecture dependent, please check the concrete implementation for more information.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -380,7 +380,7 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
|
||||||
if (entry) {
|
if (entry) {
|
||||||
//FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode
|
//FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode
|
||||||
// specification, the following call had to be changed:
|
// specification, the following call had to be changed:
|
||||||
// if (entry->isValid())
|
// if (entry->isValid())
|
||||||
// Please verify that the logic of the code remains coherent. Also, remember
|
// Please verify that the logic of the code remains coherent. Also, remember
|
||||||
// that the isReadable() and isWritable() methods are available.
|
// that the isReadable() and isWritable() methods are available.
|
||||||
if (entry->exists())
|
if (entry->exists())
|
||||||
|
@ -542,7 +542,7 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const {
|
||||||
if (entry) {
|
if (entry) {
|
||||||
//FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode
|
//FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode
|
||||||
// specification, the following call had to be changed:
|
// specification, the following call had to be changed:
|
||||||
// if (entry->isValid())
|
// if (entry->isValid())
|
||||||
// Please verify that the logic of the code remains coherent. Also, remember
|
// Please verify that the logic of the code remains coherent. Also, remember
|
||||||
// that the isReadable() and isWritable() methods are available.
|
// that the isReadable() and isWritable() methods are available.
|
||||||
if(entry->exists())
|
if(entry->exists())
|
||||||
|
|
|
@ -73,8 +73,8 @@ public:
|
||||||
* Returns the last component of a given path.
|
* Returns the last component of a given path.
|
||||||
*
|
*
|
||||||
* Examples:
|
* Examples:
|
||||||
* /foo/bar.txt would return /bar.txt
|
* /foo/bar.txt would return /bar.txt
|
||||||
* /foo/bar/ would return /bar/
|
* /foo/bar/ would return /bar/
|
||||||
*
|
*
|
||||||
* @param str String containing the path.
|
* @param str String containing the path.
|
||||||
* @return Pointer to the first char of the last component inside str.
|
* @return Pointer to the first char of the last component inside str.
|
||||||
|
|
|
@ -35,7 +35,7 @@ namespace DS {
|
||||||
// DSFileSystemNode - Flash ROM file system using Zip files //
|
// DSFileSystemNode - Flash ROM file system using Zip files //
|
||||||
//////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
ZipFile* DSFileSystemNode::_zipFile = NULL;
|
ZipFile* DSFileSystemNode::_zipFile = NULL;
|
||||||
char currentDir[128];
|
char currentDir[128];
|
||||||
|
|
||||||
DSFileSystemNode::DSFileSystemNode() {
|
DSFileSystemNode::DSFileSystemNode() {
|
||||||
|
@ -803,8 +803,8 @@ int std_ferror(FILE* handle) {
|
||||||
* Returns the last component of a given path.
|
* Returns the last component of a given path.
|
||||||
*
|
*
|
||||||
* Examples:
|
* Examples:
|
||||||
* /foo/bar.txt would return /bar.txt
|
* /foo/bar.txt would return /bar.txt
|
||||||
* /foo/bar/ would return /bar/
|
* /foo/bar/ would return /bar/
|
||||||
*
|
*
|
||||||
* @param str String containing the path.
|
* @param str String containing the path.
|
||||||
* @return Pointer to the first char of the last component inside str.
|
* @return Pointer to the first char of the last component inside str.
|
||||||
|
|
|
@ -179,17 +179,17 @@ struct fileHandle {
|
||||||
#define FILE DS::fileHandle
|
#define FILE DS::fileHandle
|
||||||
|
|
||||||
// Please do not remove any of these prototypes that appear not to be required.
|
// Please do not remove any of these prototypes that appear not to be required.
|
||||||
FILE* std_fopen(const char* name, const char* mode);
|
FILE* std_fopen(const char* name, const char* mode);
|
||||||
void std_fclose(FILE* handle);
|
void std_fclose(FILE* handle);
|
||||||
int std_getc(FILE* handle);
|
int std_getc(FILE* handle);
|
||||||
size_t std_fread(const void* ptr, size_t size, size_t numItems, FILE* handle);
|
size_t std_fread(const void* ptr, size_t size, size_t numItems, FILE* handle);
|
||||||
size_t std_fwrite(const void* ptr, size_t size, size_t numItems, FILE* handle);
|
size_t std_fwrite(const void* ptr, size_t size, size_t numItems, FILE* handle);
|
||||||
bool std_feof(FILE* handle);
|
bool std_feof(FILE* handle);
|
||||||
long int std_ftell(FILE* handle);
|
long int std_ftell(FILE* handle);
|
||||||
int std_fseek(FILE* handle, long int offset, int whence);
|
int std_fseek(FILE* handle, long int offset, int whence);
|
||||||
void std_clearerr(FILE* handle);
|
void std_clearerr(FILE* handle);
|
||||||
void std_cwd(char* dir);
|
void std_cwd(char* dir);
|
||||||
void std_fflush(FILE* handle);
|
void std_fflush(FILE* handle);
|
||||||
|
|
||||||
} //namespace DS
|
} //namespace DS
|
||||||
|
|
||||||
|
|
|
@ -74,8 +74,8 @@ const char gpRootPath[] = "gp:\\";
|
||||||
* Returns the last component of a given path.
|
* Returns the last component of a given path.
|
||||||
*
|
*
|
||||||
* Examples:
|
* Examples:
|
||||||
* gp:\foo\bar.txt would return "\bar.txt"
|
* gp:\foo\bar.txt would return "\bar.txt"
|
||||||
* gp:\foo\bar\ would return "\bar\"
|
* gp:\foo\bar\ would return "\bar\"
|
||||||
*
|
*
|
||||||
* @param str Path to obtain the last component from.
|
* @param str Path to obtain the last component from.
|
||||||
* @return Pointer to the first char of the last component inside str.
|
* @return Pointer to the first char of the last component inside str.
|
||||||
|
|
|
@ -312,7 +312,7 @@ bool ABoxFilesystemNode::getChildren(AbstractFSList &list, ListMode mode, bool h
|
||||||
{
|
{
|
||||||
//FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode
|
//FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode
|
||||||
// specification, the following call had to be changed:
|
// specification, the following call had to be changed:
|
||||||
// if (entry->isValid())
|
// if (entry->isValid())
|
||||||
// Please verify that the logic of the code remains coherent. Also, remember
|
// Please verify that the logic of the code remains coherent. Also, remember
|
||||||
// that the isReadable() and isWritable() methods are available.
|
// that the isReadable() and isWritable() methods are available.
|
||||||
if (entry->exists())
|
if (entry->exists())
|
||||||
|
@ -396,7 +396,7 @@ AbstractFSList ABoxFilesystemNode::getRootChildren()
|
||||||
{
|
{
|
||||||
//FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode
|
//FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode
|
||||||
// specification, the following call had to be changed:
|
// specification, the following call had to be changed:
|
||||||
// if (entry->isValid())
|
// if (entry->isValid())
|
||||||
// Please verify that the logic of the code remains coherent. Also, remember
|
// Please verify that the logic of the code remains coherent. Also, remember
|
||||||
// that the isReadable() and isWritable() methods are available.
|
// that the isReadable() and isWritable() methods are available.
|
||||||
if (entry->exists())
|
if (entry->exists())
|
||||||
|
|
|
@ -76,7 +76,7 @@ private:
|
||||||
* @param mode Mode to use while adding the file entry to the list.
|
* @param mode Mode to use while adding the file entry to the list.
|
||||||
* @param base String with the directory being listed.
|
* @param base String with the directory being listed.
|
||||||
* @param find_data Describes a file that the FindFirstFile, FindFirstFileEx, or FindNextFile functions find.
|
* @param find_data Describes a file that the FindFirstFile, FindFirstFileEx, or FindNextFile functions find.
|
||||||
*/
|
*/
|
||||||
static void addFile(AbstractFSList &list, ListMode mode, const Char *base, FileInfoType* find_data);
|
static void addFile(AbstractFSList &list, ListMode mode, const Char *base, FileInfoType* find_data);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -84,8 +84,8 @@ private:
|
||||||
* Returns the last component of a given path.
|
* Returns the last component of a given path.
|
||||||
*
|
*
|
||||||
* Examples:
|
* Examples:
|
||||||
* /foo/bar.txt would return /bar.txt
|
* /foo/bar.txt would return /bar.txt
|
||||||
* /foo/bar/ would return /bar/
|
* /foo/bar/ would return /bar/
|
||||||
*
|
*
|
||||||
* @param str String containing the path.
|
* @param str String containing the path.
|
||||||
* @return Pointer to the first char of the last component inside str.
|
* @return Pointer to the first char of the last component inside str.
|
||||||
|
|
|
@ -84,8 +84,8 @@ private:
|
||||||
* Returns the last component of a given path.
|
* Returns the last component of a given path.
|
||||||
*
|
*
|
||||||
* Examples:
|
* Examples:
|
||||||
* /foo/bar.txt would return /bar.txt
|
* /foo/bar.txt would return /bar.txt
|
||||||
* /foo/bar/ would return /bar/
|
* /foo/bar/ would return /bar/
|
||||||
*
|
*
|
||||||
* @param str String containing the path.
|
* @param str String containing the path.
|
||||||
* @return Pointer to the first char of the last component inside str.
|
* @return Pointer to the first char of the last component inside str.
|
||||||
|
|
|
@ -75,8 +75,8 @@ public:
|
||||||
* Returns the last component of a given path.
|
* Returns the last component of a given path.
|
||||||
*
|
*
|
||||||
* Examples:
|
* Examples:
|
||||||
* /foo/bar.txt would return /bar.txt
|
* /foo/bar.txt would return /bar.txt
|
||||||
* /foo/bar/ would return /bar/
|
* /foo/bar/ would return /bar/
|
||||||
*
|
*
|
||||||
* @param str String containing the path.
|
* @param str String containing the path.
|
||||||
* @return Pointer to the first char of the last component inside str.
|
* @return Pointer to the first char of the last component inside str.
|
||||||
|
|
|
@ -81,8 +81,8 @@ public:
|
||||||
* Returns the last component of a given path.
|
* Returns the last component of a given path.
|
||||||
*
|
*
|
||||||
* Examples:
|
* Examples:
|
||||||
* c:\foo\bar.txt would return "\bar.txt"
|
* c:\foo\bar.txt would return "\bar.txt"
|
||||||
* c:\foo\bar\ would return "\bar\"
|
* c:\foo\bar\ would return "\bar\"
|
||||||
*
|
*
|
||||||
* @param str Path to obtain the last component from.
|
* @param str Path to obtain the last component from.
|
||||||
* @return Pointer to the first char of the last component inside str.
|
* @return Pointer to the first char of the last component inside str.
|
||||||
|
|
|
@ -79,8 +79,8 @@ public:
|
||||||
*
|
*
|
||||||
* Examples:
|
* Examples:
|
||||||
* path=c:\foo\bar.txt, currentDir=false -> c:\foo\bar.txt
|
* path=c:\foo\bar.txt, currentDir=false -> c:\foo\bar.txt
|
||||||
* path=c:\foo\bar.txt, currentDir=true -> current directory
|
* path=c:\foo\bar.txt, currentDir=true -> current directory
|
||||||
* path=NULL, currentDir=true -> current directory
|
* path=NULL, currentDir=true -> current directory
|
||||||
*
|
*
|
||||||
* @param path String with the path the new node should point to.
|
* @param path String with the path the new node should point to.
|
||||||
* @param currentDir if true, the path parameter will be ignored and the resulting node will point to the current directory.
|
* @param currentDir if true, the path parameter will be ignored and the resulting node will point to the current directory.
|
||||||
|
@ -108,7 +108,7 @@ private:
|
||||||
* @param mode Mode to use while adding the file entry to the list.
|
* @param mode Mode to use while adding the file entry to the list.
|
||||||
* @param base String with the directory being listed.
|
* @param base String with the directory being listed.
|
||||||
* @param find_data Describes a file that the FindFirstFile, FindFirstFileEx, or FindNextFile functions find.
|
* @param find_data Describes a file that the FindFirstFile, FindFirstFileEx, or FindNextFile functions find.
|
||||||
*/
|
*/
|
||||||
static void addFile(AbstractFSList &list, ListMode mode, const char *base, WIN32_FIND_DATA* find_data);
|
static void addFile(AbstractFSList &list, ListMode mode, const char *base, WIN32_FIND_DATA* find_data);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -116,7 +116,7 @@ private:
|
||||||
*
|
*
|
||||||
* @param str String to convert from Unicode to Ascii.
|
* @param str String to convert from Unicode to Ascii.
|
||||||
* @return str in Ascii format.
|
* @return str in Ascii format.
|
||||||
*/
|
*/
|
||||||
static char *toAscii(TCHAR *str);
|
static char *toAscii(TCHAR *str);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -124,7 +124,7 @@ private:
|
||||||
*
|
*
|
||||||
* @param str String to convert from Ascii to Unicode.
|
* @param str String to convert from Ascii to Unicode.
|
||||||
* @return str in Unicode format.
|
* @return str in Unicode format.
|
||||||
*/
|
*/
|
||||||
static const TCHAR* toUnicode(const char *str);
|
static const TCHAR* toUnicode(const char *str);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -132,8 +132,8 @@ private:
|
||||||
* Returns the last component of a given path.
|
* Returns the last component of a given path.
|
||||||
*
|
*
|
||||||
* Examples:
|
* Examples:
|
||||||
* c:\foo\bar.txt would return "\bar.txt"
|
* c:\foo\bar.txt would return "\bar.txt"
|
||||||
* c:\foo\bar\ would return "\bar\"
|
* c:\foo\bar\ would return "\bar\"
|
||||||
*
|
*
|
||||||
* @param str Path to obtain the last component from.
|
* @param str Path to obtain the last component from.
|
||||||
* @return Pointer to the first char of the last component inside str.
|
* @return Pointer to the first char of the last component inside str.
|
||||||
|
|
|
@ -53,7 +53,7 @@ int MidiDriver_Zodiac::open() {
|
||||||
Err e;
|
Err e;
|
||||||
|
|
||||||
if (e = TwMidiOpen(&_midiHandle))
|
if (e = TwMidiOpen(&_midiHandle))
|
||||||
return MERR_DEVICE_NOT_AVAILABLE;
|
return MERR_DEVICE_NOT_AVAILABLE;
|
||||||
|
|
||||||
TwMidiGetMasterVolume(&_oldVol);
|
TwMidiGetMasterVolume(&_oldVol);
|
||||||
TwMidiSetMasterVolume(twMidiMaxVolume); // TODO : set volume based on gVars
|
TwMidiSetMasterVolume(twMidiMaxVolume); // TODO : set volume based on gVars
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
// THIS IS AN AUTOMATICALLY GENERATED HEADER FILE
|
// THIS IS AN AUTOMATICALLY GENERATED HEADER FILE
|
||||||
// DO NOT EDIT - CHANGES MADE TO THIS FILE WILL BE LOST
|
// DO NOT EDIT - CHANGES MADE TO THIS FILE WILL BE LOST
|
||||||
//
|
//
|
||||||
// Palm App Name: "ScummVM"
|
// Palm App Name: "ScummVM"
|
||||||
//
|
//
|
||||||
// Palm App Version: "1.0"
|
// Palm App Version: "1.0"
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ public:
|
||||||
void play(int track, int num_loops, int start_frame, int duration);
|
void play(int track, int num_loops, int start_frame, int duration);
|
||||||
void stop();
|
void stop();
|
||||||
|
|
||||||
void setVolume(int volume);
|
void setVolume(int volume);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
OSystem *_sys;
|
OSystem *_sys;
|
||||||
|
@ -53,9 +53,9 @@ private:
|
||||||
UInt32 getPosition();
|
UInt32 getPosition();
|
||||||
void forceStop();
|
void forceStop();
|
||||||
|
|
||||||
UInt16 _volumeLimit;
|
UInt16 _volumeLimit;
|
||||||
|
|
||||||
Boolean _isPlaying;
|
Boolean _isPlaying;
|
||||||
// cdrom
|
// cdrom
|
||||||
UInt16 _pckLoops, _pckTrack;
|
UInt16 _pckLoops, _pckTrack;
|
||||||
UInt32 _pckTrackStartFrame, _pckTrackEndFrame;
|
UInt32 _pckTrackStartFrame, _pckTrackEndFrame;
|
||||||
|
|
|
@ -30,20 +30,20 @@
|
||||||
|
|
||||||
class DefaultCDPlayer : public CDAudio {
|
class DefaultCDPlayer : public CDAudio {
|
||||||
public:
|
public:
|
||||||
DefaultCDPlayer(OSystem *sys);
|
DefaultCDPlayer(OSystem *sys);
|
||||||
|
|
||||||
bool init();
|
bool init();
|
||||||
void release();
|
void release();
|
||||||
|
|
||||||
bool poll();
|
bool poll();
|
||||||
void update();
|
void update();
|
||||||
void play(int track, int num_loops, int start_frame, int duration);
|
void play(int track, int num_loops, int start_frame, int duration);
|
||||||
void stop();
|
void stop();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
OSystem *_sys;
|
OSystem *_sys;
|
||||||
|
|
||||||
// cdrom
|
// cdrom
|
||||||
UInt16 _defLoops;
|
UInt16 _defLoops;
|
||||||
UInt32 _defStopTime, _defTrackEndFrame, _defTrackLength;
|
UInt32 _defStopTime, _defTrackEndFrame, _defTrackLength;
|
||||||
};
|
};
|
||||||
|
|
|
@ -30,28 +30,28 @@
|
||||||
|
|
||||||
class MsaCDPlayer : public CDAudio {
|
class MsaCDPlayer : public CDAudio {
|
||||||
public:
|
public:
|
||||||
MsaCDPlayer(OSystem *sys);
|
MsaCDPlayer(OSystem *sys);
|
||||||
|
|
||||||
bool init();
|
bool init();
|
||||||
void release();
|
void release();
|
||||||
|
|
||||||
bool poll();
|
bool poll();
|
||||||
void update();
|
void update();
|
||||||
void play(int track, int num_loops, int start_frame, int duration);
|
void play(int track, int num_loops, int start_frame, int duration);
|
||||||
void stop();
|
void stop();
|
||||||
|
|
||||||
void setVolume(int volume);
|
void setVolume(int volume);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void initInternal();
|
void initInternal();
|
||||||
|
|
||||||
OSystem *_sys;
|
OSystem *_sys;
|
||||||
UInt16 _msaRefNum;
|
UInt16 _msaRefNum;
|
||||||
|
|
||||||
UInt32 _volumeLLimit;
|
UInt32 _volumeLLimit;
|
||||||
UInt32 _volumeRLimit;
|
UInt32 _volumeRLimit;
|
||||||
|
|
||||||
// cdrom
|
// cdrom
|
||||||
AlbumInfoType _msaAlbum;
|
AlbumInfoType _msaAlbum;
|
||||||
UInt16 _msaLoops;
|
UInt16 _msaLoops;
|
||||||
|
|
||||||
|
|
|
@ -31,35 +31,35 @@
|
||||||
|
|
||||||
class PckTunesCDPlayer : public CDAudio {
|
class PckTunesCDPlayer : public CDAudio {
|
||||||
public:
|
public:
|
||||||
PckTunesCDPlayer(OSystem *sys);
|
PckTunesCDPlayer(OSystem *sys);
|
||||||
|
|
||||||
bool init();
|
bool init();
|
||||||
void release();
|
void release();
|
||||||
|
|
||||||
bool poll();
|
bool poll();
|
||||||
void update();
|
void update();
|
||||||
void play(int track, int num_loops, int start_frame, int duration);
|
void play(int track, int num_loops, int start_frame, int duration);
|
||||||
void stop();
|
void stop();
|
||||||
|
|
||||||
void setVolume(int volume);
|
void setVolume(int volume);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
OSystem *_sys;
|
OSystem *_sys;
|
||||||
Char gameP[15];
|
Char gameP[15];
|
||||||
|
|
||||||
PocketTunesAction *_pAction; // prevent memory fragmentation
|
PocketTunesAction *_pAction; // prevent memory fragmentation
|
||||||
EventType _eAction;
|
EventType _eAction;
|
||||||
|
|
||||||
UInt32 getStatus();
|
UInt32 getStatus();
|
||||||
void setPosition(UInt32 value);
|
void setPosition(UInt32 value);
|
||||||
UInt32 getDuration();
|
UInt32 getDuration();
|
||||||
UInt32 getPosition(UInt32 deft);
|
UInt32 getPosition(UInt32 deft);
|
||||||
|
|
||||||
UInt32 _volumeLimit;
|
UInt32 _volumeLimit;
|
||||||
UInt32 getVolumeLimit();
|
UInt32 getVolumeLimit();
|
||||||
|
|
||||||
Boolean _isPlaying;
|
Boolean _isPlaying;
|
||||||
// cdrom
|
// cdrom
|
||||||
UInt16 _pckLoops, _pckTrack;
|
UInt16 _pckLoops, _pckTrack;
|
||||||
UInt32 _pckTrackStartFrame, _pckTrackEndFrame;
|
UInt32 _pckTrackStartFrame, _pckTrackEndFrame;
|
||||||
UInt32 _pckStopTime, _pckTrackDuration;
|
UInt32 _pckStopTime, _pckTrackDuration;
|
||||||
|
|
|
@ -94,7 +94,7 @@ extern GlobalsDataPtr gVars;
|
||||||
#define DO_VARS(z, t, o) \
|
#define DO_VARS(z, t, o) \
|
||||||
{ Int8 *tmp = (Int8 *)gVars + o + 8; \
|
{ Int8 *tmp = (Int8 *)gVars + o + 8; \
|
||||||
for (Int8 cnt = 0; cnt < gVars->z; cnt++) \
|
for (Int8 cnt = 0; cnt < gVars->z; cnt++) \
|
||||||
{ UInt##t val = *((UInt##t *)tmp); \
|
{ UInt##t val = *((UInt##t *)tmp); \
|
||||||
val = ByteSwap##t(val); \
|
val = ByteSwap##t(val); \
|
||||||
*((UInt##t *)tmp) = val; \
|
*((UInt##t *)tmp) = val; \
|
||||||
tmp += (t / 8); \
|
tmp += (t / 8); \
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#ifndef INIT_PALMOS_H
|
#ifndef INIT_PALMOS_H
|
||||||
#define INIT_PALMOS_H
|
#define INIT_PALMOS_H
|
||||||
|
|
||||||
#define PALM_PORTRAIT 1
|
#define PALM_PORTRAIT 1
|
||||||
#define PALM_LANDSCAPE 2
|
#define PALM_LANDSCAPE 2
|
||||||
|
|
||||||
void PalmInit(UInt8 init);
|
void PalmInit(UInt8 init);
|
||||||
|
@ -39,4 +39,4 @@ void PalmHRRelease();
|
||||||
UInt8 PalmScreenSize(Coord *stdw, Coord *stdh, Coord *fullw, Coord *fullh);
|
UInt8 PalmScreenSize(Coord *stdw, Coord *stdh, Coord *fullw, Coord *fullh);
|
||||||
void PalmGetMemory(UInt32* storageMemoryP, UInt32* dynamicMemoryP, UInt32 *storageFreeP, UInt32 *dynamicFreeP);
|
void PalmGetMemory(UInt32* storageMemoryP, UInt32* dynamicMemoryP, UInt32 *storageFreeP, UInt32 *dynamicFreeP);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -45,13 +45,13 @@ UInt16 SilkInit(UInt32 *retVersion) {
|
||||||
e = FtrGet(sonySysFtrCreator, sonySysFtrNumVskVersion, &version);
|
e = FtrGet(sonySysFtrCreator, sonySysFtrNumVskVersion, &version);
|
||||||
if (e) {
|
if (e) {
|
||||||
// v1 = NR
|
// v1 = NR
|
||||||
e = SilkLibOpen(slkRefNum);
|
e = SilkLibOpen(slkRefNum);
|
||||||
if (!e) version = vskVersionNum1;
|
if (!e) version = vskVersionNum1;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// v2 = NX/NZ
|
// v2 = NX/NZ
|
||||||
// v3 = UX...
|
// v3 = UX...
|
||||||
e = VskOpen(slkRefNum);
|
e = VskOpen(slkRefNum);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
|
|
|
@ -80,11 +80,11 @@ void StuffsGetFeatures() {
|
||||||
OPTIONS_SET(kOptDeviceOS5);
|
OPTIONS_SET(kOptDeviceOS5);
|
||||||
|
|
||||||
// ARM ?
|
// ARM ?
|
||||||
if (!FtrGet(sysFileCSystem, sysFtrNumProcessorID, &ulProcessorType))
|
if (!FtrGet(sysFileCSystem, sysFtrNumProcessorID, &ulProcessorType))
|
||||||
if (sysFtrNumProcessorIsARM(ulProcessorType))
|
if (sysFtrNumProcessorIsARM(ulProcessorType))
|
||||||
OPTIONS_SET(kOptDeviceARM);
|
OPTIONS_SET(kOptDeviceARM);
|
||||||
else if (ulProcessorType == sysFtrNumProcessorx86)
|
else if (ulProcessorType == sysFtrNumProcessorx86)
|
||||||
OPTIONS_SET(kOptDeviceProcX86);
|
OPTIONS_SET(kOptDeviceProcX86);
|
||||||
|
|
||||||
// 5Way Navigator
|
// 5Way Navigator
|
||||||
if (!FtrGet(hsFtrCreator, hsFtrIDNavigationSupported, &version)) {
|
if (!FtrGet(hsFtrCreator, hsFtrIDNavigationSupported, &version)) {
|
||||||
|
|
|
@ -202,7 +202,7 @@ static void AppStartCheckScreenSize() {
|
||||||
|
|
||||||
#define max(id,value) gVars->memory[id] = (gVars->memory[id] < value ? value : gVars->memory[id])
|
#define max(id,value) gVars->memory[id] = (gVars->memory[id] < value ? value : gVars->memory[id])
|
||||||
#define min(id,value) gVars->memory[id] = (gVars->memory[id] > value ? value : gVars->memory[id])
|
#define min(id,value) gVars->memory[id] = (gVars->memory[id] > value ? value : gVars->memory[id])
|
||||||
#define threshold 700
|
#define threshold 700
|
||||||
|
|
||||||
static void AppStartSetMemory() {
|
static void AppStartSetMemory() {
|
||||||
UInt32 mem, def;
|
UInt32 mem, def;
|
||||||
|
@ -221,7 +221,7 @@ Err AppStart(void) {
|
||||||
|
|
||||||
#ifndef _DEBUG_ENGINE
|
#ifndef _DEBUG_ENGINE
|
||||||
// delete old databases
|
// delete old databases
|
||||||
ModDelete();
|
ModDelete();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// allocate global variables space
|
// allocate global variables space
|
||||||
|
@ -295,7 +295,7 @@ Err AppStart(void) {
|
||||||
GamImportDatabase();
|
GamImportDatabase();
|
||||||
|
|
||||||
AppStartCheckScreenSize();
|
AppStartCheckScreenSize();
|
||||||
AppStartCheckNotify(); // not fatal error if not avalaible
|
AppStartCheckNotify(); // not fatal error if not avalaible
|
||||||
|
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
|
@ -121,8 +121,8 @@ static Boolean MainFormDoCommand(UInt16 command)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MainOptionsAbout:
|
case MainOptionsAbout:
|
||||||
FrmPopupForm(InfoForm);
|
FrmPopupForm(InfoForm);
|
||||||
handled = true;
|
handled = true;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MainGamesMusicSound:
|
case MainGamesMusicSound:
|
||||||
|
@ -252,7 +252,7 @@ Boolean MainFormHandleEvent(EventPtr eventP)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MainAboutButton:
|
case MainAboutButton:
|
||||||
FrmPopupForm(InfoForm);
|
FrmPopupForm(InfoForm);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// case MainListTypeSelTrigger:
|
// case MainListTypeSelTrigger:
|
||||||
|
|
|
@ -17,8 +17,8 @@ typedef struct {
|
||||||
} TabType, *TabPtr;
|
} TabType, *TabPtr;
|
||||||
|
|
||||||
TabType *TabNewTabs (UInt16 cnt);
|
TabType *TabNewTabs (UInt16 cnt);
|
||||||
void TabDeleteTabs (TabType *tabP);
|
void TabDeleteTabs (TabType *tabP);
|
||||||
Err TabAddContent (FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID, TabProc *drawFunc = 0);
|
Err TabAddContent (FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID, TabProc *drawFunc = 0);
|
||||||
void TabSetActive (FormType *frmP, TabType *tabP, UInt16 num);
|
void TabSetActive (FormType *frmP, TabType *tabP, UInt16 num);
|
||||||
void TabMoveUpObject (FormType *frmP, UInt16 objID, Coord amount);
|
void TabMoveUpObject (FormType *frmP, UInt16 objID, Coord amount);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -414,8 +414,8 @@ void GamImportDatabase() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// get current db info and rename it
|
// get current db info and rename it
|
||||||
DmOpenDatabaseInfo(gameDB, &oDbID, 0, 0, &oCardNo, 0);
|
DmOpenDatabaseInfo(gameDB, &oDbID, 0, 0, &oCardNo, 0);
|
||||||
GamCloseDatabase(true);
|
GamCloseDatabase(true);
|
||||||
e = DmDeleteDatabase(oCardNo, oDbID);
|
e = DmDeleteDatabase(oCardNo, oDbID);
|
||||||
|
|
||||||
|
|
|
@ -53,9 +53,9 @@ typedef struct {
|
||||||
UInt16 icnID; // icon to display on the list
|
UInt16 icnID; // icon to display on the list
|
||||||
Boolean selected;
|
Boolean selected;
|
||||||
|
|
||||||
Char nameP[50]; // game name to display in list
|
Char nameP[50]; // game name to display in list
|
||||||
Char pathP[150]; // path to the game files
|
Char pathP[150]; // path to the game files
|
||||||
Char gameP[10]; // scumm name of the game
|
Char gameP[10]; // scumm name of the game
|
||||||
UInt16 gfxMode;
|
UInt16 gfxMode;
|
||||||
|
|
||||||
Boolean autoLoad;
|
Boolean autoLoad;
|
||||||
|
@ -75,9 +75,9 @@ typedef struct {
|
||||||
UInt16 icnID; // icon to display on the list
|
UInt16 icnID; // icon to display on the list
|
||||||
Boolean selected;
|
Boolean selected;
|
||||||
|
|
||||||
Char nameP[50]; // game name to display in list
|
Char nameP[50]; // game name to display in list
|
||||||
Char pathP[150]; // path to the game files
|
Char pathP[150]; // path to the game files
|
||||||
Char gameP[10]; // scumm name of the game
|
Char gameP[10]; // scumm name of the game
|
||||||
UInt16 gfxMode;
|
UInt16 gfxMode;
|
||||||
|
|
||||||
Boolean autoLoad;
|
Boolean autoLoad;
|
||||||
|
@ -127,9 +127,9 @@ typedef struct {
|
||||||
UInt16 icnID; // icon to display on the list
|
UInt16 icnID; // icon to display on the list
|
||||||
Boolean selected;
|
Boolean selected;
|
||||||
|
|
||||||
Char nameP[50]; // game name to display in list
|
Char nameP[50]; // game name to display in list
|
||||||
Char pathP[150]; // path to the game files
|
Char pathP[150]; // path to the game files
|
||||||
Char gameP[15]; // scumm name of the game
|
Char gameP[15]; // scumm name of the game
|
||||||
UInt16 gfxMode;
|
UInt16 gfxMode;
|
||||||
|
|
||||||
Boolean autoLoad;
|
Boolean autoLoad;
|
||||||
|
@ -142,13 +142,13 @@ typedef struct {
|
||||||
UInt16 bootValue;
|
UInt16 bootValue;
|
||||||
UInt16 talkValue;
|
UInt16 talkValue;
|
||||||
UInt8 platform;
|
UInt8 platform;
|
||||||
UInt8 language; // |- v2.5
|
UInt8 language; // |- v2.5
|
||||||
|
|
||||||
Boolean filter; // v2.6
|
Boolean filter; // v2.6
|
||||||
Boolean fullscreen; // |
|
Boolean fullscreen; // |
|
||||||
Boolean aspectRatio; // |- v2.7
|
Boolean aspectRatio; // |- v2.7
|
||||||
|
|
||||||
MusicInfoType musicInfo;// v3.0
|
MusicInfoType musicInfo;// v3.0
|
||||||
|
|
||||||
UInt8 engine; // |- v3.1
|
UInt8 engine; // |- v3.1
|
||||||
UInt8 renderMode; // |- v3.2
|
UInt8 renderMode; // |- v3.2
|
||||||
|
|
|
@ -134,7 +134,7 @@ static void SknCopyBits(DmOpenRef skinDBP, DmResID bitmapID, const RectangleType
|
||||||
WinDrawBitmap(bmpTemp, 0, 0);
|
WinDrawBitmap(bmpTemp, 0, 0);
|
||||||
WinSetDrawWindow(old);
|
WinSetDrawWindow(old);
|
||||||
|
|
||||||
bmp2P = BmpCreateBitmapV3(WinGetBitmap(win), kDensityDouble, BmpGetBits(WinGetBitmap(win)), NULL);
|
bmp2P = BmpCreateBitmapV3(WinGetBitmap(win), kDensityDouble, BmpGetBits(WinGetBitmap(win)), NULL);
|
||||||
|
|
||||||
copy.topLeft.x = destX / 2;
|
copy.topLeft.x = destX / 2;
|
||||||
copy.topLeft.y = destY / 2;
|
copy.topLeft.y = destY / 2;
|
||||||
|
|
|
@ -89,14 +89,14 @@ extern GlobalsType global;
|
||||||
PACE_EMULSTATE->regData[2] = pinTrap; \
|
PACE_EMULSTATE->regData[2] = pinTrap; \
|
||||||
return ((returnType)((PACE_CALLBACK_PTR)( \
|
return ((returnType)((PACE_CALLBACK_PTR)( \
|
||||||
static_cast<void *>(PACE_EMULSTATE), \
|
static_cast<void *>(PACE_EMULSTATE), \
|
||||||
PceNativeTrapNo(sysTrapPinsDispatch), \
|
PceNativeTrapNo(sysTrapPinsDispatch), \
|
||||||
NULL, 0)));
|
NULL, 0)));
|
||||||
|
|
||||||
#define PACE_PIN_EXEC(pinTrap, returnType) \
|
#define PACE_PIN_EXEC(pinTrap, returnType) \
|
||||||
PACE_EMULSTATE->regData[2] = pinTrap; \
|
PACE_EMULSTATE->regData[2] = pinTrap; \
|
||||||
return ((returnType)((PACE_CALLBACK_PTR)( \
|
return ((returnType)((PACE_CALLBACK_PTR)( \
|
||||||
static_cast<void *>(PACE_EMULSTATE), \
|
static_cast<void *>(PACE_EMULSTATE), \
|
||||||
PceNativeTrapNo(sysTrapPinsDispatch), \
|
PceNativeTrapNo(sysTrapPinsDispatch), \
|
||||||
¶ms, \
|
¶ms, \
|
||||||
sizeof(params))));
|
sizeof(params))));
|
||||||
|
|
||||||
|
|
|
@ -79,10 +79,10 @@ void OSystem_PalmOS5::render_landscapeAny(RectangleType &r, PointType &p) {
|
||||||
|
|
||||||
void OSystem_PalmOS5::render_landscape15x(RectangleType &r, PointType &p) {
|
void OSystem_PalmOS5::render_landscape15x(RectangleType &r, PointType &p) {
|
||||||
Coord x, y, o = 0;
|
Coord x, y, o = 0;
|
||||||
int16 *dst = _workScreenP;
|
int16 *dst = _workScreenP;
|
||||||
|
|
||||||
if (_overlayVisible) {
|
if (_overlayVisible) {
|
||||||
int16 *src = _overlayP;
|
int16 *src = _overlayP;
|
||||||
|
|
||||||
for (y = 0; y < 100; y++) {
|
for (y = 0; y < 100; y++) {
|
||||||
// draw 2 lines
|
// draw 2 lines
|
||||||
|
|
|
@ -25,7 +25,7 @@ ARCH := -mthumb-interwork
|
||||||
# note: arm9tdmi isn't the correct CPU arch, but anything newer and LD
|
# note: arm9tdmi isn't the correct CPU arch, but anything newer and LD
|
||||||
# *insists* it has a FPU or VFP, and it won't take no for an answer!
|
# *insists* it has a FPU or VFP, and it won't take no for an answer!
|
||||||
CFLAGS := -g -Wall -O2\
|
CFLAGS := -g -Wall -O2\
|
||||||
-mcpu=arm7tdmi -mtune=arm7tdmi -fomit-frame-pointer\
|
-mcpu=arm7tdmi -mtune=arm7tdmi -fomit-frame-pointer\
|
||||||
-ffast-math \
|
-ffast-math \
|
||||||
$(ARCH)
|
$(ARCH)
|
||||||
|
|
||||||
|
|
|
@ -547,17 +547,17 @@ void initDebugger() {
|
||||||
while (REG_IPC_FIFO_CR&IPC_FIFO_RECV_EMPTY) swiWaitForVBlank();
|
while (REG_IPC_FIFO_CR&IPC_FIFO_RECV_EMPTY) swiWaitForVBlank();
|
||||||
fifo_temp=REG_IPC_FIFO_RX;
|
fifo_temp=REG_IPC_FIFO_RX;
|
||||||
if (fifo_temp==0x12345678) break;
|
if (fifo_temp==0x12345678) break;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (REG_IPC_FIFO_CR&IPC_FIFO_RECV_EMPTY) swiWaitForVBlank();
|
while (REG_IPC_FIFO_CR&IPC_FIFO_RECV_EMPTY) swiWaitForVBlank();
|
||||||
fifo_temp=REG_IPC_FIFO_RX; // give next value to wifi_init
|
fifo_temp=REG_IPC_FIFO_RX; // give next value to wifi_init
|
||||||
Wifi_Init(fifo_temp);
|
Wifi_Init(fifo_temp);
|
||||||
|
|
||||||
irqSet(IRQ_FIFO_NOT_EMPTY,arm7_fifo); // set up fifo irq
|
irqSet(IRQ_FIFO_NOT_EMPTY,arm7_fifo); // set up fifo irq
|
||||||
irqEnable(IRQ_FIFO_NOT_EMPTY);
|
irqEnable(IRQ_FIFO_NOT_EMPTY);
|
||||||
REG_IPC_FIFO_CR = IPC_FIFO_ENABLE | IPC_FIFO_RECV_IRQ;
|
REG_IPC_FIFO_CR = IPC_FIFO_ENABLE | IPC_FIFO_RECV_IRQ;
|
||||||
|
|
||||||
Wifi_SetSyncHandler(arm7_synctoarm9); // allow wifi lib to notify arm9
|
Wifi_SetSyncHandler(arm7_synctoarm9); // allow wifi lib to notify arm9
|
||||||
// arm7 wifi init complete
|
// arm7 wifi init complete
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -268,14 +268,14 @@ endif
|
||||||
|
|
||||||
|
|
||||||
ARM7BIN := -7 $(CURDIR)/../../arm7/arm7.bin
|
ARM7BIN := -7 $(CURDIR)/../../arm7/arm7.bin
|
||||||
ICON := -b ../../../logo.bmp "ScummVM;By Neil Millstone;"
|
ICON := -b ../../../logo.bmp "ScummVM;By Neil Millstone;"
|
||||||
|
|
||||||
CC = arm-eabi-gcc
|
CC = arm-eabi-gcc
|
||||||
CXX = arm-eabi-g++
|
CXX = arm-eabi-g++
|
||||||
|
|
||||||
CFLAGS = -Wno-multichar -Wall\
|
CFLAGS = -Wno-multichar -Wall\
|
||||||
-Wno-multichar -mcpu=arm9tdmi -mtune=arm9tdmi \
|
-Wno-multichar -mcpu=arm9tdmi -mtune=arm9tdmi \
|
||||||
-mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer\
|
-mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer\
|
||||||
-ffast-math -mthumb-interwork
|
-ffast-math -mthumb-interwork
|
||||||
|
|
||||||
ifdef USE_DEBUGGER
|
ifdef USE_DEBUGGER
|
||||||
|
|
|
@ -55,14 +55,14 @@ ARM_adpcm
|
||||||
loop:
|
loop:
|
||||||
LDRH r10,[r11,r2] @ r10 = stepTab[stepTableIndex]
|
LDRH r10,[r11,r2] @ r10 = stepTab[stepTableIndex]
|
||||||
TST r12,#4 @ if ((offset & 4) == 0)
|
TST r12,#4 @ if ((offset & 4) == 0)
|
||||||
MOVEQ r9, #0 @ r9 = diff = 0
|
MOVEQ r9, #0 @ r9 = diff = 0
|
||||||
MOVNE r9, r10 @ else r9 = diff = stepTab[stepTableIndex]
|
MOVNE r9, r10 @ else r9 = diff = stepTab[stepTableIndex]
|
||||||
|
|
||||||
TST r12,#2 @ if (offset & 2)
|
TST r12,#2 @ if (offset & 2)
|
||||||
ADDNE r9, r9, r10,ASR #1 @ diff += r10>>1
|
ADDNE r9, r9, r10,ASR #1 @ diff += r10>>1
|
||||||
|
|
||||||
TST r12,#1 @ if (offset & 1)
|
TST r12,#1 @ if (offset & 1)
|
||||||
ADDNE r9, r9, r10,ASR #2 @ diff += r10>>2
|
ADDNE r9, r9, r10,ASR #2 @ diff += r10>>2
|
||||||
|
|
||||||
ADD r9, r9, r10,ASR #3 @ diff += r10>>3
|
ADD r9, r9, r10,ASR #3 @ diff += r10>>3
|
||||||
|
|
||||||
|
|
|
@ -292,7 +292,7 @@ xLoop4:
|
||||||
ADD r6, r6, r6, LSL #1 @ r6 = 3*pal[src0]
|
ADD r6, r6, r6, LSL #1 @ r6 = 3*pal[src0]
|
||||||
AND r9, r14,r10,LSR #16 @ r9 = src2
|
AND r9, r14,r10,LSR #16 @ r9 = src2
|
||||||
LDR r9, [r13,r9, LSL #2] @ r9 = pal[src2]
|
LDR r9, [r13,r9, LSL #2] @ r9 = pal[src2]
|
||||||
MOV r10,r10,LSR #24 @ r10= src3
|
MOV r10,r10,LSR #24 @ r10= src3
|
||||||
LDR r10,[r13,r10,LSL #2] @ r10= pal[src3]
|
LDR r10,[r13,r10,LSL #2] @ r10= pal[src3]
|
||||||
ADD r6, r6, r7 @ r6 = dst0<<2
|
ADD r6, r6, r7 @ r6 = dst0<<2
|
||||||
AND r6, r8, r6, LSR #2 @ r6 = dst0 (split)
|
AND r6, r8, r6, LSR #2 @ r6 = dst0 (split)
|
||||||
|
@ -322,7 +322,7 @@ xLoop4:
|
||||||
ADD r6, r6, r6, LSL #1 @ r6 = 3*pal[src5]
|
ADD r6, r6, r6, LSL #1 @ r6 = 3*pal[src5]
|
||||||
MOV r9, r11,LSR #24 @ r9 = src7
|
MOV r9, r11,LSR #24 @ r9 = src7
|
||||||
LDR r9, [r13,r9, LSL #2] @ r9 = pal[src7]
|
LDR r9, [r13,r9, LSL #2] @ r9 = pal[src7]
|
||||||
AND r10,r14,r12 @ r10= src8
|
AND r10,r14,r12 @ r10= src8
|
||||||
LDR r10,[r13,r10,LSL #2] @ r10= pal[src8]
|
LDR r10,[r13,r10,LSL #2] @ r10= pal[src8]
|
||||||
ADD r6, r6, r7 @ r6 = dst4<<2
|
ADD r6, r6, r7 @ r6 = dst4<<2
|
||||||
AND r6, r8, r6, LSR #2 @ r6 = dst4 (split)
|
AND r6, r8, r6, LSR #2 @ r6 = dst4 (split)
|
||||||
|
@ -354,7 +354,7 @@ xLoop4:
|
||||||
ADD r6, r6, r6, LSL #1 @ r6 = 3*pal[src10]
|
ADD r6, r6, r6, LSL #1 @ r6 = 3*pal[src10]
|
||||||
AND r9, r14,r10 @ r9 = src12
|
AND r9, r14,r10 @ r9 = src12
|
||||||
LDR r9, [r13,r9, LSL #2] @ r9 = pal[src12]
|
LDR r9, [r13,r9, LSL #2] @ r9 = pal[src12]
|
||||||
AND r12,r14,r10,LSR #8 @ r11= src13
|
AND r12,r14,r10,LSR #8 @ r11= src13
|
||||||
LDR r12,[r13,r12,LSL #2] @ r11= pal[src13]
|
LDR r12,[r13,r12,LSL #2] @ r11= pal[src13]
|
||||||
ADD r6, r6, r7 @ r6 = dst8<<2
|
ADD r6, r6, r7 @ r6 = dst8<<2
|
||||||
AND r6, r8, r6, LSR #2 @ r6 = dst8 (split)
|
AND r6, r8, r6, LSR #2 @ r6 = dst8 (split)
|
||||||
|
@ -384,7 +384,7 @@ xLoop4:
|
||||||
ADD r6, r6, r6, LSL #1 @ r6 = 3*pal[src15]
|
ADD r6, r6, r6, LSL #1 @ r6 = 3*pal[src15]
|
||||||
AND r9, r14,r11,LSR #8 @ r9 = src17
|
AND r9, r14,r11,LSR #8 @ r9 = src17
|
||||||
LDR r9, [r13,r9, LSL #2] @ r9 = pal[src17]
|
LDR r9, [r13,r9, LSL #2] @ r9 = pal[src17]
|
||||||
AND r12,r14,r11,LSR #16 @ r11= src18
|
AND r12,r14,r11,LSR #16 @ r11= src18
|
||||||
LDR r12,[r13,r12,LSL #2] @ r11= pal[src18]
|
LDR r12,[r13,r12,LSL #2] @ r11= pal[src18]
|
||||||
ADD r6, r6, r7 @ r6 = dst12<<2
|
ADD r6, r6, r7 @ r6 = dst12<<2
|
||||||
AND r6, r8, r6, LSR #2 @ r6 = dst12 (split)
|
AND r6, r8, r6, LSR #2 @ r6 = dst12 (split)
|
||||||
|
|
|
@ -55,12 +55,12 @@ struct WaveHeader {
|
||||||
} __attribute__ ((packed));
|
} __attribute__ ((packed));
|
||||||
|
|
||||||
struct chunkHeader {
|
struct chunkHeader {
|
||||||
char name[4];
|
char name[4];
|
||||||
u32 size;
|
u32 size;
|
||||||
} __attribute__ ((packed));
|
} __attribute__ ((packed));
|
||||||
|
|
||||||
struct Header {
|
struct Header {
|
||||||
s16 firstSample;
|
s16 firstSample;
|
||||||
char stepTableIndex;
|
char stepTableIndex;
|
||||||
char reserved;
|
char reserved;
|
||||||
} __attribute__ ((packed));
|
} __attribute__ ((packed));
|
||||||
|
|
|
@ -220,7 +220,7 @@ int hBlankCount = 0;
|
||||||
|
|
||||||
gameListType gameList[NUM_SUPPORTED_GAMES] = {
|
gameListType gameList[NUM_SUPPORTED_GAMES] = {
|
||||||
// Unknown game - use normal SCUMM controls
|
// Unknown game - use normal SCUMM controls
|
||||||
{"unknown", CONT_SCUMM_ORIGINAL},
|
{"unknown", CONT_SCUMM_ORIGINAL},
|
||||||
|
|
||||||
// SCUMM games
|
// SCUMM games
|
||||||
{"maniac", CONT_SCUMM_ORIGINAL},
|
{"maniac", CONT_SCUMM_ORIGINAL},
|
||||||
|
@ -1810,7 +1810,7 @@ void VBlankHandler(void) {
|
||||||
if (zooming) {
|
if (zooming) {
|
||||||
subScX = subScTargetX;
|
subScX = subScTargetX;
|
||||||
subScY = subScTargetY;
|
subScY = subScTargetY;
|
||||||
triggerIcon(5);
|
triggerIcon(5);
|
||||||
}
|
}
|
||||||
} else if ( ((subScreenWidth) > 128 - 8) && ((subScreenWidth) < 128 + 8) ) {
|
} else if ( ((subScreenWidth) > 128 - 8) && ((subScreenWidth) < 128 + 8) ) {
|
||||||
subScreenWidth = 128;
|
subScreenWidth = 128;
|
||||||
|
|
|
@ -42,98 +42,98 @@ enum controlType {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct gameListType {
|
struct gameListType {
|
||||||
char gameId[16];
|
char gameId[16];
|
||||||
controlType control;
|
controlType control;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Pen reading functions
|
// Pen reading functions
|
||||||
void penInit();
|
void penInit();
|
||||||
void penUpdate();
|
void penUpdate();
|
||||||
bool getPenDown();
|
bool getPenDown();
|
||||||
bool getPenHeld();
|
bool getPenHeld();
|
||||||
bool getPenReleased();
|
bool getPenReleased();
|
||||||
int getPenX();
|
int getPenX();
|
||||||
int getPenY();
|
int getPenY();
|
||||||
GLvector getPenPos();
|
GLvector getPenPos();
|
||||||
void consumePenEvents();
|
void consumePenEvents();
|
||||||
|
|
||||||
// Pad reading
|
// Pad reading
|
||||||
int getKeysHeld();
|
int getKeysHeld();
|
||||||
void keysUpdate();
|
void keysUpdate();
|
||||||
int getKeysDown();
|
int getKeysDown();
|
||||||
int getKeysReleased();
|
int getKeysReleased();
|
||||||
void consumeKeys();
|
void consumeKeys();
|
||||||
int leftHandedSwap(int keys);
|
int leftHandedSwap(int keys);
|
||||||
|
|
||||||
// Video
|
// Video
|
||||||
void displayMode8Bit(); // Switch to 8-bit mode5
|
void displayMode8Bit(); // Switch to 8-bit mode5
|
||||||
void displayMode16Bit(); // Switch to 16-bit mode5
|
void displayMode16Bit(); // Switch to 16-bit mode5
|
||||||
|
|
||||||
// Flip double buffer
|
// Flip double buffer
|
||||||
void displayMode16BitFlipBuffer();
|
void displayMode16BitFlipBuffer();
|
||||||
|
|
||||||
// Get address of current back buffer
|
// Get address of current back buffer
|
||||||
u16* get16BitBackBuffer();
|
u16* get16BitBackBuffer();
|
||||||
u16* get8BitBackBuffer();
|
u16* get8BitBackBuffer();
|
||||||
|
|
||||||
void setTalkPos(int x, int y);
|
void setTalkPos(int x, int y);
|
||||||
void setTopScreenTarget(int x, int y);
|
void setTopScreenTarget(int x, int y);
|
||||||
void set200PercentFixedScale(bool on);
|
void set200PercentFixedScale(bool on);
|
||||||
|
|
||||||
// Timers
|
// Timers
|
||||||
void setTimerCallback(OSystem_DS::TimerProc proc, int interval); // Setup a callback function at a regular interval
|
void setTimerCallback(OSystem_DS::TimerProc proc, int interval); // Setup a callback function at a regular interval
|
||||||
int getMillis(); // Return the current runtime in milliseconds
|
int getMillis(); // Return the current runtime in milliseconds
|
||||||
void doTimerCallback(); // Call callback function if required
|
void doTimerCallback(); // Call callback function if required
|
||||||
|
|
||||||
// Sound
|
// Sound
|
||||||
void setSoundProc(OSystem_DS::SoundProc proc, void* param); // Setup a callback function for sound
|
void setSoundProc(OSystem_DS::SoundProc proc, void* param); // Setup a callback function for sound
|
||||||
void doSoundCallback(); // Call function if sound buffers need more data
|
void doSoundCallback(); // Call function if sound buffers need more data
|
||||||
void playSound(const void* data, u32 length, bool loop, bool adpcm = false, int rate = 22050); // Start a sound
|
void playSound(const void* data, u32 length, bool loop, bool adpcm = false, int rate = 22050); // Start a sound
|
||||||
void stopSound(int channel);
|
void stopSound(int channel);
|
||||||
int getSoundFrequency();
|
int getSoundFrequency();
|
||||||
|
|
||||||
// Event queue
|
// Event queue
|
||||||
void addEventsToQueue();
|
void addEventsToQueue();
|
||||||
void VBlankHandler();
|
void VBlankHandler();
|
||||||
|
|
||||||
// Sam and Max Stuff
|
// Sam and Max Stuff
|
||||||
void setGameID(int id);
|
void setGameID(int id);
|
||||||
void setCursorIcon(const u8* icon, uint w, uint h, byte keycolor, int hotspotX, int hotspotY);
|
void setCursorIcon(const u8* icon, uint w, uint h, byte keycolor, int hotspotX, int hotspotY);
|
||||||
void setShowCursor(bool enable);
|
void setShowCursor(bool enable);
|
||||||
void setMouseCursorVisible(bool visible);
|
void setMouseCursorVisible(bool visible);
|
||||||
|
|
||||||
// Shake
|
// Shake
|
||||||
void setShakePos(int shakePos);
|
void setShakePos(int shakePos);
|
||||||
|
|
||||||
// Reports
|
// Reports
|
||||||
void memoryReport();
|
void memoryReport();
|
||||||
|
|
||||||
// GBAMP
|
// GBAMP
|
||||||
bool isGBAMPAvailable();
|
bool isGBAMPAvailable();
|
||||||
|
|
||||||
// Sleep (I'd like some of that right now)
|
// Sleep (I'd like some of that right now)
|
||||||
void checkSleepMode();
|
void checkSleepMode();
|
||||||
|
|
||||||
// Virtual keyboard
|
// Virtual keyboard
|
||||||
void setKeyboardIcon(bool enable);
|
void setKeyboardIcon(bool enable);
|
||||||
bool getKeyboardIcon();
|
bool getKeyboardIcon();
|
||||||
void setKeyboardEnable(bool en);
|
void setKeyboardEnable(bool en);
|
||||||
bool getKeyboardEnable();
|
bool getKeyboardEnable();
|
||||||
|
|
||||||
// Options
|
// Options
|
||||||
void setLeftHanded(bool enable);
|
void setLeftHanded(bool enable);
|
||||||
void setTouchXOffset(int x);
|
void setTouchXOffset(int x);
|
||||||
void setTouchYOffset(int y);
|
void setTouchYOffset(int y);
|
||||||
void setUnscaledMode(bool enable);
|
void setUnscaledMode(bool enable);
|
||||||
void setSnapToBorder(bool enable);
|
void setSnapToBorder(bool enable);
|
||||||
void setIndyFightState(bool st);
|
void setIndyFightState(bool st);
|
||||||
bool getIndyFightState();
|
bool getIndyFightState();
|
||||||
bool isCpuScalerEnabled();
|
bool isCpuScalerEnabled();
|
||||||
void setCpuScalerEnable(bool enable);
|
void setCpuScalerEnable(bool enable);
|
||||||
|
|
||||||
// Display
|
// Display
|
||||||
bool getIsDisplayMode8Bit();
|
bool getIsDisplayMode8Bit();
|
||||||
void setGameSize(int width, int height);
|
void setGameSize(int width, int height);
|
||||||
int getGameWidth();
|
int getGameWidth();
|
||||||
int getGameHeight();
|
int getGameHeight();
|
||||||
|
|
||||||
|
|
|
@ -362,7 +362,7 @@ u32 FAT_NextCluster(u32 cluster)
|
||||||
|
|
||||||
if (cluster & 0x01) {
|
if (cluster & 0x01) {
|
||||||
nextCluster = nextCluster >> 4;
|
nextCluster = nextCluster >> 4;
|
||||||
} else {
|
} else {
|
||||||
nextCluster &= 0x0FFF;
|
nextCluster &= 0x0FFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1231,7 +1231,7 @@ bool FAT_GetAlias (char* alias)
|
||||||
// Read in the last accessed directory entry
|
// Read in the last accessed directory entry
|
||||||
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
|
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
|
||||||
|
|
||||||
return FAT_GetFilename (((DIR_ENT*)globalBuffer)[wrkDirOffset], alias);
|
return FAT_GetFilename (((DIR_ENT*)globalBuffer)[wrkDirOffset], alias);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*-----------------------------------------------------------------
|
/*-----------------------------------------------------------------
|
||||||
|
@ -1245,7 +1245,7 @@ u32 FAT_GetFileSize (void)
|
||||||
// Read in the last accessed directory entry
|
// Read in the last accessed directory entry
|
||||||
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
|
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
|
||||||
|
|
||||||
return ((DIR_ENT*)globalBuffer)[wrkDirOffset].fileSize;
|
return ((DIR_ENT*)globalBuffer)[wrkDirOffset].fileSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*-----------------------------------------------------------------
|
/*-----------------------------------------------------------------
|
||||||
|
@ -1258,7 +1258,7 @@ u32 FAT_GetFileCluster (void)
|
||||||
// Read in the last accessed directory entry
|
// Read in the last accessed directory entry
|
||||||
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
|
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
|
||||||
|
|
||||||
return (((DIR_ENT*)globalBuffer)[wrkDirOffset].startCluster) | (((DIR_ENT*)globalBuffer)[wrkDirOffset].startClusterHigh << 16);
|
return (((DIR_ENT*)globalBuffer)[wrkDirOffset].startCluster) | (((DIR_ENT*)globalBuffer)[wrkDirOffset].startClusterHigh << 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*-----------------------------------------------------------------
|
/*-----------------------------------------------------------------
|
||||||
|
@ -1271,7 +1271,7 @@ u8 FAT_GetFileAttributes (void)
|
||||||
// Read in the last accessed directory entry
|
// Read in the last accessed directory entry
|
||||||
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
|
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
|
||||||
|
|
||||||
return ((DIR_ENT*)globalBuffer)[wrkDirOffset].attrib;
|
return ((DIR_ENT*)globalBuffer)[wrkDirOffset].attrib;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CAN_WRITE_TO_DISC
|
#ifdef CAN_WRITE_TO_DISC
|
||||||
|
@ -1297,7 +1297,7 @@ u8 FAT_SetFileAttributes (const char* filename, u8 attributes, u8 mask)
|
||||||
|
|
||||||
disc_WriteSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
|
disc_WriteSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
|
||||||
|
|
||||||
return ((DIR_ENT*)globalBuffer)[wrkDirOffset].attrib;
|
return ((DIR_ENT*)globalBuffer)[wrkDirOffset].attrib;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1327,7 +1327,7 @@ time_t FAT_GetFileCreationTime (void)
|
||||||
// Read in the last accessed directory entry
|
// Read in the last accessed directory entry
|
||||||
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
|
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
|
||||||
|
|
||||||
return FAT_FileTimeToCTime(((DIR_ENT*)globalBuffer)[wrkDirOffset].cTime, ((DIR_ENT*)globalBuffer)[wrkDirOffset].cDate);
|
return FAT_FileTimeToCTime(((DIR_ENT*)globalBuffer)[wrkDirOffset].cTime, ((DIR_ENT*)globalBuffer)[wrkDirOffset].cDate);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*-----------------------------------------------------------------
|
/*-----------------------------------------------------------------
|
||||||
|
@ -1340,7 +1340,7 @@ time_t FAT_GetFileLastWriteTime (void)
|
||||||
// Read in the last accessed directory entry
|
// Read in the last accessed directory entry
|
||||||
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
|
disc_ReadSector ((wrkDirCluster == FAT16_ROOT_DIR_CLUSTER ? filesysRootDir : FAT_ClustToSect(wrkDirCluster)) + wrkDirSector, globalBuffer);
|
||||||
|
|
||||||
return FAT_FileTimeToCTime(((DIR_ENT*)globalBuffer)[wrkDirOffset].mTime, ((DIR_ENT*)globalBuffer)[wrkDirOffset].mDate);
|
return FAT_FileTimeToCTime(((DIR_ENT*)globalBuffer)[wrkDirOffset].mTime, ((DIR_ENT*)globalBuffer)[wrkDirOffset].mDate);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
.byte 0x01 @ Version number
|
.byte 0x01 @ Version number
|
||||||
.byte 0x0F @32KiB @ Log [base-2] of the size of this driver in bytes.
|
.byte 0x0F @32KiB @ Log [base-2] of the size of this driver in bytes.
|
||||||
.byte 0x00 @ Sections to fix
|
.byte 0x00 @ Sections to fix
|
||||||
.byte 0x0F @32KiB @ Log [base-2] of the allocated space in bytes.
|
.byte 0x0F @32KiB @ Log [base-2] of the allocated space in bytes.
|
||||||
|
|
||||||
@---------------------------------------------------------------------------------
|
@---------------------------------------------------------------------------------
|
||||||
@ Text identifier - can be anything up to 47 chars + terminating null -- 16 bytes
|
@ Text identifier - can be anything up to 47 chars + terminating null -- 16 bytes
|
||||||
|
|
|
@ -445,7 +445,7 @@ static bool _NJSD_cardInit (void) {
|
||||||
_NJSD_sendCLK (SD_CLK_200KHz, 8);
|
_NJSD_sendCLK (SD_CLK_200KHz, 8);
|
||||||
|
|
||||||
_NJSD_sendCLK (SD_CLK_200KHz, 256);
|
_NJSD_sendCLK (SD_CLK_200KHz, 256);
|
||||||
_NJSD_sendCMDN (SD_CLK_200KHz, GO_IDLE_STATE, 0);
|
_NJSD_sendCMDN (SD_CLK_200KHz, GO_IDLE_STATE, 0);
|
||||||
_NJSD_sendCLK (SD_CLK_200KHz, 8);
|
_NJSD_sendCLK (SD_CLK_200KHz, 8);
|
||||||
|
|
||||||
for (i = 0; i < MAX_STARTUP_TRIES ; i++) {
|
for (i = 0; i < MAX_STARTUP_TRIES ; i++) {
|
||||||
|
@ -473,7 +473,7 @@ static bool _NJSD_cardInit (void) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (i >= MAX_STARTUP_TRIES) {
|
if (i >= MAX_STARTUP_TRIES) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -525,7 +525,7 @@ bool _NJSD_startup(void) {
|
||||||
|
|
||||||
|
|
||||||
bool _NJSD_writeSectors (u32 sector, u32 numSectors, const void* buffer) {
|
bool _NJSD_writeSectors (u32 sector, u32 numSectors, const void* buffer) {
|
||||||
u8 crc[8];
|
u8 crc[8];
|
||||||
u32 offset = sector * BYTES_PER_READ;
|
u32 offset = sector * BYTES_PER_READ;
|
||||||
u8* data = (u8*) buffer;
|
u8* data = (u8*) buffer;
|
||||||
|
|
||||||
|
|
|
@ -73,7 +73,7 @@ static inline void Neo_MK2GameMode() {
|
||||||
static inline void Neo_EnableEEPROM( bool enable ) {
|
static inline void Neo_EnableEEPROM( bool enable ) {
|
||||||
Neo_OpenSPI(spi_freq);
|
Neo_OpenSPI(spi_freq);
|
||||||
if(enable) Neo_SPI(0x06);
|
if(enable) Neo_SPI(0x06);
|
||||||
else Neo_SPI(0x0E);
|
else Neo_SPI(0x0E);
|
||||||
Neo_CloseSPI();
|
Neo_CloseSPI();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -294,7 +294,7 @@ bool NMMC_WriteSectors (u32 sector, u8 numSecs, void* buffer)
|
||||||
Neo_SPI( 0xFF ); // Send fake CRC16
|
Neo_SPI( 0xFF ); // Send fake CRC16
|
||||||
Neo_SPI( 0xFF ); // Send fake CRC16
|
Neo_SPI( 0xFF ); // Send fake CRC16
|
||||||
|
|
||||||
Neo_SPI (0xFF); // Send 8 clocks
|
Neo_SPI (0xFF); // Send 8 clocks
|
||||||
while( Neo_SPI( 0xFF ) == 0x00 ); // Wait for the busy signal to clear
|
while( Neo_SPI( 0xFF ) == 0x00 ); // Wait for the busy signal to clear
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -169,7 +169,7 @@ bool _SD_InitCard (_SD_FN_CMD_6BYTE_RESPONSE cmd_6byte_response,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (i >= MAX_STARTUP_TRIES) {
|
if (i >= MAX_STARTUP_TRIES) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -194,7 +194,7 @@ void drawKeyboard(int tileBase, int mapBase, u16* saveSpace) {
|
||||||
for (int y = 0 ; y < 8; y++) {
|
for (int y = 0 ; y < 8; y++) {
|
||||||
for (int x = 0; x < 2; x++) {
|
for (int x = 0; x < 2; x++) {
|
||||||
*(tileAddr + (y * 2) + x) =(*(src + (y * 752) + (x * 4) + 0) & 0x0F)
|
*(tileAddr + (y * 2) + x) =(*(src + (y * 752) + (x * 4) + 0) & 0x0F)
|
||||||
| ((*(src + (y * 752) + (x * 4) + 1) & 0x0F) << 4)
|
| ((*(src + (y * 752) + (x * 4) + 1) & 0x0F) << 4)
|
||||||
| ((*(src + (y * 752) + (x * 4) + 2) & 0x0F) << 8)
|
| ((*(src + (y * 752) + (x * 4) + 2) & 0x0F) << 8)
|
||||||
| ((*(src + (y * 752) + (x * 4) + 3) & 0x0F) << 12);
|
| ((*(src + (y * 752) + (x * 4) + 3) & 0x0F) << 12);
|
||||||
|
|
||||||
|
@ -317,7 +317,7 @@ void clearAutoComplete() {
|
||||||
|
|
||||||
void typeCompletion(int current) {
|
void typeCompletion(int current) {
|
||||||
Common::Event event;
|
Common::Event event;
|
||||||
OSystem_DS* system = OSystem_DS::instance();
|
OSystem_DS* system = OSystem_DS::instance();
|
||||||
|
|
||||||
strcat(autoCompleteBuffer, &autoCompleteWord[current][charactersEntered]);
|
strcat(autoCompleteBuffer, &autoCompleteWord[current][charactersEntered]);
|
||||||
strcat(autoCompleteBuffer, " ");
|
strcat(autoCompleteBuffer, " ");
|
||||||
|
@ -350,7 +350,7 @@ void updateTypeEvents()
|
||||||
if (autoCompleteBuffer[0] != '\0')
|
if (autoCompleteBuffer[0] != '\0')
|
||||||
{
|
{
|
||||||
Common::Event event;
|
Common::Event event;
|
||||||
OSystem_DS* system = OSystem_DS::instance();
|
OSystem_DS* system = OSystem_DS::instance();
|
||||||
|
|
||||||
event.kbd.keycode = (Common::KeyCode) autoCompleteBuffer[0];
|
event.kbd.keycode = (Common::KeyCode) autoCompleteBuffer[0];
|
||||||
event.kbd.ascii = autoCompleteBuffer[0];
|
event.kbd.ascii = autoCompleteBuffer[0];
|
||||||
|
@ -433,7 +433,7 @@ void addKeyboardEvents() {
|
||||||
for (int r = 0; r < DS_NUM_KEYS; r++) {
|
for (int r = 0; r < DS_NUM_KEYS; r++) {
|
||||||
if (( (tx >= keys[r].x) && (tx <= keys[r].x + 1)) &&
|
if (( (tx >= keys[r].x) && (tx <= keys[r].x + 1)) &&
|
||||||
(ty >= keys[r].y) && (ty <= keys[r].y + 1)) {
|
(ty >= keys[r].y) && (ty <= keys[r].y + 1)) {
|
||||||
OSystem_DS* system = OSystem_DS::instance();
|
OSystem_DS* system = OSystem_DS::instance();
|
||||||
Common::Event event;
|
Common::Event event;
|
||||||
|
|
||||||
// consolePrintf("Key: %d\n", r);
|
// consolePrintf("Key: %d\n", r);
|
||||||
|
@ -491,7 +491,7 @@ void addKeyboardEvents() {
|
||||||
if (keys[r].pressed) {
|
if (keys[r].pressed) {
|
||||||
DS::setKeyHighlight(r, false);
|
DS::setKeyHighlight(r, false);
|
||||||
|
|
||||||
OSystem_DS* system = OSystem_DS::instance();
|
OSystem_DS* system = OSystem_DS::instance();
|
||||||
|
|
||||||
Common::Event event;
|
Common::Event event;
|
||||||
createKeyEvent(r, event);
|
createKeyEvent(r, event);
|
||||||
|
|
|
@ -98,7 +98,7 @@ bool ZipFile::currentFileInFolder() {
|
||||||
|
|
||||||
if (_directory[0] == 0) { // Root directory
|
if (_directory[0] == 0) { // Root directory
|
||||||
name[strlen(name) - 1] = 0;
|
name[strlen(name) - 1] = 0;
|
||||||
return !strchr(name, '\\'); // Not in root if contains a / character before the last character
|
return !strchr(name, '\\'); // Not in root if contains a / character before the last character
|
||||||
} else {
|
} else {
|
||||||
/* if (name starts with directory && it's not the directory
|
/* if (name starts with directory && it's not the directory
|
||||||
&& (no slashes after the directory || it's the last character)
|
&& (no slashes after the directory || it's the last character)
|
||||||
|
@ -170,7 +170,7 @@ int ZipFile::getFileSize() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ZipFile::isDirectory() {
|
bool ZipFile::isDirectory() {
|
||||||
return _currentFile->fileSize == 0; // This is a bit wrong, but seems to work.
|
return _currentFile->fileSize == 0; // This is a bit wrong, but seems to work.
|
||||||
}
|
}
|
||||||
|
|
||||||
char* ZipFile::getFile() {
|
char* ZipFile::getFile() {
|
||||||
|
|
|
@ -214,7 +214,7 @@ void OSystem_GP2X::moveStick() {
|
||||||
} else if ((stickBtn[3])||(stickBtn[4])||(stickBtn[5])){
|
} else if ((stickBtn[3])||(stickBtn[4])||(stickBtn[5])){
|
||||||
if (_km.y_down_count!=2){
|
if (_km.y_down_count!=2){
|
||||||
_km.y_vel = 1;
|
_km.y_vel = 1;
|
||||||
_km.y_down_count = 1;
|
_km.y_down_count = 1;
|
||||||
}else
|
}else
|
||||||
_km.y_vel = 4;
|
_km.y_vel = 4;
|
||||||
}
|
}
|
||||||
|
@ -297,7 +297,7 @@ bool OSystem_GP2X::pollEvent(Common::Event &event) {
|
||||||
Combos:
|
Combos:
|
||||||
|
|
||||||
GP2X_BUTTON_VOLUP & GP2X_BUTTON_VOLDOWN 0 (For Monkey 2 CP)
|
GP2X_BUTTON_VOLUP & GP2X_BUTTON_VOLDOWN 0 (For Monkey 2 CP)
|
||||||
GP2X_BUTTON_L & GP2X_BUTTON_SELECT Common::EVENT_QUIT (Calls Sync() to make sure SD is flushed)
|
GP2X_BUTTON_L & GP2X_BUTTON_SELECT Common::EVENT_QUIT (Calls Sync() to make sure SD is flushed)
|
||||||
GP2X_BUTTON_L & GP2X_BUTTON_Y Toggles setZoomOnMouse() for larger then 320*240 games to scale to the point + raduis.
|
GP2X_BUTTON_L & GP2X_BUTTON_Y Toggles setZoomOnMouse() for larger then 320*240 games to scale to the point + raduis.
|
||||||
GP2X_BUTTON_L & GP2X_BUTTON_A Common::EVENT_PREDICTIVE_DIALOG for predictive text entry box (AGI games)
|
GP2X_BUTTON_L & GP2X_BUTTON_A Common::EVENT_PREDICTIVE_DIALOG for predictive text entry box (AGI games)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -309,7 +309,7 @@ protected:
|
||||||
int16 x, y;
|
int16 x, y;
|
||||||
|
|
||||||
// The size and hotspot of the original cursor image.
|
// The size and hotspot of the original cursor image.
|
||||||
int16 w, h;
|
int16 w, h;
|
||||||
int16 hotX, hotY;
|
int16 hotX, hotY;
|
||||||
|
|
||||||
// The size and hotspot of the pre-scaled cursor image, in real
|
// The size and hotspot of the pre-scaled cursor image, in real
|
||||||
|
|
|
@ -1222,29 +1222,29 @@ void OSystem_GP2X::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x
|
||||||
|
|
||||||
_mouseKeyColor = keycolor;
|
_mouseKeyColor = keycolor;
|
||||||
|
|
||||||
_cursorTargetScale = cursorTargetScale;
|
_cursorTargetScale = cursorTargetScale;
|
||||||
|
|
||||||
if (_mouseCurState.w != (int)w || _mouseCurState.h != (int)h) {
|
if (_mouseCurState.w != (int)w || _mouseCurState.h != (int)h) {
|
||||||
_mouseCurState.w = w;
|
_mouseCurState.w = w;
|
||||||
_mouseCurState.h = h;
|
_mouseCurState.h = h;
|
||||||
|
|
||||||
if (_mouseOrigSurface)
|
if (_mouseOrigSurface)
|
||||||
SDL_FreeSurface(_mouseOrigSurface);
|
SDL_FreeSurface(_mouseOrigSurface);
|
||||||
|
|
||||||
// Allocate bigger surface because AdvMame2x adds black pixel at [0,0]
|
// Allocate bigger surface because AdvMame2x adds black pixel at [0,0]
|
||||||
_mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA,
|
_mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA,
|
||||||
_mouseCurState.w + 2,
|
_mouseCurState.w + 2,
|
||||||
_mouseCurState.h + 2,
|
_mouseCurState.h + 2,
|
||||||
16,
|
16,
|
||||||
_hwscreen->format->Rmask,
|
_hwscreen->format->Rmask,
|
||||||
_hwscreen->format->Gmask,
|
_hwscreen->format->Gmask,
|
||||||
_hwscreen->format->Bmask,
|
_hwscreen->format->Bmask,
|
||||||
_hwscreen->format->Amask);
|
_hwscreen->format->Amask);
|
||||||
|
|
||||||
if (_mouseOrigSurface == NULL)
|
if (_mouseOrigSurface == NULL)
|
||||||
error("allocating _mouseOrigSurface failed");
|
error("allocating _mouseOrigSurface failed");
|
||||||
SDL_SetColorKey(_mouseOrigSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
|
SDL_SetColorKey(_mouseOrigSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
free(_mouseData);
|
free(_mouseData);
|
||||||
|
|
||||||
|
@ -1260,7 +1260,7 @@ void OSystem_GP2X::blitCursor() {
|
||||||
int w, h, i, j;
|
int w, h, i, j;
|
||||||
|
|
||||||
if (!_mouseOrigSurface || !_mouseData)
|
if (!_mouseOrigSurface || !_mouseData)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
w = _mouseCurState.w;
|
w = _mouseCurState.w;
|
||||||
h = _mouseCurState.h;
|
h = _mouseCurState.h;
|
||||||
|
@ -1297,7 +1297,7 @@ void OSystem_GP2X::blitCursor() {
|
||||||
srcPtr++;
|
srcPtr++;
|
||||||
}
|
}
|
||||||
dstPtr += _mouseOrigSurface->pitch - w * 2;
|
dstPtr += _mouseOrigSurface->pitch - w * 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
int rW, rH;
|
int rW, rH;
|
||||||
|
|
||||||
|
@ -1338,7 +1338,7 @@ void OSystem_GP2X::blitCursor() {
|
||||||
_mouseCurState.vH = h;
|
_mouseCurState.vH = h;
|
||||||
_mouseCurState.vHotX = _mouseCurState.hotX;
|
_mouseCurState.vHotX = _mouseCurState.hotX;
|
||||||
_mouseCurState.vHotY = _mouseCurState.hotY;
|
_mouseCurState.vHotY = _mouseCurState.hotY;
|
||||||
}
|
}
|
||||||
|
|
||||||
int rH1 = rH; // store original to pass to aspect-correction function later
|
int rH1 = rH; // store original to pass to aspect-correction function later
|
||||||
if (_adjustAspectRatio && _cursorTargetScale == 1) {
|
if (_adjustAspectRatio && _cursorTargetScale == 1) {
|
||||||
|
@ -1366,7 +1366,7 @@ void OSystem_GP2X::blitCursor() {
|
||||||
error("allocating _mouseSurface failed");
|
error("allocating _mouseSurface failed");
|
||||||
|
|
||||||
SDL_SetColorKey(_mouseSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
|
SDL_SetColorKey(_mouseSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_LockSurface(_mouseSurface);
|
SDL_LockSurface(_mouseSurface);
|
||||||
|
|
||||||
|
@ -1429,7 +1429,7 @@ void OSystem_GP2X::undrawMouse() {
|
||||||
void OSystem_GP2X::drawMouse() {
|
void OSystem_GP2X::drawMouse() {
|
||||||
if (!_mouseVisible || !_mouseSurface) {
|
if (!_mouseVisible || !_mouseSurface) {
|
||||||
_mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0;
|
_mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_Rect zoomdst;
|
SDL_Rect zoomdst;
|
||||||
|
|
|
@ -56,7 +56,7 @@ GPSDK = /usr/compat/gp32/share/sdk
|
||||||
|
|
||||||
LDSPECS = -specs=gp32_gpsdk.specs
|
LDSPECS = -specs=gp32_gpsdk.specs
|
||||||
|
|
||||||
LDFLAGS = $(STRIP_DEBUG) -Wl,-Map,$(MAPFILE) $(LDSPECS) -Wl,--no-warn-mismatch
|
LDFLAGS = $(STRIP_DEBUG) -Wl,-Map,$(MAPFILE) $(LDSPECS) -Wl,--no-warn-mismatch
|
||||||
|
|
||||||
LIBS += -L$(GPSDK)/lib \
|
LIBS += -L$(GPSDK)/lib \
|
||||||
-lgpmem -lgpos -lgpstdio -lgpstdlib -lgpsound -lgpgraphic -lgpfont \
|
-lgpmem -lgpos -lgpstdio -lgpstdlib -lgpsound -lgpgraphic -lgpfont \
|
||||||
|
@ -75,7 +75,7 @@ FXE = scummvm.fxe
|
||||||
# Plugins hack
|
# Plugins hack
|
||||||
srcdir = ./
|
srcdir = ./
|
||||||
|
|
||||||
DEFINES = -D__GP32__
|
DEFINES = -D__GP32__
|
||||||
DEFINES += -DNONSTANDARD_PORT
|
DEFINES += -DNONSTANDARD_PORT
|
||||||
|
|
||||||
# Disable new themes. GP32 has LOW memory!
|
# Disable new themes. GP32 has LOW memory!
|
||||||
|
@ -132,7 +132,7 @@ OBJS += backends/platform/gp32/gp32std.o \
|
||||||
#backends/platform/gp32/dmaaudio.o \
|
#backends/platform/gp32/dmaaudio.o \
|
||||||
|
|
||||||
#Main ScummVM for the GP32 Backend
|
#Main ScummVM for the GP32 Backend
|
||||||
OBJS += backends/platform/gp32/gp32_main.o \
|
OBJS += backends/platform/gp32/gp32_main.o \
|
||||||
backends/platform/gp32/gp32_launcher.o \
|
backends/platform/gp32/gp32_launcher.o \
|
||||||
backends/platform/gp32/gp32_osys.o \
|
backends/platform/gp32/gp32_osys.o \
|
||||||
backends/fs/gp32/gp32-fs.o
|
backends/fs/gp32/gp32-fs.o
|
||||||
|
|
|
@ -141,7 +141,7 @@ static char * arm_register_name_strings[] =
|
||||||
// Some USB stuff
|
// Some USB stuff
|
||||||
GPN_DESC g_CommDesc;
|
GPN_DESC g_CommDesc;
|
||||||
GPN_COMM g_Comm;
|
GPN_COMM g_Comm;
|
||||||
const char HexDigits[17] = "0123456789abcdef";
|
const char HexDigits[17] = "0123456789abcdef";
|
||||||
char g_SendBuffer[256];
|
char g_SendBuffer[256];
|
||||||
char g_TempBuffer[256];
|
char g_TempBuffer[256];
|
||||||
char g_ReadBuffer[0x100];
|
char g_ReadBuffer[0x100];
|
||||||
|
@ -592,7 +592,7 @@ int GetBytes(char *pBuffer)
|
||||||
void SendMemory(void *pAddr, int iBytes)
|
void SendMemory(void *pAddr, int iBytes)
|
||||||
{
|
{
|
||||||
unsigned char *pData;
|
unsigned char *pData;
|
||||||
unsigned char iData;
|
unsigned char iData;
|
||||||
int iBufferPos = 0;
|
int iBufferPos = 0;
|
||||||
int iBytesToSend;
|
int iBytesToSend;
|
||||||
char Byte;
|
char Byte;
|
||||||
|
@ -1016,7 +1016,7 @@ void BreakPoint()
|
||||||
int iResult;
|
int iResult;
|
||||||
int iMessageLength;
|
int iMessageLength;
|
||||||
int iOffsetAdd;
|
int iOffsetAdd;
|
||||||
int iNullVal = 0;
|
int iNullVal = 0;
|
||||||
void *pAddr;
|
void *pAddr;
|
||||||
int iOffset;
|
int iOffset;
|
||||||
int iBytes;
|
int iBytes;
|
||||||
|
@ -1871,7 +1871,7 @@ unsigned int DecodeLSRO(lsro Instr, unsigned int uiPC)
|
||||||
unsigned int DecodeLSM(lsm Instr, unsigned int uiPC)
|
unsigned int DecodeLSM(lsm Instr, unsigned int uiPC)
|
||||||
{
|
{
|
||||||
unsigned int uiRnValue = g_Registers[Instr.Rn];
|
unsigned int uiRnValue = g_Registers[Instr.Rn];
|
||||||
unsigned int uiOffsetToPC = 0;
|
unsigned int uiOffsetToPC = 0;
|
||||||
unsigned int uiMemValue;
|
unsigned int uiMemValue;
|
||||||
|
|
||||||
// Make sure PC is destination and it's Load instruction
|
// Make sure PC is destination and it's Load instruction
|
||||||
|
|
|
@ -30,6 +30,6 @@ extern void * gp_memcpy(void *dst, const void *src, size_t count);
|
||||||
extern void * gp_memset(void *dst, int val, size_t count);
|
extern void * gp_memset(void *dst, int val, size_t count);
|
||||||
extern void * gp_malloc(size_t size);
|
extern void * gp_malloc(size_t size);
|
||||||
extern void * gp_calloc(size_t nitems, size_t size);
|
extern void * gp_calloc(size_t nitems, size_t size);
|
||||||
extern void gp_free(void *block);
|
extern void gp_free(void *block);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
|
|
||||||
- (id)initWithKeyboard:(SoftKeyboard*)keyboard; {
|
- (id)initWithKeyboard:(SoftKeyboard*)keyboard; {
|
||||||
self = [super initWithFrame:CGRectMake(0.0f, 0.0f, 0.0f, 0.0f)];
|
self = [super initWithFrame:CGRectMake(0.0f, 0.0f, 0.0f, 0.0f)];
|
||||||
softKeyboard = keyboard;
|
softKeyboard = keyboard;
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -85,4 +85,4 @@
|
||||||
[inputDelegate handleKeyPress:c];
|
[inputDelegate handleKeyPress:c];
|
||||||
}
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
|
@ -70,7 +70,7 @@ void iPhone_initSurface(int width, int height, bool landscape) {
|
||||||
_height = height;
|
_height = height;
|
||||||
_landscape = landscape;
|
_landscape = landscape;
|
||||||
|
|
||||||
[sharedInstance performSelectorOnMainThread:@selector(initSurface) withObject:nil waitUntilDone: YES];
|
[sharedInstance performSelectorOnMainThread:@selector(initSurface) withObject:nil waitUntilDone: YES];
|
||||||
}
|
}
|
||||||
|
|
||||||
bool iPhone_fetchEvent(int *outEvent, float *outX, float *outY) {
|
bool iPhone_fetchEvent(int *outEvent, float *outX, float *outY) {
|
||||||
|
@ -134,14 +134,14 @@ bool getLocalMouseCoords(CGPoint *point) {
|
||||||
|
|
||||||
- (void)drawRect:(CGRect)frame {
|
- (void)drawRect:(CGRect)frame {
|
||||||
// if (lastTick == 0) {
|
// if (lastTick == 0) {
|
||||||
// lastTick = time(0);
|
// lastTick = time(0);
|
||||||
// }
|
// }
|
||||||
//
|
//
|
||||||
// frames++;
|
// frames++;
|
||||||
// if (time(0) > lastTick) {
|
// if (time(0) > lastTick) {
|
||||||
// lastTick = time(0);
|
// lastTick = time(0);
|
||||||
// printf("FPS: %i\n", frames);
|
// printf("FPS: %i\n", frames);
|
||||||
// frames = 0;
|
// frames = 0;
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -336,25 +336,25 @@ bool getLocalMouseCoords(CGPoint *point) {
|
||||||
// struct CGPoint point = GSEventGetLocationInWindow(event);
|
// struct CGPoint point = GSEventGetLocationInWindow(event);
|
||||||
//
|
//
|
||||||
// if (!getLocalMouseCoords(&point))
|
// if (!getLocalMouseCoords(&point))
|
||||||
// return;
|
// return;
|
||||||
//
|
//
|
||||||
// [self addEvent:
|
// [self addEvent:
|
||||||
// [[NSDictionary alloc] initWithObjectsAndKeys:
|
// [[NSDictionary alloc] initWithObjectsAndKeys:
|
||||||
// [NSNumber numberWithInt:kInputMouseSecondToggled], @"type",
|
// [NSNumber numberWithInt:kInputMouseSecondToggled], @"type",
|
||||||
// [NSNumber numberWithFloat:point.x], @"x",
|
// [NSNumber numberWithFloat:point.x], @"x",
|
||||||
// [NSNumber numberWithFloat:point.y], @"y",
|
// [NSNumber numberWithFloat:point.y], @"y",
|
||||||
// nil
|
// nil
|
||||||
// ]
|
// ]
|
||||||
// ];
|
// ];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)mouseExited:(GSEvent*)event {
|
- (void)mouseExited:(GSEvent*)event {
|
||||||
//printf("mouseExited().\n");
|
//printf("mouseExited().\n");
|
||||||
// [self addEvent:
|
// [self addEvent:
|
||||||
// [[NSDictionary alloc] initWithObjectsAndKeys:
|
// [[NSDictionary alloc] initWithObjectsAndKeys:
|
||||||
// @"mouseExited", @"type",
|
// @"mouseExited", @"type",
|
||||||
// nil
|
// nil
|
||||||
// ]
|
// ]
|
||||||
// ];
|
// ];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -728,7 +728,7 @@ bool OSystem_IPHONE::pollEvent(Common::Event &event) {
|
||||||
//printf("Mouse dragged at (%u, %u)\n", x, y);
|
//printf("Mouse dragged at (%u, %u)\n", x, y);
|
||||||
if (_secondaryTapped) {
|
if (_secondaryTapped) {
|
||||||
if (_gestureStartX == -1 || _gestureStartY == -1) {
|
if (_gestureStartX == -1 || _gestureStartY == -1) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
int vecX = (x - _gestureStartX);
|
int vecX = (x - _gestureStartX);
|
||||||
|
|
|
@ -465,7 +465,7 @@ void OSystem_PS2::soundThread(void) {
|
||||||
" addiu $t8, 32\n\t"
|
" addiu $t8, 32\n\t"
|
||||||
" bnez $t9, loop\n\t" // loop
|
" bnez $t9, loop\n\t" // loop
|
||||||
: // outputs
|
: // outputs
|
||||||
: "r"(soundBufL), "r"(soundBufR) // inputs
|
: "r"(soundBufL), "r"(soundBufR) // inputs
|
||||||
// : "$t2", "$t3", "$t4", "$t5", "$t6", "$t7", "$t8", "$t9" // destroyed
|
// : "$t2", "$t3", "$t4", "$t5", "$t6", "$t7", "$t8", "$t9" // destroyed
|
||||||
: "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25" // destroyed
|
: "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25" // destroyed
|
||||||
);
|
);
|
||||||
|
|
|
@ -20,8 +20,8 @@ LD = psp-gcc
|
||||||
AR = psp-ar cru
|
AR = psp-ar cru
|
||||||
RANLIB = psp-ranlib
|
RANLIB = psp-ranlib
|
||||||
STRIP = psp-strip
|
STRIP = psp-strip
|
||||||
MKDIR = mkdir -p
|
MKDIR = mkdir -p
|
||||||
RM = rm -f
|
RM = rm -f
|
||||||
MKSFO = mksfo
|
MKSFO = mksfo
|
||||||
PACK_PBP = pack-pbp
|
PACK_PBP = pack-pbp
|
||||||
FIXUP = psp-fixup-imports
|
FIXUP = psp-fixup-imports
|
||||||
|
|
|
@ -12,12 +12,12 @@ Installation
|
||||||
Controls
|
Controls
|
||||||
========
|
========
|
||||||
|
|
||||||
Left trigger - ESC
|
Left trigger - ESC
|
||||||
Right trigger - Enter
|
Right trigger - Enter
|
||||||
Analog - Mouse movement
|
Analog - Mouse movement
|
||||||
Directionals - Mouse movement
|
Directionals - Mouse movement
|
||||||
Analog + triangle - Fine control mouse
|
Analog + triangle - Fine control mouse
|
||||||
Cross - Mouse button 1
|
Cross - Mouse button 1
|
||||||
Circle - Mouse button 2
|
Circle - Mouse button 2
|
||||||
Square - '.' (skip dialogue in some games)
|
Square - '.' (skip dialogue in some games)
|
||||||
Select - Show/Hide Virtual Keyboard
|
Select - Show/Hide Virtual Keyboard
|
||||||
|
@ -76,9 +76,9 @@ To build ScummVM for PSP you need:
|
||||||
|
|
||||||
- PSP toolchain (svn co svn://svn.pspdev.org/psp/trunk/psptoolchain)
|
- PSP toolchain (svn co svn://svn.pspdev.org/psp/trunk/psptoolchain)
|
||||||
|
|
||||||
- PSPSDK (svn co svn://svn.pspdev.org/psp/trunk/pspsdk)
|
- PSPSDK (svn co svn://svn.pspdev.org/psp/trunk/pspsdk)
|
||||||
Note: This usually gets installed by the PSP toolchain,
|
Note: This usually gets installed by the PSP toolchain,
|
||||||
so you don't have to do it manually.
|
so you don't have to do it manually.
|
||||||
|
|
||||||
- SDL (svn co svn://svn.pspdev.org/psp/trunk/SDL)
|
- SDL (svn co svn://svn.pspdev.org/psp/trunk/SDL)
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ unsigned char kbd_ascii_cl[] = {'!', '@', '#', '$', '%', '^', '&', '*', '(', ')'
|
||||||
Common::KeyCode kbd_code_cl[] = {Common::KEYCODE_EXCLAIM, Common::KEYCODE_AT, Common::KEYCODE_HASH, Common::KEYCODE_DOLLAR, (Common::KeyCode)37, Common::KEYCODE_CARET, Common::KEYCODE_AMPERSAND, Common::KEYCODE_ASTERISK, Common::KEYCODE_LEFTPAREN, Common::KEYCODE_RIGHTPAREN, Common::KEYCODE_UNDERSCORE,
|
Common::KeyCode kbd_code_cl[] = {Common::KEYCODE_EXCLAIM, Common::KEYCODE_AT, Common::KEYCODE_HASH, Common::KEYCODE_DOLLAR, (Common::KeyCode)37, Common::KEYCODE_CARET, Common::KEYCODE_AMPERSAND, Common::KEYCODE_ASTERISK, Common::KEYCODE_LEFTPAREN, Common::KEYCODE_RIGHTPAREN, Common::KEYCODE_UNDERSCORE,
|
||||||
Common::KEYCODE_PLUS, (Common::KeyCode)123, (Common::KeyCode)125, (Common::KeyCode)124, Common::KEYCODE_COLON, Common::KEYCODE_QUOTEDBL, Common::KEYCODE_LESS, Common::KEYCODE_GREATER, Common::KEYCODE_QUESTION, (Common::KeyCode)126};
|
Common::KEYCODE_PLUS, (Common::KeyCode)123, (Common::KeyCode)125, (Common::KeyCode)124, Common::KEYCODE_COLON, Common::KEYCODE_QUOTEDBL, Common::KEYCODE_LESS, Common::KEYCODE_GREATER, Common::KEYCODE_QUESTION, (Common::KeyCode)126};
|
||||||
#define CAPS_LOCK (1 << 0)
|
#define CAPS_LOCK (1 << 0)
|
||||||
#define SYMBOLS (1 << 1)
|
#define SYMBOLS (1 << 1)
|
||||||
|
|
||||||
|
|
||||||
OSystem_PSP_GU::OSystem_PSP_GU() {
|
OSystem_PSP_GU::OSystem_PSP_GU() {
|
||||||
|
@ -278,9 +278,9 @@ void OSystem_PSP_GU::updateScreen() {
|
||||||
sceGuClutLoad(32, clut256); // upload 32*8 entries (256)
|
sceGuClutLoad(32, clut256); // upload 32*8 entries (256)
|
||||||
sceGuTexMode(GU_PSM_T8, 0, 0, 0); // 8-bit image
|
sceGuTexMode(GU_PSM_T8, 0, 0, 0); // 8-bit image
|
||||||
if (_screenWidth == 320)
|
if (_screenWidth == 320)
|
||||||
sceGuTexImage(0, 512, 256, _screenWidth, _offscreen);
|
sceGuTexImage(0, 512, 256, _screenWidth, _offscreen);
|
||||||
else
|
else
|
||||||
sceGuTexImage(0, 512, 512, _screenWidth, _offscreen);
|
sceGuTexImage(0, 512, 512, _screenWidth, _offscreen);
|
||||||
sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGB);
|
sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGB);
|
||||||
sceGuTexFilter(GU_LINEAR, GU_LINEAR);
|
sceGuTexFilter(GU_LINEAR, GU_LINEAR);
|
||||||
sceGuTexOffset(0,0);
|
sceGuTexOffset(0,0);
|
||||||
|
@ -349,7 +349,7 @@ void OSystem_PSP_GU::updateScreen() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// draw mouse
|
// draw mouse
|
||||||
if (_mouseVisible) {
|
if (_mouseVisible) {
|
||||||
sceGuTexMode(GU_PSM_T8, 0, 0, 0); // 8-bit image
|
sceGuTexMode(GU_PSM_T8, 0, 0, 0); // 8-bit image
|
||||||
sceGuClutMode(GU_PSM_5551, 0, 0xff, 0);
|
sceGuClutMode(GU_PSM_5551, 0, 0xff, 0);
|
||||||
sceGuClutLoad(32, mouseClut); // upload 32*8 entries (256)
|
sceGuClutLoad(32, mouseClut); // upload 32*8 entries (256)
|
||||||
|
|
|
@ -1289,29 +1289,29 @@ void OSystem_SDL::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x,
|
||||||
|
|
||||||
_mouseKeyColor = keycolor;
|
_mouseKeyColor = keycolor;
|
||||||
|
|
||||||
_cursorTargetScale = cursorTargetScale;
|
_cursorTargetScale = cursorTargetScale;
|
||||||
|
|
||||||
if (_mouseCurState.w != (int)w || _mouseCurState.h != (int)h) {
|
if (_mouseCurState.w != (int)w || _mouseCurState.h != (int)h) {
|
||||||
_mouseCurState.w = w;
|
_mouseCurState.w = w;
|
||||||
_mouseCurState.h = h;
|
_mouseCurState.h = h;
|
||||||
|
|
||||||
if (_mouseOrigSurface)
|
if (_mouseOrigSurface)
|
||||||
SDL_FreeSurface(_mouseOrigSurface);
|
SDL_FreeSurface(_mouseOrigSurface);
|
||||||
|
|
||||||
// Allocate bigger surface because AdvMame2x adds black pixel at [0,0]
|
// Allocate bigger surface because AdvMame2x adds black pixel at [0,0]
|
||||||
_mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA,
|
_mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA,
|
||||||
_mouseCurState.w + 2,
|
_mouseCurState.w + 2,
|
||||||
_mouseCurState.h + 2,
|
_mouseCurState.h + 2,
|
||||||
16,
|
16,
|
||||||
_hwscreen->format->Rmask,
|
_hwscreen->format->Rmask,
|
||||||
_hwscreen->format->Gmask,
|
_hwscreen->format->Gmask,
|
||||||
_hwscreen->format->Bmask,
|
_hwscreen->format->Bmask,
|
||||||
_hwscreen->format->Amask);
|
_hwscreen->format->Amask);
|
||||||
|
|
||||||
if (_mouseOrigSurface == NULL)
|
if (_mouseOrigSurface == NULL)
|
||||||
error("allocating _mouseOrigSurface failed");
|
error("allocating _mouseOrigSurface failed");
|
||||||
SDL_SetColorKey(_mouseOrigSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
|
SDL_SetColorKey(_mouseOrigSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
free(_mouseData);
|
free(_mouseData);
|
||||||
|
|
||||||
|
@ -1327,7 +1327,7 @@ void OSystem_SDL::blitCursor() {
|
||||||
int w, h, i, j;
|
int w, h, i, j;
|
||||||
|
|
||||||
if (!_mouseOrigSurface || !_mouseData)
|
if (!_mouseOrigSurface || !_mouseData)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
w = _mouseCurState.w;
|
w = _mouseCurState.w;
|
||||||
h = _mouseCurState.h;
|
h = _mouseCurState.h;
|
||||||
|
@ -1364,7 +1364,7 @@ void OSystem_SDL::blitCursor() {
|
||||||
srcPtr++;
|
srcPtr++;
|
||||||
}
|
}
|
||||||
dstPtr += _mouseOrigSurface->pitch - w * 2;
|
dstPtr += _mouseOrigSurface->pitch - w * 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
int rW, rH;
|
int rW, rH;
|
||||||
|
|
||||||
|
@ -1405,7 +1405,7 @@ void OSystem_SDL::blitCursor() {
|
||||||
_mouseCurState.vH = h;
|
_mouseCurState.vH = h;
|
||||||
_mouseCurState.vHotX = _mouseCurState.hotX;
|
_mouseCurState.vHotX = _mouseCurState.hotX;
|
||||||
_mouseCurState.vHotY = _mouseCurState.hotY;
|
_mouseCurState.vHotY = _mouseCurState.hotY;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef DISABLE_SCALERS
|
#ifndef DISABLE_SCALERS
|
||||||
int rH1 = rH; // store original to pass to aspect-correction function later
|
int rH1 = rH; // store original to pass to aspect-correction function later
|
||||||
|
@ -1436,7 +1436,7 @@ void OSystem_SDL::blitCursor() {
|
||||||
error("allocating _mouseSurface failed");
|
error("allocating _mouseSurface failed");
|
||||||
|
|
||||||
SDL_SetColorKey(_mouseSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
|
SDL_SetColorKey(_mouseSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_LockSurface(_mouseSurface);
|
SDL_LockSurface(_mouseSurface);
|
||||||
|
|
||||||
|
@ -1510,7 +1510,7 @@ void OSystem_SDL::undrawMouse() {
|
||||||
void OSystem_SDL::drawMouse() {
|
void OSystem_SDL::drawMouse() {
|
||||||
if (!_mouseVisible || !_mouseSurface) {
|
if (!_mouseVisible || !_mouseSurface) {
|
||||||
_mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0;
|
_mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_Rect dst;
|
SDL_Rect dst;
|
||||||
|
|
|
@ -312,7 +312,7 @@ protected:
|
||||||
int16 x, y;
|
int16 x, y;
|
||||||
|
|
||||||
// The size and hotspot of the original cursor image.
|
// The size and hotspot of the original cursor image.
|
||||||
int16 w, h;
|
int16 w, h;
|
||||||
int16 hotX, hotY;
|
int16 hotX, hotY;
|
||||||
|
|
||||||
// The size and hotspot of the pre-scaled cursor image, in real
|
// The size and hotspot of the pre-scaled cursor image, in real
|
||||||
|
|
|
@ -320,7 +320,7 @@ my $header = "
|
||||||
{
|
{
|
||||||
PrintErrorMessage("'abld build $TargetName urel' apparently failed.");
|
PrintErrorMessage("'abld build $TargetName urel' apparently failed.");
|
||||||
if ($HaltOnError)
|
if ($HaltOnError)
|
||||||
{
|
{
|
||||||
PrintErrorMessage("Halting on error as requested!");
|
PrintErrorMessage("Halting on error as requested!");
|
||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,8 +63,8 @@ STATICLIBRARY egcc.lib // for __fixunsdfsi
|
||||||
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
|
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
|
||||||
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
|
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
|
||||||
|
|
||||||
SYSTEMINCLUDE \epoc32\include\ESDL
|
SYSTEMINCLUDE \epoc32\include\ESDL
|
||||||
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
|
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
|
||||||
SYSTEMINCLUDE \epoc32\include\libc
|
SYSTEMINCLUDE \epoc32\include\libc
|
||||||
SYSTEMINCLUDE \epoc32\include
|
SYSTEMINCLUDE \epoc32\include
|
||||||
SYSTEMINCLUDE ..\src // for portdefs.h
|
SYSTEMINCLUDE ..\src // for portdefs.h
|
||||||
|
|
|
@ -41,7 +41,7 @@ TARGETPATH \Resource\Apps
|
||||||
LANG SC
|
LANG SC
|
||||||
END
|
END
|
||||||
|
|
||||||
SOURCEPATH ..\res
|
SOURCEPATH ..\res
|
||||||
START RESOURCE ScummVM.rss
|
START RESOURCE ScummVM.rss
|
||||||
HEADER
|
HEADER
|
||||||
TARGETPATH \Resource\Apps
|
TARGETPATH \Resource\Apps
|
||||||
|
@ -89,8 +89,8 @@ staticlibrary rate_arm_asm.o codec47ARM.o gfxARM.o
|
||||||
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
|
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
|
||||||
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
|
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
|
||||||
|
|
||||||
SYSTEMINCLUDE \epoc32\include\ESDL
|
SYSTEMINCLUDE \epoc32\include\ESDL
|
||||||
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
|
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
|
||||||
SYSTEMINCLUDE \epoc32\include\libc
|
SYSTEMINCLUDE \epoc32\include\libc
|
||||||
SYSTEMINCLUDE \epoc32\include
|
SYSTEMINCLUDE \epoc32\include
|
||||||
SYSTEMINCLUDE ..\src // for portdefs.h
|
SYSTEMINCLUDE ..\src // for portdefs.h
|
||||||
|
|
|
@ -61,8 +61,8 @@ STATICLIBRARY egcc.lib // for __fixunsdfsi
|
||||||
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
|
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
|
||||||
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
|
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
|
||||||
|
|
||||||
SYSTEMINCLUDE \epoc32\include\ESDL
|
SYSTEMINCLUDE \epoc32\include\ESDL
|
||||||
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
|
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
|
||||||
SYSTEMINCLUDE \epoc32\include\libc
|
SYSTEMINCLUDE \epoc32\include\libc
|
||||||
SYSTEMINCLUDE \epoc32\include
|
SYSTEMINCLUDE \epoc32\include
|
||||||
SYSTEMINCLUDE ..\src // for portdefs.h
|
SYSTEMINCLUDE ..\src // for portdefs.h
|
||||||
|
|
|
@ -61,8 +61,8 @@ STATICLIBRARY egcc.lib // for __fixunsdfsi
|
||||||
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
|
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
|
||||||
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
|
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
|
||||||
|
|
||||||
SYSTEMINCLUDE \epoc32\include\ESDL
|
SYSTEMINCLUDE \epoc32\include\ESDL
|
||||||
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
|
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
|
||||||
SYSTEMINCLUDE \epoc32\include\libc
|
SYSTEMINCLUDE \epoc32\include\libc
|
||||||
SYSTEMINCLUDE \epoc32\include
|
SYSTEMINCLUDE \epoc32\include
|
||||||
SYSTEMINCLUDE ..\src // for portdefs.h
|
SYSTEMINCLUDE ..\src // for portdefs.h
|
||||||
|
|
|
@ -59,8 +59,8 @@ STATICLIBRARY egcc.lib // for __fixunsdfsi
|
||||||
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
|
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
|
||||||
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
|
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
|
||||||
|
|
||||||
SYSTEMINCLUDE \epoc32\include\ESDL
|
SYSTEMINCLUDE \epoc32\include\ESDL
|
||||||
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
|
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
|
||||||
SYSTEMINCLUDE \epoc32\include\libc
|
SYSTEMINCLUDE \epoc32\include\libc
|
||||||
SYSTEMINCLUDE \epoc32\include
|
SYSTEMINCLUDE \epoc32\include
|
||||||
SYSTEMINCLUDE ..\src // for portdefs.h
|
SYSTEMINCLUDE ..\src // for portdefs.h
|
||||||
|
|
|
@ -41,7 +41,7 @@ TARGETPATH \Resource\Apps
|
||||||
LANG SC
|
LANG SC
|
||||||
END
|
END
|
||||||
|
|
||||||
SOURCEPATH .
|
SOURCEPATH .
|
||||||
START RESOURCE ScummVM.rss
|
START RESOURCE ScummVM.rss
|
||||||
HEADER
|
HEADER
|
||||||
TARGETPATH \Resource\Apps
|
TARGETPATH \Resource\Apps
|
||||||
|
@ -89,8 +89,8 @@ staticlibrary rate_arm_asm.o codec47ARM.o gfxARM.o
|
||||||
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
|
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
|
||||||
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
|
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
|
||||||
|
|
||||||
SYSTEMINCLUDE \epoc32\include\ESDL
|
SYSTEMINCLUDE \epoc32\include\ESDL
|
||||||
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
|
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
|
||||||
SYSTEMINCLUDE \epoc32\include\libc
|
SYSTEMINCLUDE \epoc32\include\libc
|
||||||
SYSTEMINCLUDE \epoc32\include
|
SYSTEMINCLUDE \epoc32\include
|
||||||
SYSTEMINCLUDE ..\src // for portdefs.h
|
SYSTEMINCLUDE ..\src // for portdefs.h
|
||||||
|
|
|
@ -67,8 +67,8 @@ ALWAYS_BUILD_AS_ARM
|
||||||
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound
|
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound
|
||||||
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl
|
USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl
|
||||||
|
|
||||||
SYSTEMINCLUDE \epoc32\include\ESDL
|
SYSTEMINCLUDE \epoc32\include\ESDL
|
||||||
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
|
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
|
||||||
SYSTEMINCLUDE \epoc32\include\libc
|
SYSTEMINCLUDE \epoc32\include\libc
|
||||||
SYSTEMINCLUDE \epoc32\include\tremor
|
SYSTEMINCLUDE \epoc32\include\tremor
|
||||||
SYSTEMINCLUDE \epoc32\include
|
SYSTEMINCLUDE \epoc32\include
|
||||||
|
@ -119,6 +119,6 @@ source backends\timer\default\default-timer.cpp
|
||||||
source backends\saves\savefile.cpp
|
source backends\saves\savefile.cpp
|
||||||
source backends\saves\default\default-saves.cpp
|
source backends\saves\default\default-saves.cpp
|
||||||
source backends\saves\compressed\compressed-saves.cpp
|
source backends\saves\compressed\compressed-saves.cpp
|
||||||
source engines\engine.cpp
|
source engines\engine.cpp
|
||||||
// backend specific includes
|
// backend specific includes
|
||||||
// backend specific includes
|
// backend specific includes
|
||||||
|
|
|
@ -65,7 +65,7 @@ SOURCEPATH ..\..\..\..\engines\scumm
|
||||||
USERINCLUDE ..\..\..\..\engines ..\..\..\..\engines\scumm\smush ..\..\..\..\engines\scumm\insane
|
USERINCLUDE ..\..\..\..\engines ..\..\..\..\engines\scumm\smush ..\..\..\..\engines\scumm\insane
|
||||||
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
|
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
|
||||||
|
|
||||||
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
|
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
|
||||||
SYSTEMINCLUDE \epoc32\include\libc
|
SYSTEMINCLUDE \epoc32\include\libc
|
||||||
SYSTEMINCLUDE \epoc32\include
|
SYSTEMINCLUDE \epoc32\include
|
||||||
SYSTEMINCLUDE ..\src // for portdefs.h
|
SYSTEMINCLUDE ..\src // for portdefs.h
|
||||||
|
|
|
@ -77,7 +77,7 @@ CApaApplication* NewApplication() {
|
||||||
#include <eikstart.h>
|
#include <eikstart.h>
|
||||||
// E32Main() contains the program's start up code, the entry point for an EXE.
|
// E32Main() contains the program's start up code, the entry point for an EXE.
|
||||||
GLDEF_C TInt E32Main() {
|
GLDEF_C TInt E32Main() {
|
||||||
return EikStart::RunApplication(NewApplication);
|
return EikStart::RunApplication(NewApplication);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -243,7 +243,7 @@ void OSystem_SDL_Symbian::symbianMixCallback(void *s, byte *samples, int len) {
|
||||||
void OSystem_SDL_Symbian::symbianMix(byte *samples, int len) {
|
void OSystem_SDL_Symbian::symbianMix(byte *samples, int len) {
|
||||||
// If not stereo then we need to downmix
|
// If not stereo then we need to downmix
|
||||||
if (_channels != 2) {
|
if (_channels != 2) {
|
||||||
_sound_proc(_sound_proc_param, _stereo_mix_buffer, len * 2);
|
_sound_proc(_sound_proc_param, _stereo_mix_buffer, len * 2);
|
||||||
int16 *bitmixDst = (int16 *)samples;
|
int16 *bitmixDst = (int16 *)samples;
|
||||||
int16 *bitmixSrc = (int16 *)_stereo_mix_buffer;
|
int16 *bitmixSrc = (int16 *)_stereo_mix_buffer;
|
||||||
|
|
||||||
|
@ -440,7 +440,7 @@ struct TSymbianFileEntry {
|
||||||
|
|
||||||
#define FILE void
|
#define FILE void
|
||||||
|
|
||||||
FILE* symbian_fopen(const char* name, const char* mode) {
|
FILE* symbian_fopen(const char* name, const char* mode) {
|
||||||
TSymbianFileEntry* fileEntry = new TSymbianFileEntry;
|
TSymbianFileEntry* fileEntry = new TSymbianFileEntry;
|
||||||
|
|
||||||
if (fileEntry != NULL) {
|
if (fileEntry != NULL) {
|
||||||
|
|
|
@ -98,7 +98,7 @@
|
||||||
return (SIGND (dl1) ? -l : l);
|
return (SIGND (dl1) ? -l : l);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* okay, okay: I admit it: I absolutely have _NO_ idea why __fixdfdi does not get linked in by gcc from libgcc.a
|
/* okay, okay: I admit it: I absolutely have _NO_ idea why __fixdfdi does not get linked in by gcc from libgcc.a
|
||||||
because I know it's in there: I checked with `ar x _fixdfdi.o libgcc.a` and the symbol is in there, so I'm lost
|
because I know it's in there: I checked with `ar x _fixdfdi.o libgcc.a` and the symbol is in there, so I'm lost
|
||||||
and had to fix it this way. I tried all gcc and ld options I could find: no hope :( If someone can enlighten me:
|
and had to fix it this way. I tried all gcc and ld options I could find: no hope :( If someone can enlighten me:
|
||||||
feel free to let me know at sumthinwicked@users.sf.net! Much obliged.
|
feel free to let me know at sumthinwicked@users.sf.net! Much obliged.
|
||||||
|
|
|
@ -7,7 +7,7 @@ struct dirent
|
||||||
long d_ino; /* Always zero. */
|
long d_ino; /* Always zero. */
|
||||||
unsigned short d_reclen; /* Always zero. */
|
unsigned short d_reclen; /* Always zero. */
|
||||||
unsigned short d_namlen; /* Length of name in d_name. */
|
unsigned short d_namlen; /* Length of name in d_name. */
|
||||||
char* d_name; /* File name. */
|
char* d_name; /* File name. */
|
||||||
/* NOTE: The name in the dirent structure points to the name in the
|
/* NOTE: The name in the dirent structure points to the name in the
|
||||||
* finddata_t structure in the DIR. */
|
* finddata_t structure in the DIR. */
|
||||||
};
|
};
|
||||||
|
@ -44,7 +44,7 @@ typedef struct
|
||||||
|
|
||||||
DIR* opendir (const char*);
|
DIR* opendir (const char*);
|
||||||
struct dirent* readdir (DIR*);
|
struct dirent* readdir (DIR*);
|
||||||
int closedir (DIR*);
|
int closedir (DIR*);
|
||||||
/*
|
/*
|
||||||
void rewinddir (DIR*);
|
void rewinddir (DIR*);
|
||||||
long telldir (DIR*);
|
long telldir (DIR*);
|
||||||
|
|
|
@ -1122,7 +1122,7 @@ bool OSystem_WINCE3::update_scalers() {
|
||||||
_adjustAspectRatio = false;
|
_adjustAspectRatio = false;
|
||||||
|
|
||||||
if (CEDevice::hasPocketPCResolution()) {
|
if (CEDevice::hasPocketPCResolution()) {
|
||||||
if ( (!_orientationLandscape && (_screenWidth == 320 || !_screenWidth))
|
if ( (!_orientationLandscape && (_screenWidth == 320 || !_screenWidth))
|
||||||
|| CEDevice::hasSquareQVGAResolution() ) {
|
|| CEDevice::hasSquareQVGAResolution() ) {
|
||||||
if (getScreenWidth() != 320) {
|
if (getScreenWidth() != 320) {
|
||||||
_scaleFactorXm = 3;
|
_scaleFactorXm = 3;
|
||||||
|
@ -1157,14 +1157,14 @@ bool OSystem_WINCE3::update_scalers() {
|
||||||
_scalerProc = Normal1x;
|
_scalerProc = Normal1x;
|
||||||
_modeFlags = 0;
|
_modeFlags = 0;
|
||||||
}
|
}
|
||||||
} else if (_screenWidth == 640 && !(isOzone() && (getScreenWidth() >= 640 || getScreenHeight() >= 640))) {
|
} else if (_screenWidth == 640 && !(isOzone() && (getScreenWidth() >= 640 || getScreenHeight() >= 640))) {
|
||||||
_scaleFactorXm = 1;
|
_scaleFactorXm = 1;
|
||||||
_scaleFactorXd = 2;
|
_scaleFactorXd = 2;
|
||||||
_scaleFactorYm = 1;
|
_scaleFactorYm = 1;
|
||||||
_scaleFactorYd = 2;
|
_scaleFactorYd = 2;
|
||||||
_scalerProc = PocketPCHalf;
|
_scalerProc = PocketPCHalf;
|
||||||
_modeFlags = 0;
|
_modeFlags = 0;
|
||||||
} else if (_screenWidth == 640 && (isOzone() && (getScreenWidth() >= 640 || getScreenHeight() >= 640))) {
|
} else if (_screenWidth == 640 && (isOzone() && (getScreenWidth() >= 640 || getScreenHeight() >= 640))) {
|
||||||
_scaleFactorXm = 1;
|
_scaleFactorXm = 1;
|
||||||
_scaleFactorXd = 1;
|
_scaleFactorXd = 1;
|
||||||
_scaleFactorYm = 1;
|
_scaleFactorYm = 1;
|
||||||
|
@ -2433,7 +2433,7 @@ void OSystem_WINCE3::getTimeAndDate(struct tm &t) const {
|
||||||
SYSTEMTIME systime;
|
SYSTEMTIME systime;
|
||||||
|
|
||||||
GetLocalTime(&systime);
|
GetLocalTime(&systime);
|
||||||
t.tm_year = systime.wYear - 1900;
|
t.tm_year = systime.wYear - 1900;
|
||||||
t.tm_mon = systime.wMonth - 1;
|
t.tm_mon = systime.wMonth - 1;
|
||||||
t.tm_wday = systime.wDayOfWeek;
|
t.tm_wday = systime.wDayOfWeek;
|
||||||
t.tm_mday = systime.wDay;
|
t.tm_mday = systime.wDay;
|
||||||
|
|
|
@ -439,7 +439,7 @@ void OSystem_X11::setPalette(const byte *colors, uint start, uint num) {
|
||||||
_palette_changed = true;
|
_palette_changed = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define AddDirtyRec(xi,yi,wi,hi) \
|
#define AddDirtyRec(xi,yi,wi,hi) \
|
||||||
if (_num_of_dirty_rects < MAX_NUMBER_OF_DIRTY_RECTS) { \
|
if (_num_of_dirty_rects < MAX_NUMBER_OF_DIRTY_RECTS) { \
|
||||||
_ds[_num_of_dirty_rects].x = xi; \
|
_ds[_num_of_dirty_rects].x = xi; \
|
||||||
_ds[_num_of_dirty_rects].y = yi; \
|
_ds[_num_of_dirty_rects].y = yi; \
|
||||||
|
|
|
@ -29,6 +29,6 @@ extern const char *gScummVMVersion; // e.g. "0.4.1"
|
||||||
extern const char *gScummVMBuildDate; // e.g. "2003-06-24"
|
extern const char *gScummVMBuildDate; // e.g. "2003-06-24"
|
||||||
extern const char *gScummVMVersionDate; // e.g. "0.4.1 (2003-06-24)"
|
extern const char *gScummVMVersionDate; // e.g. "0.4.1 (2003-06-24)"
|
||||||
extern const char *gScummVMFullVersion; // e.g. "ScummVM 0.4.1 (2003-06-24)"
|
extern const char *gScummVMFullVersion; // e.g. "ScummVM 0.4.1 (2003-06-24)"
|
||||||
extern const char *gScummVMFeatures; // e.g. "ALSA MPEG2 zLib"
|
extern const char *gScummVMFeatures; // e.g. "ALSA MPEG2 zLib"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -78,24 +78,24 @@ enum EventType {
|
||||||
* Implementation wise, we might want to use the classic
|
* Implementation wise, we might want to use the classic
|
||||||
* union-of-structs trick. It goes roughly like this:
|
* union-of-structs trick. It goes roughly like this:
|
||||||
* struct BasicEvent {
|
* struct BasicEvent {
|
||||||
* EventType type;
|
* EventType type;
|
||||||
* };
|
* };
|
||||||
* struct MouseMovedEvent : BasicEvent {
|
* struct MouseMovedEvent : BasicEvent {
|
||||||
* Common::Point pos;
|
* Common::Point pos;
|
||||||
* };
|
* };
|
||||||
* struct MouseButtonEvent : MouseMovedEvent {
|
* struct MouseButtonEvent : MouseMovedEvent {
|
||||||
* int button;
|
* int button;
|
||||||
* };
|
* };
|
||||||
* struct KeyEvent : BasicEvent {
|
* struct KeyEvent : BasicEvent {
|
||||||
* ...
|
* ...
|
||||||
* };
|
* };
|
||||||
* ...
|
* ...
|
||||||
* union Event {
|
* union Event {
|
||||||
* EventType type;
|
* EventType type;
|
||||||
* MouseMovedEvent mouse;
|
* MouseMovedEvent mouse;
|
||||||
* MouseButtonEvent button;
|
* MouseButtonEvent button;
|
||||||
* KeyEvent key;
|
* KeyEvent key;
|
||||||
* ...
|
* ...
|
||||||
* };
|
* };
|
||||||
*/
|
*/
|
||||||
struct Event {
|
struct Event {
|
||||||
|
|
|
@ -77,18 +77,18 @@
|
||||||
#include "backends/fs/ds/ds-fs.h"
|
#include "backends/fs/ds/ds-fs.h"
|
||||||
|
|
||||||
|
|
||||||
//void std_fprintf(FILE* handle, const char* fmt, ...); // used in common/util.cpp
|
//void std_fprintf(FILE* handle, const char* fmt, ...); // used in common/util.cpp
|
||||||
//void std_fflush(FILE* handle); // used in common/util.cpp
|
//void std_fflush(FILE* handle); // used in common/util.cpp
|
||||||
|
|
||||||
//char* std_fgets(char* str, int size, FILE* file); // not used
|
//char* std_fgets(char* str, int size, FILE* file); // not used
|
||||||
//int std_getc(FILE* handle); // not used
|
//int std_getc(FILE* handle); // not used
|
||||||
//char* std_getcwd(char* dir, int dunno); // not used
|
//char* std_getcwd(char* dir, int dunno); // not used
|
||||||
//void std_cwd(char* dir); // not used
|
//void std_cwd(char* dir); // not used
|
||||||
//int std_ferror(FILE* handle); // not used
|
//int std_ferror(FILE* handle); // not used
|
||||||
|
|
||||||
// Only functions used in the ScummVM source have been defined here!
|
// Only functions used in the ScummVM source have been defined here!
|
||||||
#define fopen(name, mode) DS::std_fopen(name, mode)
|
#define fopen(name, mode) DS::std_fopen(name, mode)
|
||||||
#define fclose(handle) DS::std_fclose(handle)
|
#define fclose(handle) DS::std_fclose(handle)
|
||||||
#define fread(ptr, size, items, file) DS::std_fread(ptr, size, items, file)
|
#define fread(ptr, size, items, file) DS::std_fread(ptr, size, items, file)
|
||||||
#define fwrite(ptr, size, items, file) DS::std_fwrite(ptr, size, items, file)
|
#define fwrite(ptr, size, items, file) DS::std_fwrite(ptr, size, items, file)
|
||||||
#define feof(handle) DS::std_feof(handle)
|
#define feof(handle) DS::std_feof(handle)
|
||||||
|
@ -114,18 +114,18 @@
|
||||||
|
|
||||||
#define FILE void
|
#define FILE void
|
||||||
|
|
||||||
FILE* symbian_fopen(const char* name, const char* mode);
|
FILE* symbian_fopen(const char* name, const char* mode);
|
||||||
void symbian_fclose(FILE* handle);
|
void symbian_fclose(FILE* handle);
|
||||||
size_t symbian_fread(const void* ptr, size_t size, size_t numItems, FILE* handle);
|
size_t symbian_fread(const void* ptr, size_t size, size_t numItems, FILE* handle);
|
||||||
size_t symbian_fwrite(const void* ptr, size_t size, size_t numItems, FILE* handle);
|
size_t symbian_fwrite(const void* ptr, size_t size, size_t numItems, FILE* handle);
|
||||||
bool symbian_feof(FILE* handle);
|
bool symbian_feof(FILE* handle);
|
||||||
long int symbian_ftell(FILE* handle);
|
long int symbian_ftell(FILE* handle);
|
||||||
int symbian_fseek(FILE* handle, long int offset, int whence);
|
int symbian_fseek(FILE* handle, long int offset, int whence);
|
||||||
void symbian_clearerr(FILE* handle);
|
void symbian_clearerr(FILE* handle);
|
||||||
|
|
||||||
// Only functions used in the ScummVM source have been defined here!
|
// Only functions used in the ScummVM source have been defined here!
|
||||||
#define fopen(name, mode) symbian_fopen(name, mode)
|
#define fopen(name, mode) symbian_fopen(name, mode)
|
||||||
#define fclose(handle) symbian_fclose(handle)
|
#define fclose(handle) symbian_fclose(handle)
|
||||||
#define fread(ptr, size, items, file) symbian_fread(ptr, size, items, file)
|
#define fread(ptr, size, items, file) symbian_fread(ptr, size, items, file)
|
||||||
#define fwrite(ptr, size, items, file) symbian_fwrite(ptr, size, items, file)
|
#define fwrite(ptr, size, items, file) symbian_fwrite(ptr, size, items, file)
|
||||||
#define feof(handle) symbian_feof(handle)
|
#define feof(handle) symbian_feof(handle)
|
||||||
|
|
|
@ -218,11 +218,11 @@ public:
|
||||||
return &_chunk;
|
return &_chunk;
|
||||||
}
|
}
|
||||||
|
|
||||||
IFF_ID _typeId;
|
IFF_ID _typeId;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
IFFChunk _formChunk;
|
IFFChunk _formChunk;
|
||||||
IFFChunk _chunk;
|
IFFChunk _chunk;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Common
|
} // namespace Common
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
namespace Common {
|
namespace Common {
|
||||||
|
|
||||||
/*! @brief simple class for handling both 2D position and size
|
/*! @brief simple class for handling both 2D position and size
|
||||||
|
|
||||||
This small class is an helper for position and size values.
|
This small class is an helper for position and size values.
|
||||||
*/
|
*/
|
||||||
|
@ -65,7 +65,7 @@ struct Point {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/*! @brief simple class for handling a rectangular zone.
|
/*! @brief simple class for handling a rectangular zone.
|
||||||
|
|
||||||
This small class is an helper for rectangles.
|
This small class is an helper for rectangles.
|
||||||
Note: This implementation is built around the assumption that (top,left) is
|
Note: This implementation is built around the assumption that (top,left) is
|
||||||
|
|
|
@ -61,7 +61,7 @@ protected:
|
||||||
* a lot. Yes, we limit ourselves to strings shorter than 4GB --
|
* a lot. Yes, we limit ourselves to strings shorter than 4GB --
|
||||||
* on purpose :-).
|
* on purpose :-).
|
||||||
*/
|
*/
|
||||||
uint32 _len;
|
uint32 _len;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Pointer to the actual string storage. Either points to _storage,
|
* Pointer to the actual string storage. Either points to _storage,
|
||||||
|
@ -81,7 +81,7 @@ protected:
|
||||||
*/
|
*/
|
||||||
struct {
|
struct {
|
||||||
mutable int *_refCount;
|
mutable int *_refCount;
|
||||||
uint32 _capacity;
|
uint32 _capacity;
|
||||||
} _extern;
|
} _extern;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -53,8 +53,8 @@ extern bool isSmartphone(void);
|
||||||
#define stderr ((DS::fileHandle*) -2)
|
#define stderr ((DS::fileHandle*) -2)
|
||||||
#define stdin ((DS::fileHandle*) -3)
|
#define stdin ((DS::fileHandle*) -3)
|
||||||
|
|
||||||
void std_fprintf(FILE* handle, const char* fmt, ...);
|
void std_fprintf(FILE* handle, const char* fmt, ...);
|
||||||
void std_fflush(FILE* handle);
|
void std_fflush(FILE* handle);
|
||||||
|
|
||||||
#define fprintf(file, fmt, ...) { char str[128]; sprintf(str, fmt, ##__VA_ARGS__); DS::std_fwrite(str, strlen(str), 1, file); }
|
#define fprintf(file, fmt, ...) { char str[128]; sprintf(str, fmt, ##__VA_ARGS__); DS::std_fwrite(str, strlen(str), 1, file); }
|
||||||
#define fflush(file) DS::std_fflush(file)
|
#define fflush(file) DS::std_fflush(file)
|
||||||
|
|
|
@ -57,15 +57,15 @@ namespace Common {
|
||||||
* Taken from exult/files/listfiles.cc
|
* Taken from exult/files/listfiles.cc
|
||||||
*
|
*
|
||||||
* Token meaning:
|
* Token meaning:
|
||||||
* "*": any character, any amount of times.
|
* "*": any character, any amount of times.
|
||||||
* "?": any character, only once.
|
* "?": any character, only once.
|
||||||
*
|
*
|
||||||
* Example strings/patterns:
|
* Example strings/patterns:
|
||||||
* String: monkey.s?? Pattern: monkey.s01 => true
|
* String: monkey.s?? Pattern: monkey.s01 => true
|
||||||
* String: monkey.s?? Pattern: monkey.s101 => false
|
* String: monkey.s?? Pattern: monkey.s101 => false
|
||||||
* String: monkey.s?1 Pattern: monkey.s99 => false
|
* String: monkey.s?1 Pattern: monkey.s99 => false
|
||||||
* String: monkey.s* Pattern: monkey.s101 => true
|
* String: monkey.s* Pattern: monkey.s101 => true
|
||||||
* String: monkey.s*1 Pattern: monkey.s99 => false
|
* String: monkey.s*1 Pattern: monkey.s99 => false
|
||||||
*
|
*
|
||||||
* @param str Text to be matched against the given pattern.
|
* @param str Text to be matched against the given pattern.
|
||||||
* @param pat Glob pattern.
|
* @param pat Glob pattern.
|
||||||
|
|
|
@ -517,7 +517,7 @@ struct AgiGame {
|
||||||
int lineMinPrint; /**< num lines to print on */
|
int lineMinPrint; /**< num lines to print on */
|
||||||
int cursorPos; /**< column where the input cursor is */
|
int cursorPos; /**< column where the input cursor is */
|
||||||
uint8 inputBuffer[40]; /**< buffer for user input */
|
uint8 inputBuffer[40]; /**< buffer for user input */
|
||||||
uint8 echoBuffer[40]; /**< buffer for echo.line */
|
uint8 echoBuffer[40]; /**< buffer for echo.line */
|
||||||
int keypress;
|
int keypress;
|
||||||
#define INPUT_NORMAL 0x01
|
#define INPUT_NORMAL 0x01
|
||||||
#define INPUT_GETSTRING 0x02
|
#define INPUT_GETSTRING 0x02
|
||||||
|
@ -577,7 +577,7 @@ struct AgiGame {
|
||||||
AgiDir dirSound[MAX_DIRS];
|
AgiDir dirSound[MAX_DIRS];
|
||||||
|
|
||||||
/* resources */
|
/* resources */
|
||||||
AgiPicture pictures[MAX_DIRS]; /**< AGI picture resources */
|
AgiPicture pictures[MAX_DIRS]; /**< AGI picture resources */
|
||||||
AgiLogic logics[MAX_DIRS]; /**< AGI logic resources */
|
AgiLogic logics[MAX_DIRS]; /**< AGI logic resources */
|
||||||
AgiView views[MAX_DIRS]; /**< AGI view resources */
|
AgiView views[MAX_DIRS]; /**< AGI view resources */
|
||||||
AgiSound *sounds[MAX_DIRS]; /**< Pointers to AGI sound resources */
|
AgiSound *sounds[MAX_DIRS]; /**< Pointers to AGI sound resources */
|
||||||
|
|
|
@ -723,7 +723,7 @@ void Troll::fillOffsets() {
|
||||||
// Init
|
// Init
|
||||||
|
|
||||||
void Troll::init() {
|
void Troll::init() {
|
||||||
_vm->_picture->setPictureVersion(AGIPIC_V15);
|
_vm->_picture->setPictureVersion(AGIPIC_V15);
|
||||||
//SetScreenPar(320, 200, (char*)ibm_fontdata);
|
//SetScreenPar(320, 200, (char*)ibm_fontdata);
|
||||||
|
|
||||||
const int gaps[] = { 0x3A40, 0x4600, 0x4800, 0x5800, 0x5a00, 0x6a00,
|
const int gaps[] = { 0x3A40, 0x4600, 0x4800, 0x5800, 0x5a00, 0x6a00,
|
||||||
|
|
|
@ -92,7 +92,7 @@ struct VtEntry {
|
||||||
|
|
||||||
#define CYCLE_NORMAL 0
|
#define CYCLE_NORMAL 0
|
||||||
#define CYCLE_END_OF_LOOP 1
|
#define CYCLE_END_OF_LOOP 1
|
||||||
#define CYCLE_REV_LOOP 2
|
#define CYCLE_REV_LOOP 2
|
||||||
#define CYCLE_REVERSE 3
|
#define CYCLE_REVERSE 3
|
||||||
uint8 cycle;
|
uint8 cycle;
|
||||||
|
|
||||||
|
|
|
@ -338,8 +338,8 @@ AGOSEngine::AGOSEngine(OSystem *syst)
|
||||||
|
|
||||||
_syncCount = 0;
|
_syncCount = 0;
|
||||||
|
|
||||||
_iconToggleCount = 0;
|
_iconToggleCount = 0;
|
||||||
_voiceCount = 0;
|
_voiceCount = 0;
|
||||||
|
|
||||||
_lastTickCount = 0;
|
_lastTickCount = 0;
|
||||||
_thisTickCount = 0;
|
_thisTickCount = 0;
|
||||||
|
|
|
@ -324,8 +324,8 @@ protected:
|
||||||
uint8 _wallOn;
|
uint8 _wallOn;
|
||||||
|
|
||||||
uint16 _hyperLink, _newLines;
|
uint16 _hyperLink, _newLines;
|
||||||
uint16 _oracleMaxScrollY, _noOracleScroll;
|
uint16 _oracleMaxScrollY, _noOracleScroll;
|
||||||
uint16 _interactY;
|
uint16 _interactY;
|
||||||
|
|
||||||
int16 _scriptVerb, _scriptNoun1, _scriptNoun2;
|
int16 _scriptVerb, _scriptNoun1, _scriptNoun2;
|
||||||
int16 _scriptAdj1, _scriptAdj2;
|
int16 _scriptAdj1, _scriptAdj2;
|
||||||
|
@ -1634,8 +1634,8 @@ protected:
|
||||||
void sendInteractText(uint16 num, const char *fmt, ...);
|
void sendInteractText(uint16 num, const char *fmt, ...);
|
||||||
|
|
||||||
void checkLinkBox();
|
void checkLinkBox();
|
||||||
void hyperLinkOn(uint16 x);
|
void hyperLinkOn(uint16 x);
|
||||||
void hyperLinkOff();
|
void hyperLinkOff();
|
||||||
void linksUp();
|
void linksUp();
|
||||||
void linksDown();
|
void linksDown();
|
||||||
|
|
||||||
|
|
|
@ -1403,7 +1403,7 @@ static const byte french_commonFont[] = {
|
||||||
0xF0, 0x48, 0x48, 0x48, 0x48, 0x48, 0xF0, 0x00,
|
0xF0, 0x48, 0x48, 0x48, 0x48, 0x48, 0xF0, 0x00,
|
||||||
0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xF8, 0x00,
|
0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xF8, 0x00,
|
||||||
0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xE0, 0x00,
|
0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xE0, 0x00,
|
||||||
0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00,
|
0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00,
|
||||||
0xC8, 0x48, 0x48, 0x78, 0x48, 0x48, 0xC8, 0x00,
|
0xC8, 0x48, 0x48, 0x78, 0x48, 0x48, 0xC8, 0x00,
|
||||||
0x70, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00,
|
0x70, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00,
|
||||||
0x78, 0x10, 0x10, 0x10, 0x90, 0x90, 0x60, 0x00,
|
0x78, 0x10, 0x10, 0x10, 0x90, 0x90, 0x60, 0x00,
|
||||||
|
@ -1504,7 +1504,7 @@ static const byte english_commonFont[] = {
|
||||||
0xF0, 0x48, 0x48, 0x48, 0x48, 0x48, 0xF0, 0x00,
|
0xF0, 0x48, 0x48, 0x48, 0x48, 0x48, 0xF0, 0x00,
|
||||||
0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xF8, 0x00,
|
0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xF8, 0x00,
|
||||||
0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xE0, 0x00,
|
0xF8, 0x40, 0x40, 0x70, 0x40, 0x40, 0xE0, 0x00,
|
||||||
0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00,
|
0x38, 0x40, 0x80, 0x98, 0x88, 0x48, 0x30, 0x00,
|
||||||
0xC8, 0x48, 0x48, 0x78, 0x48, 0x48, 0xC8, 0x00,
|
0xC8, 0x48, 0x48, 0x78, 0x48, 0x48, 0xC8, 0x00,
|
||||||
0x70, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00,
|
0x70, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x00,
|
||||||
0x78, 0x10, 0x10, 0x10, 0x90, 0x90, 0x60, 0x00,
|
0x78, 0x10, 0x10, 0x10, 0x90, 0x90, 0x60, 0x00,
|
||||||
|
|
|
@ -37,7 +37,7 @@ namespace AGOS {
|
||||||
static const uint16 _common_mouseInfo[32] = {
|
static const uint16 _common_mouseInfo[32] = {
|
||||||
0xC000, 0x8000, 0xE000, 0xC000, 0xF000, 0xE000, 0xF800, 0xF000,
|
0xC000, 0x8000, 0xE000, 0xC000, 0xF000, 0xE000, 0xF800, 0xF000,
|
||||||
0xFC00, 0xF800, 0xFE00, 0xFC00, 0xFC00, 0xF000, 0x9800, 0x9000,
|
0xFC00, 0xF800, 0xFE00, 0xFC00, 0xFC00, 0xF000, 0x9800, 0x9000,
|
||||||
0x0C00, 0x0800, 0x0C00, 0x0800, 0x0600, 0x0400, 0x0000, 0x0000,
|
0x0C00, 0x0800, 0x0C00, 0x0800, 0x0600, 0x0400, 0x0000, 0x0000,
|
||||||
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -750,10 +750,10 @@ static const AGOSGameDescription gameDescriptions[] = {
|
||||||
"Floppy",
|
"Floppy",
|
||||||
|
|
||||||
{
|
{
|
||||||
{ "gamebase.dat", GAME_BASEFILE, "c392e494dcabed797b98cbcfc687b33a", -1},
|
{ "gamebase.dat", GAME_BASEFILE, "c392e494dcabed797b98cbcfc687b33a", -1},
|
||||||
{ "icondata.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
|
{ "icondata.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
|
||||||
{ "stripped.dat", GAME_STRFILE, "c95a0a1ee973e19c2a1c5d12026c139f", -1},
|
{ "stripped.dat", GAME_STRFILE, "c95a0a1ee973e19c2a1c5d12026c139f", -1},
|
||||||
{ "tbllist.dat", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
|
{ "tbllist.dat", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
|
||||||
{ NULL, 0, NULL, 0}
|
{ NULL, 0, NULL, 0}
|
||||||
},
|
},
|
||||||
Common::EN_ANY,
|
Common::EN_ANY,
|
||||||
|
@ -773,11 +773,11 @@ static const AGOSGameDescription gameDescriptions[] = {
|
||||||
"CD Demo",
|
"CD Demo",
|
||||||
|
|
||||||
{
|
{
|
||||||
{ "data", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", -1},
|
{ "data", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", -1},
|
||||||
{ "gamebase", GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", -1},
|
{ "gamebase", GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", -1},
|
||||||
{ "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
|
{ "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
|
||||||
{ "stripped", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", -1},
|
{ "stripped", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", -1},
|
||||||
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
|
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
|
||||||
{ NULL, 0, NULL, 0}
|
{ NULL, 0, NULL, 0}
|
||||||
},
|
},
|
||||||
Common::EN_ANY,
|
Common::EN_ANY,
|
||||||
|
@ -797,11 +797,11 @@ static const AGOSGameDescription gameDescriptions[] = {
|
||||||
"CD",
|
"CD",
|
||||||
|
|
||||||
{
|
{
|
||||||
{ "data", GAME_GMEFILE, "64958b3a38afdcb85da1eeed85169806", -1},
|
{ "data", GAME_GMEFILE, "64958b3a38afdcb85da1eeed85169806", -1},
|
||||||
{ "gamebase", GAME_BASEFILE, "28261b99cd9da1242189b4f6f2841bd6", -1},
|
{ "gamebase", GAME_BASEFILE, "28261b99cd9da1242189b4f6f2841bd6", -1},
|
||||||
{ "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
|
{ "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
|
||||||
{ "stripped", GAME_STRFILE, "f3b27a3fbb45dcd323a48159496e45e8", -1},
|
{ "stripped", GAME_STRFILE, "f3b27a3fbb45dcd323a48159496e45e8", -1},
|
||||||
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
|
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
|
||||||
{ NULL, 0, NULL, 0}
|
{ NULL, 0, NULL, 0}
|
||||||
},
|
},
|
||||||
Common::EN_ANY,
|
Common::EN_ANY,
|
||||||
|
@ -1189,11 +1189,11 @@ static const AGOSGameDescription gameDescriptions[] = {
|
||||||
"CD Demo",
|
"CD Demo",
|
||||||
|
|
||||||
{
|
{
|
||||||
{ "simon.gme", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", -1},
|
{ "simon.gme", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", -1},
|
||||||
{ "gamepc" , GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", -1},
|
{ "gamepc" , GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", -1},
|
||||||
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
|
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
|
||||||
{ "stripped.txt", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", -1},
|
{ "stripped.txt", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", -1},
|
||||||
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
|
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
|
||||||
{ NULL, 0, NULL, 0}
|
{ NULL, 0, NULL, 0}
|
||||||
},
|
},
|
||||||
Common::EN_ANY,
|
Common::EN_ANY,
|
||||||
|
|
|
@ -848,8 +848,8 @@ void AGOSEngine::slowFadeIn() {
|
||||||
memcpy(_videoBuf1 + 1024, _displayPalette, 1024);
|
memcpy(_videoBuf1 + 1024, _displayPalette, 1024);
|
||||||
|
|
||||||
for (c = 255; c >= 0; c -= 4) {
|
for (c = 255; c >= 0; c -= 4) {
|
||||||
src = _videoBuf1 + 1024;
|
src = _videoBuf1 + 1024;
|
||||||
dst = _videoBuf1;
|
dst = _videoBuf1;
|
||||||
|
|
||||||
for (p = _fastFadeInFlag; p !=0 ; p -= 3) {
|
for (p = _fastFadeInFlag; p !=0 ; p -= 3) {
|
||||||
if (src[0] >= c)
|
if (src[0] >= c)
|
||||||
|
@ -860,10 +860,10 @@ void AGOSEngine::slowFadeIn() {
|
||||||
dst[2] += 4;
|
dst[2] += 4;
|
||||||
src += 4;
|
src += 4;
|
||||||
dst += 4;
|
dst += 4;
|
||||||
}
|
}
|
||||||
_system->setPalette(_videoBuf1, 0, _fastFadeCount);
|
_system->setPalette(_videoBuf1, 0, _fastFadeCount);
|
||||||
delay(5);
|
delay(5);
|
||||||
}
|
}
|
||||||
_fastFadeInFlag = 0;
|
_fastFadeInFlag = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -184,7 +184,7 @@ void AGOSEngine_Feeble::oracleTextUp() {
|
||||||
changeWindow(3);
|
changeWindow(3);
|
||||||
_noOracleScroll = 0;
|
_noOracleScroll = 0;
|
||||||
|
|
||||||
if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up
|
if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up
|
||||||
_oracleMaxScrollY = _textWindow->scrollY;
|
_oracleMaxScrollY = _textWindow->scrollY;
|
||||||
while (1) {
|
while (1) {
|
||||||
if (_textWindow->scrollY == _oracleMaxScrollY)
|
if (_textWindow->scrollY == _oracleMaxScrollY)
|
||||||
|
@ -218,7 +218,7 @@ void AGOSEngine_Feeble::oracleTextDown() {
|
||||||
changeWindow(3);
|
changeWindow(3);
|
||||||
_noOracleScroll = 0;
|
_noOracleScroll = 0;
|
||||||
|
|
||||||
if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up
|
if (_textWindow->scrollY > _oracleMaxScrollY) // For scroll up
|
||||||
_oracleMaxScrollY = _textWindow->scrollY;
|
_oracleMaxScrollY = _textWindow->scrollY;
|
||||||
while (1) {
|
while (1) {
|
||||||
if (_textWindow->scrollY == 0)
|
if (_textWindow->scrollY == 0)
|
||||||
|
@ -411,7 +411,7 @@ void AGOSEngine_Feeble::listSaveGames(int n) {
|
||||||
showMessageFormat("\n");
|
showMessageFormat("\n");
|
||||||
hyperLinkOn(j + 400);
|
hyperLinkOn(j + 400);
|
||||||
setTextColor(116);
|
setTextColor(116);
|
||||||
showMessageFormat(" %d. ",1);
|
showMessageFormat(" %d. ",1);
|
||||||
hyperLinkOff();
|
hyperLinkOff();
|
||||||
setTextColor(113);
|
setTextColor(113);
|
||||||
k++;
|
k++;
|
||||||
|
|
|
@ -129,7 +129,7 @@ static void convertCompressedImage(const byte *src, byte *dst, uint8 colorDepth,
|
||||||
free(uncbfrout);
|
free(uncbfrout);
|
||||||
for (i = 0; i < colorDepth; ++i) {
|
for (i = 0; i < colorDepth; ++i) {
|
||||||
free(uncptr[i]);
|
free(uncptr[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
byte *AGOSEngine::convertImage(VC10_state *state, bool compressed) {
|
byte *AGOSEngine::convertImage(VC10_state *state, bool compressed) {
|
||||||
|
|
|
@ -1235,7 +1235,7 @@ bool AGOSEngine_Elvira2::loadGame(const char *filename, bool restartMode) {
|
||||||
SubSuperRoom *sr = (SubSuperRoom *)findChildOfType(item, kSuperRoomType);
|
SubSuperRoom *sr = (SubSuperRoom *)findChildOfType(item, kSuperRoomType);
|
||||||
if (sr) {
|
if (sr) {
|
||||||
uint16 n = sr->roomX * sr->roomY * sr->roomZ;
|
uint16 n = sr->roomX * sr->roomY * sr->roomZ;
|
||||||
for (i = j = 0; i != n; i++)
|
for (i = j = 0; i != n; i++)
|
||||||
sr->roomExitStates[j++] = f->readUint16BE();
|
sr->roomExitStates[j++] = f->readUint16BE();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1384,7 +1384,7 @@ bool AGOSEngine_Elvira2::saveGame(uint slot, const char *caption) {
|
||||||
SubSuperRoom *sr = (SubSuperRoom *)findChildOfType(item, kSuperRoomType);
|
SubSuperRoom *sr = (SubSuperRoom *)findChildOfType(item, kSuperRoomType);
|
||||||
if (sr) {
|
if (sr) {
|
||||||
uint16 n = sr->roomX * sr->roomY * sr->roomZ;
|
uint16 n = sr->roomX * sr->roomY * sr->roomZ;
|
||||||
for (i = j = 0; i != n; i++)
|
for (i = j = 0; i != n; i++)
|
||||||
f->writeUint16BE(sr->roomExitStates[j++]);
|
f->writeUint16BE(sr->roomExitStates[j++]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -217,7 +217,7 @@ static const byte charWidth[226] = {
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 7
|
0, 0, 0, 0, 0, 7
|
||||||
};
|
};
|
||||||
|
|
||||||
const char *getPixelLength(const char *string, uint16 maxWidth, uint16 &pixels) {
|
const char *getPixelLength(const char *string, uint16 maxWidth, uint16 &pixels) {
|
||||||
|
@ -410,8 +410,8 @@ void AGOSEngine_Feeble::printScreenText(uint vgaSpriteId, uint color, const char
|
||||||
if (spaces != 0)
|
if (spaces != 0)
|
||||||
spaces--;
|
spaces--;
|
||||||
while (spaces) {
|
while (spaces) {
|
||||||
*convertedString2++ = ' ';
|
*convertedString2++ = ' ';
|
||||||
spaces--;
|
spaces--;
|
||||||
}
|
}
|
||||||
strcpy(convertedString2, string);
|
strcpy(convertedString2, string);
|
||||||
break;
|
break;
|
||||||
|
@ -425,8 +425,8 @@ void AGOSEngine_Feeble::printScreenText(uint vgaSpriteId, uint color, const char
|
||||||
if (spaces != 0)
|
if (spaces != 0)
|
||||||
spaces--;
|
spaces--;
|
||||||
while (spaces) {
|
while (spaces) {
|
||||||
*convertedString2++ = ' ';
|
*convertedString2++ = ' ';
|
||||||
spaces--;
|
spaces--;
|
||||||
}
|
}
|
||||||
b = string2 - string;
|
b = string2 - string;
|
||||||
strncpy(convertedString2, string, b);
|
strncpy(convertedString2, string, b);
|
||||||
|
@ -574,7 +574,7 @@ uint16 AGOSEngine_Waxworks::getBoxSize() {
|
||||||
case 3: if (_lineCounts[0] <= 37) {
|
case 3: if (_lineCounts[0] <= 37) {
|
||||||
if (_lineCounts[1] <= 37) {
|
if (_lineCounts[1] <= 37) {
|
||||||
if (_lineCounts[2] <= 37)
|
if (_lineCounts[2] <= 37)
|
||||||
return 3;
|
return 3;
|
||||||
if (_lineCounts[2] <= 84)
|
if (_lineCounts[2] <= 84)
|
||||||
if (checkFit(_linePtrs[2], 42, 2))
|
if (checkFit(_linePtrs[2], 42, 2))
|
||||||
return 4;
|
return 4;
|
||||||
|
@ -590,7 +590,7 @@ uint16 AGOSEngine_Waxworks::getBoxSize() {
|
||||||
if (checkFit(_linePtrs[2], 48, 2))
|
if (checkFit(_linePtrs[2], 48, 2))
|
||||||
return 5;
|
return 5;
|
||||||
return 6;
|
return 6;
|
||||||
}
|
}
|
||||||
if ((_lineCounts[1] <= 144) && (checkFit(_linePtrs[1], 48, 3))) {
|
if ((_lineCounts[1] <= 144) && (checkFit(_linePtrs[1], 48, 3))) {
|
||||||
if (_lineCounts[2] <= 48)
|
if (_lineCounts[2] <= 48)
|
||||||
return 5;
|
return 5;
|
||||||
|
|
|
@ -241,7 +241,7 @@ static const CINEGameDescription gameDescriptions[] = {
|
||||||
{
|
{
|
||||||
"os",
|
"os",
|
||||||
"256 colors",
|
"256 colors",
|
||||||
AD_ENTRY1("procs00", "d6752e7d25924cb866b61eb7cb0c8b56"),
|
AD_ENTRY1("procs00", "d6752e7d25924cb866b61eb7cb0c8b56"),
|
||||||
Common::EN_GRB,
|
Common::EN_GRB,
|
||||||
Common::kPlatformPC,
|
Common::kPlatformPC,
|
||||||
Common::ADGF_NO_FLAGS
|
Common::ADGF_NO_FLAGS
|
||||||
|
|
|
@ -323,7 +323,7 @@ void CineEngine::mainLoop(int bootScriptIdx) {
|
||||||
freePrcLinkedList();
|
freePrcLinkedList();
|
||||||
releaseObjectScripts();
|
releaseObjectScripts();
|
||||||
// if (g_cine->getGameType() == Cine::GType_OS) {
|
// if (g_cine->getGameType() == Cine::GType_OS) {
|
||||||
// freeUnkList();
|
// freeUnkList();
|
||||||
// }
|
// }
|
||||||
freeBgIncrustList();
|
freeBgIncrustList();
|
||||||
closePart();
|
closePart();
|
||||||
|
|
|
@ -406,7 +406,7 @@ bool CineEngine::makeLoad(char *saveName) {
|
||||||
freeAnimDataTable();
|
freeAnimDataTable();
|
||||||
unloadAllMasks();
|
unloadAllMasks();
|
||||||
// if (g_cine->getGameType() == Cine::GType_OS) {
|
// if (g_cine->getGameType() == Cine::GType_OS) {
|
||||||
// freeUnkList();
|
// freeUnkList();
|
||||||
// }
|
// }
|
||||||
freePrcLinkedList();
|
freePrcLinkedList();
|
||||||
releaseObjectScripts();
|
releaseObjectScripts();
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue