libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-18 07:39:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MORTEVIELLE: Fix compiler warnings and added assert

Browse Source
This commit is contained in:
Paul Gilbert 2012-01-20 17:18:38 +11:00 committed by Strangerke
parent 5c628fedd2
commit 412124baa6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/mortevielle/graphics.cpp
View File

@ -1011,6 +1011,7 @@ void ScreenSurface::clearScreen() {
* simulate the original 640x400 surface, all Y values have to be doubled * simulate the original 640x400 surface, all Y values have to be doubled
*/ */
void ScreenSurface::setPixel(const Common::Point &pt, int palIndex) { void ScreenSurface::setPixel(const Common::Point &pt, int palIndex) {
assert((pt.x >= 0) && (pt.y >= 0) && (pt.x <= SCREEN_WIDTH) && (pt.y <= SCREEN_ORIG_HEIGHT));
Graphics::Surface destSurface = lockArea(Common::Rect(pt.x, pt.y * 2, pt.x + 1, (pt.y + 1) * 2)); Graphics::Surface destSurface = lockArea(Common::Rect(pt.x, pt.y * 2, pt.x + 1, (pt.y + 1) * 2));
byte *destP = (byte *)destSurface.pixels; byte *destP = (byte *)destSurface.pixels;

1
engines/mortevielle/mortevielle.h
View File

@ -42,6 +42,7 @@ enum {
#define SCREEN_WIDTH 640 #define SCREEN_WIDTH 640
#define SCREEN_HEIGHT 400 #define SCREEN_HEIGHT 400
#define SCREEN_ORIG_HEIGHT 200
#define MORT_DAT_REQUIRED_VERSION 1 #define MORT_DAT_REQUIRED_VERSION 1
#define MORT_DAT "mort.dat" #define MORT_DAT "mort.dat"
#define GAME_FRAME_DELAY (1000 / 50) #define GAME_FRAME_DELAY (1000 / 50)

4
engines/mortevielle/mouse.cpp
View File

@ -265,8 +265,6 @@ void show_mouse() {
} }
void pos_mouse(int x, int y) { void pos_mouse(int x, int y) {
registres reg;
if (x > 314 * res) x = 314 * res; if (x > 314 * res) x = 314 * res;
else if (x < 0) x = 0; else if (x < 0) x = 0;
if (y > 199) y = 199; if (y > 199) y = 199;
@ -286,7 +284,7 @@ void read_pos_mouse(int &x, int &y, int &c) {
void mov_mouse(bool &funct, char &key) { void mov_mouse(bool &funct, char &key) {
bool p_key; bool p_key;
char in1, in2; char in1, in2;
int x, y, cx, cy, cd; int cx, cy, cd;
// If mouse button clicked, return it // If mouse button clicked, return it
if (g_vm->getMouseButtons() != 0) { if (g_vm->getMouseButtons() != 0) {