WAGE: Various bug fixes and Improvements #4148
Conversation
Needs some changes. The major one is the sudden dependency of graphics/macgui code from engines/wage. This must be untangled.
engines/wage/design.cpp
Outdated
| @@ -372,6 +433,13 @@ void Design::drawPolygon(Graphics::ManagedSurface *surface, Common::ReadStream & | |||
| xcoords.push_back(x1); | |||
| ycoords.push_back(y1); | |||
|
|
|||
| if (borderThickness > 1) { | |||
| for (int i = 0; i < xcoords.size(); ++i) { | |||
|
|
||
| byte *pat = p->patterns->operator[](p->fillType - 1); | ||
|
|
||
| if (p->thickness == 1) { |
There was a problem hiding this comment.
Please add comment here, something like
// Draw circle when thickness is > 1, put a pixel otherwise| (pat[yu % 8] & (1 << (7 - xu % 8))) ? color : kColorWhite; | ||
| } | ||
| } else { | ||
| int x1 = x - p->thickness / 2; |
There was a problem hiding this comment.
What happens when the thickness is odd, e.g. 3, 5, etc? Could you please test and see if it rounds up or down?
There was a problem hiding this comment.
My test already had all possible thickness and this behavior works for them.
engines/wage/design.cpp
Outdated
| if (borderThickness > 0 && borderFillType <= patterns.size()) | ||
| Graphics::drawEllipse(x1, y1, x2-1, y2-1, kColorBlack, false, drawPixel, &pd); | ||
| Graphics::drawEllipse(x1, y1, x2-1, y2-1, kColorBlack, false, drawPixelCircle, &pd); |
There was a problem hiding this comment.
Please write x2 - 1, y2 - 1. E.g. spaces around operators
engines/wage/entities.cpp
Outdated
| @@ -159,6 +159,13 @@ void Scene::paint(Graphics::ManagedSurface *surface, int x, int y) { | |||
| Designed *Scene::lookUpEntity(int x, int y) { | |||
| for (ObjList::const_iterator it = _objs.end(); it != _objs.begin(); ) { | |||
| it--; | |||
| if (((*it)->_name == "continue" && (*it)->_resourceId == 22259) || | |||
There was a problem hiding this comment.
Please add a comment explaining the reason here.
| @@ -215,6 +215,9 @@ bool World::loadWorld(Common::MacResManager *resMan) { | |||
| if (res != NULL) { | |||
| scene->_textBounds = readRect(res); | |||
| int fontType = res->readUint16BE(); | |||
| if (_name == "***DUNE ETERNITY*** ") | |||
There was a problem hiding this comment.
Please add explanation in a comment why is this needed
| x1 = in->readSint16BE(); | ||
| y2 = in->readSint16BE() + 4; | ||
| x2 = in->readSint16BE() + 4; | ||
| y1 = in->readSint16BE() - 2; |
There was a problem hiding this comment.
Please explain in a comment why we're doing this
graphics/macgui/macdialog.cpp
Outdated
| #include "common/events.h" | ||
| #include "common/system.h" | ||
|
|
||
| //#include "engines/engine.h" |
graphics/macgui/macdialog.cpp
Outdated
|
|
||
| Design::drawFilledRect(&_gui->_screen, bb, kColorBlack, _gui->_wm->getPatterns(), kPatternSolid); | ||
| Wage::Design::drawFilledRect(&_gui->_screen, bb, kColorBlack, _gui->_wm->getPatterns(), kPatternSolid); |
There was a problem hiding this comment.
Err, how Graphics:: could call a specific engine? Please refactor, the common code cannot refer to any engine
graphics/macgui/macdialog.cpp
Outdated
| #include "common/system.h" | ||
|
|
||
| //#include "engines/engine.h" | ||
| #include "engines/wage/design.h" |
There was a problem hiding this comment.
This should never be included here.
…mensions are changed
engines/wage/design.cpp
Outdated
| @@ -194,6 +194,24 @@ bool Design::isPointOpaque(int x, int y) { | |||
| return pixel != kColorGreen; | |||
| } | |||
|
|
|||
| bool Design::isInBounds(int x, int y) { | |||
| if (_surface == NULL) | |||
| error("Surface is null"); | |||
There was a problem hiding this comment.
I'd suggest writing "Design::isInBounds(): Surface is null"
| @@ -215,6 +215,10 @@ bool World::loadWorld(Common::MacResManager *resMan) { | |||
| if (res != NULL) { | |||
| scene->_textBounds = readRect(res); | |||
| int fontType = res->readUint16BE(); | |||
| // WORKAROUND: Dune Eternity has a weird fontType ID so we override it to the correct one | |||
There was a problem hiding this comment.
Could you please specify what is this "weird type ID"
There was a problem hiding this comment.
The fontType it reads is 14614 which is way outside of the range of font Types supported. So I hardcoded it to what it should be.
| 1, kColorBlack, _gui->_wm->getPatterns(), kPatternSolid); | ||
| } | ||
|
|
||
| int Dialog::run() { |
There was a problem hiding this comment.
I wonder, why is this running on an engine level but is not here? You may just return different things like "should quit" if EVEN_QUIT is set and kDialogOption1/kDialogOption2 for the requested options
|
Thanks! |
No description provided.