Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
DREAMWEB: Move Bresenham output out of data segment
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,6 +24,10 @@ | |
|
|
||
| namespace DreamGen { | ||
|
|
||
| // Output of Bresenham | ||
| Common::Point g_lineData[200]; | ||
This comment has been minimized.
Sorry, something went wrong. |
||
|
|
||
|
|
||
| void DreamGenContext::turnPathOn() { | ||
| turnPathOn(al); | ||
| } | ||
|
|
@@ -131,7 +135,7 @@ bool DreamGenContext::checkIfPathIsOn(uint8 index) { | |
|
|
||
| void DreamGenContext::bresenhams() { | ||
| workoutFrames(); | ||
| Common::Point *lineData = &g_lineData[0]; | ||
| int16 startX = (int16)data.word(kLinestartx); | ||
| int16 startY = (int16)data.word(kLinestarty); | ||
| int16 endX = (int16)data.word(kLineendx); | ||
|
|
@@ -152,13 +156,12 @@ void DreamGenContext::bresenhams() { | |
| ++deltaY; | ||
| int8 x = (int8)startX; | ||
| data.byte(kLinelength) = deltaY; | ||
| for (; deltaY; --deltaY) { | ||
| lineData->x = x; | ||
| lineData->y = y; | ||
| ++lineData; | ||
| ++y; | ||
| } | ||
| return; | ||
| } | ||
| uint16 deltaX; | ||
|
|
@@ -182,13 +185,12 @@ void DreamGenContext::bresenhams() { | |
| int8 y = (int8)startY; | ||
| ++deltaX; | ||
| data.byte(kLinelength) = deltaX; | ||
| for (; deltaX; --deltaX) { | ||
| lineData->x = x; | ||
| lineData->y = y; | ||
| ++lineData; | ||
| ++x; | ||
| } | ||
| return; | ||
| } | ||
| uint16 deltaY; | ||
|
|
@@ -219,32 +221,30 @@ void DreamGenContext::bresenhams() { | |
| int8 y = (int8)startY; | ||
| data.byte(kLinelength) = delta1; | ||
| if (data.byte(kLineroutine) != 1) { | ||
| for (; delta1; --delta1) { | ||
| lineData->x = x; | ||
| lineData->y = y; | ||
| ++lineData; | ||
| ++x; | ||
| if (remainder < 0) { | ||
| remainder += data.word(kIncrement1); | ||
| } else { | ||
| remainder += data.word(kIncrement2); | ||
| y += increment; | ||
| } | ||
| } | ||
| } else { | ||
| for (; delta1; --delta1) { | ||
| lineData->x = x; | ||
| lineData->y = y; | ||
| ++lineData; | ||
| y += increment; | ||
| if (remainder < 0) { | ||
| remainder += data.word(kIncrement1); | ||
| } else { | ||
| remainder += data.word(kIncrement2); | ||
| ++x; | ||
| } | ||
| } while (delta1); | ||
This comment has been minimized.
Sorry, something went wrong. 
fingolfin
Contributor
|
||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
engines/dreamweb/pathfind.cpp:28: warning: ‘DreamGen::g_lineData’ requires global construction
This should be put into a class (member).