Fix code formatting (partially) and guard defines in includes.

svn-id: r26631

1 files changed, 216 insertions, 225 deletions

diff --git a/engines/cruise/menu.cpp b/engines/cruise/menu.cpp
index aaf28bcfd5..d76934439b 100644
--- a/engines/cruise/menu.cpp
+++ b/engines/cruise/menu.cpp
@@ -26,205 +26,199 @@
 
 namespace Cruise {
 
-menuStruct* menuTable[8];
+menuStruct *menuTable[8];
 
-menuStruct* createMenu(int X, int Y, const char* menuName)
-{
-  menuStruct* entry;
+menuStruct *createMenu(int X, int Y, const char *menuName) {
+	menuStruct *entry;
 
-  entry = (menuStruct*)malloc(sizeof(menuStruct));
-  ASSERT(entry);
+	entry = (menuStruct *) malloc(sizeof(menuStruct));
+	ASSERT(entry);
 
-  entry->x = X - 80;
-  entry->y = Y;
-  entry->stringPtr = menuName;
-  entry->numElements = 0;
-  entry->ptrNextElement = NULL;
-  entry->gfx = renderText(160,  (uint8*)menuName);
+	entry->x = X - 80;
+	entry->y = Y;
+	entry->stringPtr = menuName;
+	entry->numElements = 0;
+	entry->ptrNextElement = NULL;
+	entry->gfx = renderText(160, (uint8 *) menuName);
 
-  return entry;
+	return entry;
 }
 
 // TODO: rewrite to remove the goto
-void addSelectableMenuEntry(int param0, int param1, menuStruct* pMenu, int param2, int color, const char* menuText)
-{
-  menuElementStruct* di;
-  menuElementStruct* var_6;
-  menuElementStruct* pNewElement;
-  menuElementSubStruct* pSubStruct;
-  menuElementSubStruct* pSubStructCurrent;
-
-  if(pMenu->numElements <= 48)
-  {
-    var_6 = pMenu->ptrNextElement;
-
-    if(var_6)
-    {
-      do
-      {
-        di = var_6;
-        if(param2)
-        {
-          if(!strcmp(var_6->string, menuText))
-          {
-            pNewElement = var_6;
-            pSubStruct = (menuElementSubStruct*)allocAndZero(sizeof(menuElementSubStruct));
-            ASSERT(pSubStruct);
-
-            pSubStruct->pNext = NULL;
-            pSubStruct->var2 = param0;
-            pSubStruct->var4 = param1;
-
-            pSubStructCurrent = pNewElement->ptrSub;
-
-            if(!pSubStructCurrent)
-            {
-              pNewElement->ptrSub = pSubStruct;
-              return;
-            }
-
-            if(pSubStructCurrent->pNext)
-            {
-              do
-              {
-                pSubStructCurrent = pSubStructCurrent->pNext;
-              }while(pSubStructCurrent->pNext);
-            }
-
-            pSubStructCurrent->pNext = pSubStruct;
-            return;
-          }
-        }
-        var_6 = var_6->next;
-      }
-      while(var_6);
-
-      var_6 = di;
-    }
-
-    pNewElement = (menuElementStruct*)allocAndZero(sizeof(menuElementStruct));
-    ASSERT(pNewElement);
-    pSubStruct = (menuElementSubStruct*)allocAndZero(sizeof(menuElementSubStruct));
-    ASSERT(pSubStruct);
-
-    pNewElement->string = menuText;
-    pNewElement->next = NULL;
-    pNewElement->varC = 0;
-    pNewElement->color = color;
-    pNewElement->gfx = renderText(160,(uint8*)menuText);
-
-    if(var_6 == NULL)
-    {
-      pMenu->ptrNextElement = pNewElement;
-    }
-    else
-    {
-      var_6->next = pNewElement;
-    }
-
-    pNewElement->ptrSub = pSubStruct;
-
-    pSubStruct->pNext = NULL;
-    pSubStruct->var2 = param0;
-    pSubStruct->var4 = param1;
-
-    pMenu->numElements++;
-  }
+void addSelectableMenuEntry(int param0, int param1, menuStruct *pMenu,
+	    int param2, int color, const char *menuText) {
+	menuElementStruct *di;
+	menuElementStruct *var_6;
+	menuElementStruct *pNewElement;
+	menuElementSubStruct *pSubStruct;
+	menuElementSubStruct *pSubStructCurrent;
+
+	if (pMenu->numElements <= 48) {
+		var_6 = pMenu->ptrNextElement;
+
+		if (var_6) {
+			do {
+				di = var_6;
+				if (param2) {
+					if (!strcmp(var_6->string, menuText)) {
+						pNewElement = var_6;
+						pSubStruct =
+						    (menuElementSubStruct *)
+						    allocAndZero(sizeof
+						    (menuElementSubStruct));
+						ASSERT(pSubStruct);
+
+						pSubStruct->pNext = NULL;
+						pSubStruct->var2 = param0;
+						pSubStruct->var4 = param1;
+
+						pSubStructCurrent =
+						    pNewElement->ptrSub;
+
+						if (!pSubStructCurrent) {
+							pNewElement->ptrSub =
+							    pSubStruct;
+							return;
+						}
+
+						if (pSubStructCurrent->pNext) {
+							do {
+								pSubStructCurrent
+								    =
+								    pSubStructCurrent->
+								    pNext;
+							} while
+							    (pSubStructCurrent->
+							    pNext);
+						}
+
+						pSubStructCurrent->pNext =
+						    pSubStruct;
+						return;
+					}
+				}
+				var_6 = var_6->next;
+			}
+			while (var_6);
+
+			var_6 = di;
+		}
+
+		pNewElement =
+		    (menuElementStruct *)
+		    allocAndZero(sizeof(menuElementStruct));
+		ASSERT(pNewElement);
+		pSubStruct =
+		    (menuElementSubStruct *)
+		    allocAndZero(sizeof(menuElementSubStruct));
+		ASSERT(pSubStruct);
+
+		pNewElement->string = menuText;
+		pNewElement->next = NULL;
+		pNewElement->varC = 0;
+		pNewElement->color = color;
+		pNewElement->gfx = renderText(160, (uint8 *) menuText);
+
+		if (var_6 == NULL) {
+			pMenu->ptrNextElement = pNewElement;
+		} else {
+			var_6->next = pNewElement;
+		}
+
+		pNewElement->ptrSub = pSubStruct;
+
+		pSubStruct->pNext = NULL;
+		pSubStruct->var2 = param0;
+		pSubStruct->var4 = param1;
+
+		pMenu->numElements++;
+	}
 }
 
-void updateMenuMouse(int mouseX, int mouseY, menuStruct* pMenu)
-{
-  if(pMenu)
-  {
-    if(pMenu->gfx)
-    {
-      int height = pMenu->gfx->height; // rustine
-      int var_2  = 0;
-      menuElementStruct* pCurrentEntry = pMenu->ptrNextElement;
-
-      while(pCurrentEntry)
-      {
-        pCurrentEntry->varC = 0;
-
-        if(var_2 == 0)
-        {
-          if((mouseX > pCurrentEntry->x) && ((pCurrentEntry->x + 160) >= mouseX))
-          {
-            if((mouseY > pCurrentEntry->y) && ((pCurrentEntry->y + height) >= mouseY))
-            {
-              var_2 = 1;
-              pCurrentEntry->varC = 1;
-            }
-          }
-        }
-
-        pCurrentEntry = pCurrentEntry->next;
-      }
-    }
-  }
+void updateMenuMouse(int mouseX, int mouseY, menuStruct *pMenu) {
+	if (pMenu) {
+		if (pMenu->gfx) {
+			int height = pMenu->gfx->height;	// rustine
+			int var_2 = 0;
+			menuElementStruct *pCurrentEntry =
+			    pMenu->ptrNextElement;
+
+			while (pCurrentEntry) {
+				pCurrentEntry->varC = 0;
+
+				if (var_2 == 0) {
+					if ((mouseX > pCurrentEntry->x)
+					    && ((pCurrentEntry->x + 160) >=
+						mouseX)) {
+						if ((mouseY > pCurrentEntry->y)
+						    && ((pCurrentEntry->y +
+							    height) >=
+							mouseY)) {
+							var_2 = 1;
+							pCurrentEntry->varC =
+							    1;
+						}
+					}
+				}
+
+				pCurrentEntry = pCurrentEntry->next;
+			}
+		}
+	}
 }
 
-int processMenu(menuStruct* pMenu)
-{
-  int16 mouseX;
-  int16 mouseY;
-  int16 mouseButton;
-  int di;
-  int si;
-  currentActiveMenu = 0;
+int processMenu(menuStruct *pMenu) {
+	int16 mouseX;
+	int16 mouseY;
+	int16 mouseButton;
+	int di;
+	int si;
+	currentActiveMenu = 0;
 
-  mainDraw(1);
-  flipScreen();
+	mainDraw(1);
+	flipScreen();
 
-  di = 0;
-  si = 0;
+	di = 0;
+	si = 0;
 
-  do
-  {
-    getMouseStatus(&main10, &mouseX, &mouseButton, &mouseY);
+	do {
+		getMouseStatus(&main10, &mouseX, &mouseButton, &mouseY);
 
-    updateMenuMouse(mouseX, mouseY, pMenu);
+		updateMenuMouse(mouseX, mouseY, pMenu);
 
-    if(mouseButton)
-    {
-      if(di)
-      {
-        si = 1;
-      }
-    }
-    else
-    {
-      di = 1;
-    }
+		if (mouseButton) {
+			if (di) {
+				si = 1;
+			}
+		} else {
+			di = 1;
+		}
 
-    mainDraw(1);
-    flipScreen();
+		mainDraw(1);
+		flipScreen();
 
 //    readKeyboard();
-  }while(!si);
+	} while (!si);
 
-  currentActiveMenu = -1;
+	currentActiveMenu = -1;
 
-  mainDraw(1);
-  flipScreen();
+	mainDraw(1);
+	flipScreen();
 
-  return 0;
+	return 0;
 }
 
-int playerMenu(int menuX, int menuY)
-{
-  int retourMenu;
-  //int restartGame = 0;
-
-  if(entrerMenuJoueur && affichePasMenuJoueur)
-  {
-    if(var0)
-    {
-      systemStrings.param = 0;
-      var24 = 0;
-      var23 = 0;
-      freeStuff2();
-    }
+int playerMenu(int menuX, int menuY) {
+	int retourMenu;
+	//int restartGame = 0;
+
+	if (entrerMenuJoueur && affichePasMenuJoueur) {
+		if (var0) {
+			systemStrings.param = 0;
+			var24 = 0;
+			var23 = 0;
+			freeStuff2();
+		}
 /*
     if(currentMenu)
     {
@@ -251,71 +245,68 @@ int playerMenu(int menuX, int menuY)
 
 /*    mouseVar2 = 0;
     mouseVar1 = 0; */
-    freeDisk();
-
-    menuTable[0] = createMenu(menuX, menuY, "Menu Joueur");
-    ASSERT(menuTable[0]);
-
-    addSelectableMenuEntry(0, 3, menuTable[0], 1, -1, "Lecteur de Sauvegarde");
-    if(userEnabled)
-    {
-      addSelectableMenuEntry(0, 4, menuTable[0], 1, -1, "Sauvegarde");
-    }
-    addSelectableMenuEntry(0, 5, menuTable[0], 1, -1, "Chargement");
-    addSelectableMenuEntry(0, 6, menuTable[0], 1, -1, "Recommencer le jeu");
-    addSelectableMenuEntry(0, 7, menuTable[0], 1, -1, "Chargement");
-
-    retourMenu = processMenu(menuTable[0]);
-  }
-
-  return 0;
+		freeDisk();
+
+		menuTable[0] = createMenu(menuX, menuY, "Menu Joueur");
+		ASSERT(menuTable[0]);
+
+		addSelectableMenuEntry(0, 3, menuTable[0], 1, -1,
+		    "Lecteur de Sauvegarde");
+		if (userEnabled) {
+			addSelectableMenuEntry(0, 4, menuTable[0], 1, -1,
+			    "Sauvegarde");
+		}
+		addSelectableMenuEntry(0, 5, menuTable[0], 1, -1,
+		    "Chargement");
+		addSelectableMenuEntry(0, 6, menuTable[0], 1, -1,
+		    "Recommencer le jeu");
+		addSelectableMenuEntry(0, 7, menuTable[0], 1, -1,
+		    "Chargement");
+
+		retourMenu = processMenu(menuTable[0]);
+	}
+
+	return 0;
 }
 
-void freeGfx(gfxEntryStruct* pGfx)
-{
-  if(pGfx->imagePtr)
-  {
-    free(pGfx->imagePtr);
-  }
+void freeGfx(gfxEntryStruct *pGfx) {
+	if (pGfx->imagePtr) {
+		free(pGfx->imagePtr);
+	}
 
-  free(pGfx);
+	free(pGfx);
 }
 
-void freeMenu(menuStruct* pMenu)
-{
-  menuElementStruct* pElement = pMenu->ptrNextElement;
+void freeMenu(menuStruct *pMenu) {
+	menuElementStruct *pElement = pMenu->ptrNextElement;
 
-  while(pElement)
-  {
-    menuElementStruct* next;
-    menuElementSubStruct* pSub = pElement->ptrSub;
+	while (pElement) {
+		menuElementStruct *next;
+		menuElementSubStruct *pSub = pElement->ptrSub;
 
-    next = pElement->next;
+		next = pElement->next;
 
-    while(pSub)
-    {
-      menuElementSubStruct* nextSub;
+		while (pSub) {
+			menuElementSubStruct *nextSub;
 
-      nextSub = pSub->pNext;
+			nextSub = pSub->pNext;
 
-      free(pSub);
+			free(pSub);
 
-      pSub=nextSub;
-    }
+			pSub = nextSub;
+		}
 
-    if(pElement->gfx)
-    {
-      freeGfx(pElement->gfx);
-    }
+		if (pElement->gfx) {
+			freeGfx(pElement->gfx);
+		}
 
-    free(pElement);
+		free(pElement);
 
-    pElement = next;
-  }
+		pElement = next;
+	}
 
-  freeGfx(pMenu->gfx);
-  free(pMenu);
+	freeGfx(pMenu->gfx);
+	free(pMenu);
 }
 
 } // End of namespace Cruise
-