CGE: Format code

1 files changed, 134 insertions, 142 deletions

diff --git a/engines/cge/startup.cpp b/engines/cge/startup.cpp
index c2badee266..2bed51af97 100644
--- a/engines/cge/startup.cpp
+++ b/engines/cge/startup.cpp
@@ -25,173 +25,165 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#include	"cge/startup.h"
-#include	"cge/text.h"
-#include	"cge/sound.h"
-#include	"cge/ident.h"
-#include	"cge/cfile.h"
-#include	"cge/snddrv.h"
-#include	<stdio.h>
-#include	<process.h>
-#include	<dos.h>
-//#include	<alloc.h>
-#include	<string.h>
-
-#ifdef	DEBUG
-  #include	<stdlib.h>
+#include "cge/startup.h"
+#include "cge/text.h"
+#include "cge/sound.h"
+#include "cge/ident.h"
+#include "cge/cfile.h"
+#include "cge/snddrv.h"
+#include <stdio.h>
+#include <process.h>
+#include <dos.h>
+#include <string.h>
+
+#ifdef  DEBUG
+#include <stdlib.h>
 #endif
 
 namespace CGE {
 
-extern	char	Copr[];
+extern char Copr[];
 
-#define	id	(*(IDENT*)Copr)
+#define id (*(IDENT*)Copr)
 
 
-	EMM	MiniEmm		= MINI_EMM_SIZE;
+EMM MiniEmm = MINI_EMM_SIZE;
 
-static	STARTUP	StartUp;
+static STARTUP StartUp;
 
 
-	int	STARTUP::Mode = 0;
-	int	STARTUP::Core;
-	int	STARTUP::SoundOk = 0;
-	uint16	STARTUP::Summa;
+int    STARTUP::Mode = 0;
+int    STARTUP::Core;
+int    STARTUP::SoundOk = 0;
+uint16 STARTUP::Summa;
 
 
-
-void quit_now(int ref){
-  error("%d\n", Text[ref]);
-}
-
-
-
-bool STARTUP::get_parms(void)
-{
-/*
-  int i = _argc;
-  while (i > 1)
-    {
-      static char *PrmTab[] = { "NEW", "MK0SVG", "QUIET", "SB", "GUS", "MIDI",
-				"P", "D", "I", "M" };
-      int n = TakeEnum(PrmTab, strtok(_argv[--i], " =:("));
-      uint16 p = xtow(strtok(NULL, " h,)"));
-      switch (n)
-	{
-	  case 0 : if (Mode != 2) Mode = 1; break;
-	  case 1 : Mode = 2; break;
-	  case 2 : SNDDrvInfo.DDEV = DEV_QUIET; break;
-	  case 3 : SNDDrvInfo.DDEV = DEV_SB; break;
-	  case 4 : SNDDrvInfo.DDEV = DEV_GUS; break;
-	  case 5 : SNDDrvInfo.MDEV = DEV_GM; break;
-	  case 6 : SNDDrvInfo.DBASE = p; break;
-	  case 7 : SNDDrvInfo.DDMA = p; break;
-	  case 8 : SNDDrvInfo.DIRQ = p; break;
-	  case 9 : SNDDrvInfo.MBASE = p;
-		   SNDDrvInfo.MDEV = DEV_GM; break;
-	  default: return false;
-	}
-      if (n >= 2) SoundOk = 2;
-    }
-  #ifdef DEMO
-      // protection disabled
-      Summa = 0;
-  #else
-    #ifdef EVA
-      {
-	union { dosdate_t d; uint32 n; } today;
-	_dos_getdate(&today.d);
-	id.disk += (id.disk < today.n);
-      }
-    #endif
-    #ifdef CD
-      Summa = 0;
-    #else
-      // disk signature checksum
-      Summa = ChkSum(Copr, sizeof(IDENT));
-    #endif
-  #endif
-  if (SNDDrvInfo.MDEV != DEV_GM) SNDDrvInfo.MDEV = SNDDrvInfo.DDEV;
-  */
-  warning("STUB: STARTUP::get_parms");
-  return true;
+void quit_now(int ref) {
+	error("%d\n", Text[ref]);
 }
 
 
-
-
-STARTUP::STARTUP(void)
-{
-/*
-  uint32 m = farcoreleft() >> 10;
-  if (m < 0x7FFF) Core = (int) m; else Core = 0x7FFF;
-
-  if (! IsVga()) quit_now(NOT_VGA_TEXT);
-  if (Cpu() < _80286) quit_now(BAD_CHIP_TEXT);
-  if (100 * _osmajor + _osminor < 330) quit_now(BAD_DOS_TEXT);
-
-  #ifndef DEBUG
-  if (Core < CORE_LOW) quit_now(NO_CORE_TEXT);
-  if (Core < CORE_HIG)
-    {
-      SNDDrvInfo.MDEV = DEV_QUIET;
-      Music = false;
-    }
-  #endif
-  if (! get_parms()) quit_now(BAD_ARG_TEXT);
-  //--- load sound configuration
-  const char * fn = UsrPath(ProgName(CFG_EXT));
-  if (! STARTUP::SoundOk && CFILE::Exist(fn))
-    {
-      CFILE cfg(fn, REA);
-      if (! cfg.Error)
-	{
-	  cfg.Read(&SNDDrvInfo, sizeof(SNDDrvInfo)-sizeof(SNDDrvInfo.VOL2));
-	  if (! cfg.Error) STARTUP::SoundOk = 1;
-	}
-    }
-	*/
-	warning("STUB: STARTUP::STARTUP");
+bool STARTUP::get_parms(void) {
+	/*
+	  int i = _argc;
+	  while (i > 1)
+	    {
+	      static char *PrmTab[] = { "NEW", "MK0SVG", "QUIET", "SB", "GUS", "MIDI",
+	                "P", "D", "I", "M" };
+	      int n = TakeEnum(PrmTab, strtok(_argv[--i], " =:("));
+	      uint16 p = xtow(strtok(NULL, " h,)"));
+	      switch (n)
+	    {
+	      case 0 : if (Mode != 2) Mode = 1; break;
+	      case 1 : Mode = 2; break;
+	      case 2 : SNDDrvInfo.DDEV = DEV_QUIET; break;
+	      case 3 : SNDDrvInfo.DDEV = DEV_SB; break;
+	      case 4 : SNDDrvInfo.DDEV = DEV_GUS; break;
+	      case 5 : SNDDrvInfo.MDEV = DEV_GM; break;
+	      case 6 : SNDDrvInfo.DBASE = p; break;
+	      case 7 : SNDDrvInfo.DDMA = p; break;
+	      case 8 : SNDDrvInfo.DIRQ = p; break;
+	      case 9 : SNDDrvInfo.MBASE = p;
+	           SNDDrvInfo.MDEV = DEV_GM; break;
+	      default: return false;
+	    }
+	      if (n >= 2) SoundOk = 2;
+	    }
+	  #ifdef DEMO
+	      // protection disabled
+	      Summa = 0;
+	  #else
+	    #ifdef EVA
+	      {
+	    union { dosdate_t d; uint32 n; } today;
+	    _dos_getdate(&today.d);
+	    id.disk += (id.disk < today.n);
+	      }
+	    #endif
+	    #ifdef CD
+	      Summa = 0;
+	    #else
+	      // disk signature checksum
+	      Summa = ChkSum(Copr, sizeof(IDENT));
+	    #endif
+	  #endif
+	  if (SNDDrvInfo.MDEV != DEV_GM) SNDDrvInfo.MDEV = SNDDrvInfo.DDEV;
+	return true;
+	  */
+	warning("STUB: STARTUP::get_parms");
+	return true;
 }
 
 
+STARTUP::STARTUP(void) {
+	/*
+	  uint32 m = farcoreleft() >> 10;
+	  if (m < 0x7FFF) Core = (int) m; else Core = 0x7FFF;
 
+	  if (! IsVga()) quit_now(NOT_VGA_TEXT);
+	  if (Cpu() < _80286) quit_now(BAD_CHIP_TEXT);
+	  if (100 * _osmajor + _osminor < 330) quit_now(BAD_DOS_TEXT);
 
-
-
-const char *UsrPath (const char *nam)
-{
-  static char buf[MAXPATH] = ".\\", *p = buf+2;
-  #if defined(CD)
-  if (DriveCD(0))
-    {
-      bool ok = false;
-      CFILE ini = Text[CDINI_FNAME];
-      if (!ini.Error)
-	{
-	  char *key = Text[GAME_ID];
-	  int i = strlen(key);
-	  while (ini.Read(buf) && !ok)
+	  #ifndef DEBUG
+	  if (Core < CORE_LOW) quit_now(NO_CORE_TEXT);
+	  if (Core < CORE_HIG)
 	    {
-	      int j = strlen(buf);
-	      if (j) if (buf[--j] == '\n') buf[j] = '\0';
-	      if (memicmp(buf, key, i) == 0) ok = true;
+	      SNDDrvInfo.MDEV = DEV_QUIET;
+	      Music = false;
 	    }
-	  if (ok)
+	  #endif
+	  if (! get_parms()) quit_now(BAD_ARG_TEXT);
+	  //--- load sound configuration
+	  const char * fn = UsrPath(ProgName(CFG_EXT));
+	  if (! STARTUP::SoundOk && CFILE::Exist(fn))
+	    {
+	      CFILE cfg(fn, REA);
+	      if (! cfg.Error)
 	    {
-	      strcpy(buf, buf+i);
-	      p = buf + strlen(buf);
-	      if (*(p-1) != '\\') *(p++) = '\\';
-	      strcpy(p, "NUL");
-	      if (_dos_open(buf, 0, &i) == 0) _dos_close(i);
-	      else ok = false;
+	      cfg.Read(&SNDDrvInfo, sizeof(SNDDrvInfo)-sizeof(SNDDrvInfo.VOL2));
+	      if (! cfg.Error) STARTUP::SoundOk = 1;
 	    }
+	    }
+	    */
+	warning("STUB: STARTUP::STARTUP");
+}
+
+
+const char *UsrPath(const char *nam) {
+	static char buf[MAXPATH] = ".\\", *p = buf + 2;
+#if defined(CD)
+	if (DriveCD(0)) {
+		bool ok = false;
+		CFILE ini = Text[CDINI_FNAME];
+		if (!ini.Error) {
+			char *key = Text[GAME_ID];
+			int i = strlen(key);
+			while (ini.Read(buf) && !ok) {
+				int j = strlen(buf);
+				if (j) 
+					if (buf[--j] == '\n') 
+						buf[j] = '\0';
+				if (memicmp(buf, key, i) == 0) 
+					ok = true;
+			}
+			if (ok) {
+				strcpy(buf, buf + i);
+				p = buf + strlen(buf);
+				if (*(p - 1) != '\\') 
+					*(p++) = '\\';
+				strcpy(p, "NUL");
+				if (_dos_open(buf, 0, &i) == 0) 
+					_dos_close(i);
+				else 
+					ok = false;
+			}
+		}
+		if (!ok) 
+			quit_now(BADCD_TEXT);
 	}
-      if (!ok) quit_now(BADCD_TEXT);
-    }
-  #endif
-  strcpy(p, nam);
-  return buf;
+#endif
+	strcpy(p, nam);
+	return buf;
 }
 
 } // End of namespace CGE