Merge branch 'soltys_wip2' of github.com:Strangerke/scummvm into soltys_wip2

This commit is contained in:
eriktorbjorn 2011-06-19 11:19:18 +02:00
commit 0fa5425aa8
3 changed files with 28 additions and 25 deletions

View File

@ -92,7 +92,7 @@ BT_PAGE *BTFILE::GetPage(int lev, uint16 pgn) {
// Does this work, or does it have to compare the entire buffer?
#define memicmp(s1, s2, n) scumm_strnicmp((const char *)s1, (const char *)s2, n)
BT_KEYPACK *BTFILE::Find(const char *key) {
int lev = 0;
uint16 nxt = BT_ROOT;

View File

@ -29,7 +29,6 @@
#include "cge/mouse.h"
#include <stdlib.h>
namespace CGE {
uint8 *Glass(DAC *pal, uint8 r, uint8 g, uint8 b) {

View File

@ -237,51 +237,55 @@ uint16 IOHAND::Read(void *buf, uint16 len) {
}
uint16 IOHAND::Write(void *buf, uint16 len) {
/*
if (len) {
if (Mode == REA || Handle < 0) return 0;
if (Crypt) Seed = Crypt(buf, len, Seed);
Error = _dos_write(Handle, buf, len, &len);
if (Crypt) Seed = Crypt(buf, len, Seed); //------$$$$$$$
}
return len;
*/
/*
if (len) {
if (Mode == REA || Handle < 0)
return 0;
if (Crypt)
Seed = Crypt(buf, len, Seed);
Error = _dos_write(Handle, buf, len, &len);
if (Crypt)
Seed = Crypt(buf, len, Seed); //------$$$$$$$
}
return len;
*/
warning("STUB: IOHAND::Write");
return 0;
}
long IOHAND::Mark(void) {
/*
return (Handle < 0) ? 0 : tell(Handle);
*/
/*
return (Handle < 0) ? 0 : tell(Handle);
*/
warning("STUB: IOHAND::Mark");
return 0;
}
long IOHAND::Seek(long pos) {
/*
if (Handle < 0) return 0;
lseek(Handle, pos, SEEK_SET);
return tell(Handle);
*/
/*
if (Handle < 0)
return 0;
lseek(Handle, pos, SEEK_SET);
return tell(Handle);
*/
warning("STUB: IOHAND::Seek");
return 0;
}
long IOHAND::Size(void) {
/*
if (Handle < 0) return 0;
/*
if (Handle < 0)
return 0;
return filelength(Handle);
*/
*/
warning("STUB: IOHAND::Size");
return 0;
}
bool IOHAND::Exist(const char *name) {
/*
/*
return access(name, 0) == 0;
*/
*/
warning("STUB: IOHAND::Exist");
return 0;
}