DREAMWEB: Fix compilation due to dreamgen.* function renaming.

1 files changed, 30 insertions, 31 deletions

diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp
index d367f02d15..2ca732467f 100644
--- a/engines/dreamweb/pathfind.cpp
+++ b/engines/dreamweb/pathfind.cpp
@@ -24,62 +24,61 @@
 
 namespace DreamGen {
 
-void DreamGenContext::turnpathon() {
-	turnpathon(al);
+void DreamGenContext::turnPathOn() {
+	turnPathOn(al);
 }
 
-void DreamGenContext::turnpathon(uint8 param) {
-	findormake(param, 0xff, data.byte(kRoomnum) + 100);
-	PathNode *roomsPaths = getroomspaths()->nodes;
+void DreamGenContext::turnPathOn(uint8 param) {
+	findOrMake(param, 0xff, data.byte(kRoomnum) + 100);
+	PathNode *roomsPaths = getRoomsPaths()->nodes;
 	if (param == 0xff)
 		return;
 	roomsPaths[param].on = 0xff;
 }
 
-void DreamGenContext::turnpathoff() {
-	turnpathoff(al);
+void DreamGenContext::turnPathOff() {
+	turnPathOff(al);
 }
 
-void DreamGenContext::turnpathoff(uint8 param) {
-	findormake(param, 0x00, data.byte(kRoomnum) + 100);
-	PathNode *roomsPaths = getroomspaths()->nodes;
+void DreamGenContext::turnPathOff(uint8 param) {
+	findOrMake(param, 0x00, data.byte(kRoomnum) + 100);
+	PathNode *roomsPaths = getRoomsPaths()->nodes;
 	if (param == 0xff)
 		return;
 	roomsPaths[param].on = 0x00;
 }
 
-void DreamGenContext::turnanypathon(uint8 param, uint8 room) {
-	findormake(param, 0xff, room + 100);
+void DreamGenContext::turnAnyPathOn(uint8 param, uint8 room) {
+	findOrMake(param, 0xff, room + 100);
 	PathNode *paths = (PathNode *)segRef(data.word(kReels)).ptr(kPathdata + 144 * room, 0);
 	paths[param].on = 0xff;
 }
 
-
-void DreamGenContext::turnanypathon() {
-	turnanypathon(al, ah);
+void DreamGenContext::turnAnyPathOn() {
+	turnAnyPathOn(al, ah);
 }
 
-void DreamGenContext::turnanypathoff(uint8 param, uint8 room) {
-	findormake(param, 0x00, room + 100);
+void DreamGenContext::turnAnyPathOff(uint8 param, uint8 room) {
+	findOrMake(param, 0x00, room + 100);
 	PathNode *paths = (PathNode *)segRef(data.word(kReels)).ptr(kPathdata + 144 * room, 0);
 	paths[param].on = 0x00;
 }
 
-void DreamGenContext::turnanypathoff() {
-	turnanypathoff(al, ah);
+void DreamGenContext::turnAnyPathOff() {
+	turnAnyPathOff(al, ah);
 }
 
-RoomPaths *DreamGenContext::getroomspaths() {
+RoomPaths *DreamGenContext::getRoomsPaths() {
 	void *result = segRef(data.word(kReels)).ptr(data.byte(kRoomnum) * 144, 144);
 	return (RoomPaths *)result;
 }
 
-void DreamGenContext::autosetwalk() {
+void DreamGenContext::autoSetWalk() {
 	al = data.byte(kManspath);
 	if (data.byte(kFinaldest) == al)
 		return;
-	const RoomPaths *roomsPaths = getroomspaths();
-	checkdest(roomsPaths);
+	const RoomPaths *roomsPaths = getRoomsPaths();
+	checkDest(roomsPaths);
 	data.word(kLinestartx) = roomsPaths->nodes[data.byte(kManspath)].x - 12;
 	data.word(kLinestarty) = roomsPaths->nodes[data.byte(kManspath)].y - 12;
 	data.word(kLineendx) = roomsPaths->nodes[data.byte(kDestination)].x - 12;
@@ -93,7 +92,7 @@ void DreamGenContext::autosetwalk() {
 	data.byte(kLinepointer) = 0;
 }
 
-void DreamGenContext::checkdest(const RoomPaths *roomsPaths) {
+void DreamGenContext::checkDest(const RoomPaths *roomsPaths) {
 	const PathSegment *segments = roomsPaths->segments;
 	ah = data.byte(kManspath) << 4;
 	al = data.byte(kDestination);
@@ -114,24 +113,24 @@ void DreamGenContext::checkdest(const RoomPaths *roomsPaths) {
 	data.byte(kDestination) = destination;
 }
 
-void DreamGenContext::findxyfrompath() {
-	const PathNode *roomsPaths = getroomspaths()->nodes;
+void DreamGenContext::findXYFromPath() {
+	const PathNode *roomsPaths = getRoomsPaths()->nodes;
 	data.byte(kRyanx) = roomsPaths[data.byte(kManspath)].x - 12;
 	data.byte(kRyany) = roomsPaths[data.byte(kManspath)].y - 12;
 }
 
-void DreamGenContext::checkifpathison() {
-	flags._z = checkifpathison(al);
+void DreamGenContext::checkIfPathIsOn() {
+	flags._z = checkIfPathIsOn(al);
 }
 
-bool DreamGenContext::checkifpathison(uint8 index) {
-	RoomPaths *roomsPaths = getroomspaths();
+bool DreamGenContext::checkIfPathIsOn(uint8 index) {
+	RoomPaths *roomsPaths = getRoomsPaths();
 	uint8 pathOn = roomsPaths->nodes[index].on;
 	return pathOn == 0xff;
 }
 
 void DreamGenContext::bresenhams() {
-	workoutframes();
+	workoutFrames();
 	int8 *lineData = (int8 *)data.ptr(kLinedata, 0);
 	int16 startX = (int16)data.word(kLinestartx);
 	int16 startY = (int16)data.word(kLinestarty);