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

DC: Silenced some stupid warnings

Browse source
This commit is contained in:
Marcus Comstedt 2014-01-09 23:26:31 +01:00
parent 62828f86a1
commit 66ad9e76ee
5 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/platform/dc/dc.h
View file

@ -43,7 +43,9 @@ class Interactive
public:
virtual int key(int k, byte &shiftFlags) = 0;
virtual void mouse(int x, int y) = 0;
virtual ~Interactive() = 0;
};
inline Interactive::~Interactive() { }
#include "softkbd.h"

6
backends/platform/dc/dcmain.cpp
View file

@ -79,13 +79,14 @@ static bool find_track(int track, int &first_sec, int &last_sec)
if (first < 1 || last > 99 || first > last)
return false;
for (i=first; i<=last; i++)
if (!(TOC_CTRL(toc->entry[i-1])&4))
if (!(TOC_CTRL(toc->entry[i-1])&4)) {
if (track==1) {
first_sec = TOC_LBA(toc->entry[i-1]);
last_sec = TOC_LBA(toc->entry[i]);
return true;
} else
--track;
}
return false;
}
@ -281,7 +282,7 @@ namespace DC_Flash {
if((r = syscall_read_flash(info[0] + (bmb++ << 6), bm, 64))<0)
return r;
}
if(!(bm[(b>>3)&63] & (0x80>>(b&7))))
if(!(bm[(b>>3)&63] & (0x80>>(b&7)))) {
if((r = syscall_read_flash(info[0] + ((b+1) << 6), buf, 64))<0)
return r;
else if((s=*(unsigned short *)(buf+0)) == sec &&
@ -290,6 +291,7 @@ namespace DC_Flash {
got=1;
}
}
}
return got;
}

2
backends/platform/dc/icon.cpp
View file

@ -47,7 +47,7 @@ void Icon::create_vmicon(void *buffer)
void Icon::create_texture()
{
static char tt[16] = { 0, 1, 4, 5, 16, 17, 20, 21,
static unsigned char tt[16] = { 0, 1, 4, 5, 16, 17, 20, 21,
64, 65, 68, 69, 80, 81, 84, 85 };
unsigned short *tex = (unsigned short *)ta_txalloc(512);
unsigned short *linebase;

11
backends/platform/dc/input.cpp
View file

@ -50,10 +50,10 @@ int handleInput(struct mapledev *pad, int &mouse_x, int &mouse_y,
else if (!(buttons & 512)) newkey = ' ';
else if (!(buttons & 1024)) newkey = numpadmap[(buttons>>4)&15];
if (!(buttons & 128)) if (inter) newkey = 1001; else mouse_x++;
if (!(buttons & 64)) if (inter) newkey = 1002; else mouse_x--;
if (!(buttons & 32)) if (inter) newkey = 1003; else mouse_y++;
if (!(buttons & 16)) if (inter) newkey = 1004; else mouse_y--;
if (!(buttons & 128)) { if (inter) newkey = 1001; else mouse_x++; }
if (!(buttons & 64)) { if (inter) newkey = 1002; else mouse_x--; }
if (!(buttons & 32)) { if (inter) newkey = 1003; else mouse_y++; }
if (!(buttons & 16)) { if (inter) newkey = 1004; else mouse_y--; }
mouse_x += ((int)pad->cond.controller.joyx-128)>>4;
mouse_y += ((int)pad->cond.controller.joyy-128)>>4;
@ -157,7 +157,7 @@ int handleInput(struct mapledev *pad, int &mouse_x, int &mouse_y,
return -Common::EVENT_RBUTTONUP;
}
if (mouse_wheel != lastwheel)
if (mouse_wheel != lastwheel) {
if (((int8)(mouse_wheel - lastwheel)) > 0) {
lastwheel++;
return -Common::EVENT_WHEELDOWN;
@ -165,6 +165,7 @@ int handleInput(struct mapledev *pad, int &mouse_x, int &mouse_y,
--lastwheel;
return -Common::EVENT_WHEELUP;
}
}
if (newkey && inter && newkey != lastkey) {
int transkey = inter->key(newkey, shiftFlags);

1
backends/platform/dc/softkbd.h
View file

@ -40,6 +40,7 @@ class SoftKeyboard : public Interactive
public:
SoftKeyboard(const OSystem_Dreamcast *os);
virtual ~SoftKeyboard() {}
void draw(float x, float y, int transp = 0);
int key(int k, byte &shiftFlags);