From ee45e1517800aac5d165dc08923f1f5b2b8a21e0 Mon Sep 17 00:00:00 2001 From: yinsimei Date: Mon, 10 Jul 2017 20:19:57 +0200 Subject: [PATCH] SLUDGE: use Common::Point instead of struct POINT --- engines/sludge/floor.cpp | 2 +- engines/sludge/floor.h | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/engines/sludge/floor.cpp b/engines/sludge/floor.cpp index e5564637381..15da333defd 100644 --- a/engines/sludge/floor.cpp +++ b/engines/sludge/floor.cpp @@ -159,7 +159,7 @@ bool setFloor(int fileNum) { // Find out how many vertices there are and reserve memory i = bigDataFile->readUint16BE(); - currentFloor->vertex = new POINT[i]; + currentFloor->vertex = new Common::Point[i]; if (!checkNew(currentFloor->vertex)) return false; diff --git a/engines/sludge/floor.h b/engines/sludge/floor.h index 1b212fa73b3..b1de826f9d9 100644 --- a/engines/sludge/floor.h +++ b/engines/sludge/floor.h @@ -22,6 +22,8 @@ #ifndef SLUDGE_FLOOR_H #define SLUDGE_FLOOR_H +#include "common/rect.h" + namespace Sludge { struct floorPolygon { @@ -29,14 +31,9 @@ struct floorPolygon { int *vertexID; }; -struct POINT { - int x; - int y; -}; - struct flor { int originalNum; - POINT *vertex; + Common::Point *vertex; int numPolygons; floorPolygon *polygon; int * *matrix;