[Scummvm-git-logs] scummvm master -> 35a637e68239adc4b81343702a3996742d4ae156

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
35a637e682 NUVIE: Fix pointer type mismatches


Commit: 35a637e68239adc4b81343702a3996742d4ae156
    https://github.com/scummvm/scummvm/commit/35a637e68239adc4b81343702a3996742d4ae156
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-01T17:09:51-08:00

Commit Message:
NUVIE: Fix pointer type mismatches

Changed paths:
    engines/ultima/nuvie/core/cursor.cpp
    engines/ultima/nuvie/core/cursor.h
    engines/ultima/nuvie/screen/screen.cpp
    engines/ultima/nuvie/screen/screen.h


diff --git a/engines/ultima/nuvie/core/cursor.cpp b/engines/ultima/nuvie/core/cursor.cpp
index d377a7f..728250f 100644
--- a/engines/ultima/nuvie/core/cursor.cpp
+++ b/engines/ultima/nuvie/core/cursor.cpp
@@ -170,7 +170,7 @@ bool Cursor::set_pointer(uint8 ptr_num) {
 /* Draw self on screen at px,py, or at mouse location if px or py is -1.
  * Returns false on failure.
  */
-bool Cursor::display(sint32 px, sint32 py) {
+bool Cursor::display(int px, int py) {
 	if (cursors.empty() || !cursors[cursor_id])
 		return (false);
 	if (hidden)
@@ -208,7 +208,7 @@ void Cursor::clear() {
 
 /* Offset requested position px,py by pointer hotspot, and screen boundary.
  */
-inline void Cursor::fix_position(MousePointer *ptr, sint32 &px, sint32 &py) {
+inline void Cursor::fix_position(MousePointer *ptr, int &px, int &py) {
 	if ((px - ptr->point_x) < 0) // offset by hotspot
 		px = 0;
 	else
diff --git a/engines/ultima/nuvie/core/cursor.h b/engines/ultima/nuvie/core/cursor.h
index 188a983..bb724b1 100644
--- a/engines/ultima/nuvie/core/cursor.h
+++ b/engines/ultima/nuvie/core/cursor.h
@@ -61,7 +61,7 @@ class Cursor {
 	uint16 screen_w, screen_h;
 
 	void add_update(uint16 x, uint16 y, uint16 w, uint16 h);
-	inline void fix_position(MousePointer *ptr, sint32 &px, sint32 &py);
+	inline void fix_position(MousePointer *ptr, int &px, int &py);
 	void save_backing(uint32 px, uint32 py, uint32 w, uint32 h);
 
 public:
@@ -98,7 +98,7 @@ public:
 	bool display()                         {
 		return (display(cur_x, cur_y));
 	}
-	bool display(sint32 px, sint32 py);
+	bool display(int px, int py);
 	void clear();
 	void update();
 
diff --git a/engines/ultima/nuvie/screen/screen.cpp b/engines/ultima/nuvie/screen/screen.cpp
index 347eb8c..683614e 100644
--- a/engines/ultima/nuvie/screen/screen.cpp
+++ b/engines/ultima/nuvie/screen/screen.cpp
@@ -1190,7 +1190,7 @@ void Screen::update() {
 }
 
 
-void Screen::update(sint32 x, sint32 y, uint16 w, uint16 h) {
+void Screen::update(int x, int y, uint16 w, uint16 h) {
 	if (x < 0)
 		x = 0;
 	if (y < 0)
@@ -1595,7 +1595,7 @@ void Screen::draw_line(int sx, int sy, int ex, int ey, uint8 color) {
 }
 
 
-void Screen::get_mouse_location(sint32 *x, sint32 *y) {
+void Screen::get_mouse_location(int *x, int *y) {
 	Common::Point pt = Events::get()->getMousePos();
 	*x = pt.x;
 	*y = pt.y;
diff --git a/engines/ultima/nuvie/screen/screen.h b/engines/ultima/nuvie/screen/screen.h
index c3d1066..8f5067d 100644
--- a/engines/ultima/nuvie/screen/screen.h
+++ b/engines/ultima/nuvie/screen/screen.h
@@ -137,7 +137,7 @@ public:
 	}
 
 	void update();
-	void update(sint32 x, sint32 y, uint16 w, uint16 h);
+	void update(int x, int y, uint16 w, uint16 h);
 	void preformUpdate();
 	void lock();
 	void unlock();
@@ -151,7 +151,7 @@ public:
 
 	void draw_line(int sx, int sy, int ex, int ey, uint8 color);
 
-	void get_mouse_location(sint32 *x, sint32 *y);
+	void get_mouse_location(int *x, int *y);
 
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 	void scale_sdl_window_coords(sint32 *x, sint32 *y);