A ton of code formatting fixes; also fixed warnings about single line loops like 'while(cond);' by inserting newlines

svn-id: r36127

2 files changed, 8 insertions, 7 deletions

diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index 7aa4af059d..33ee526785 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -565,11 +565,11 @@ bool DrasculaEngine::room_21(int fl) {
 		toggleDoor(0, 1, kOpenDoor);
 	else if (pickedObject == kVerbClose && fl == 101)
 		toggleDoor(0, 1, kCloseDoor);
-	else if(pickedObject == kVerbPick && fl == 141) {
+	else if (pickedObject == kVerbPick && fl == 141) {
 		pickObject(19);
 		visible[2] = 0;
 		flags[10] = 1;
-	} else if(pickedObject == 7 && fl == 101) {
+	} else if (pickedObject == 7 && fl == 101) {
 		flags[28] = 1;
 		toggleDoor(0, 1, kOpenDoor);
 		selectVerb(0);
@@ -616,14 +616,14 @@ bool DrasculaEngine::room_23(int fl) {
 	if (pickedObject == kVerbOpen && fl == 103) {
 		toggleDoor(0, 0, kOpenDoor);
 		updateVisible();
-	} else if(pickedObject == kVerbClose && fl == 103) {
+	} else if (pickedObject == kVerbClose && fl == 103) {
 		toggleDoor(0, 0, kCloseDoor);
 		updateVisible();
-	} else if(pickedObject == kVerbOpen && fl == 104)
+	} else if (pickedObject == kVerbOpen && fl == 104)
 		toggleDoor(1, 1, kOpenDoor);
-	else if(pickedObject == kVerbClose && fl == 104)
+	else if (pickedObject == kVerbClose && fl == 104)
 		toggleDoor(1, 1, kCloseDoor);
-	else if(pickedObject == kVerbPick && fl == 142) {
+	else if (pickedObject == kVerbPick && fl == 142) {
 		pickObject(8);
 		visible[2] = 0;
 		flags[11] = 1;
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index 8fc52a18b5..7c94938c9b 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -943,7 +943,8 @@ void DrasculaEngine::grr() {
 
 	updateScreen();
 
-	while (!isTalkFinished());
+	while (!isTalkFinished())
+		;
 
 	updateRoom();
 	updateScreen();