From 0b2f22c91190da950d3571fa50600681db599c16 Mon Sep 17 00:00:00 2001
From: albertzeyer <albertzeyer@4df4b0f3-56ce-47cb-b001-ed939b7d65a6>
Date: Wed, 22 Jul 2009 20:18:20 +0000
Subject: [PATCH] some fixes for menu

git-svn-id: https://clonekeenplus.svn.sourceforge.net/svnroot/clonekeenplus/cgenius/trunk@104 4df4b0f3-56ce-47cb-b001-ed939b7d65a6
---
 src/CGame.cpp                |   20 +-
 src/CGame.h                  |    2 +-
 src/main.cpp                 | 1364 +++++++++++++++++-----------------
 src/sdl/sound/CSound.cpp     |   78 +-
 src/sdl/sound/CSound.h       |    2 +-
 src/sdl/sound/CSoundSlot.cpp |    2 +-
 6 files changed, 737 insertions(+), 731 deletions(-)

diff --git a/src/CGame.cpp b/src/CGame.cpp
index 64a6f74fc..d061c631a 100644
--- a/src/CGame.cpp
+++ b/src/CGame.cpp
@@ -218,7 +218,7 @@ short CGame::runCycle(stCloneKeenPlus *pCKP)
 		return 0;
 }
 
-int CGame::loadResources(unsigned short Episode, char *DataDirectory)
+bool CGame::loadResources(unsigned short Episode, char *DataDirectory)
 {
 	m_Episode = Episode;
 	memcpy(m_DataDirectory, DataDirectory, 256);
@@ -251,12 +251,17 @@ int CGame::loadResources(unsigned short Episode, char *DataDirectory)
 	
 	if(ExeFile->getData() == NULL) {
 		g_pLogFile->textOut(RED, "CGame::loadResources: Could not load data out of EXE<br>");
-		return 1;
+		delete ExeFile;
+		return false;
 	}
 	
 	TileLoader = new CTileLoader(Episode, ExeFile->getEXEVersion(), ExeFile->getData());
-	if(!TileLoader->load()) return 1;
-
+	if(!TileLoader->load()) {
+		g_pLogFile->textOut(RED, "CGame::loadResources: Could not load data with TileLoader<br>");
+		delete ExeFile;
+		return false;
+	}
+	
     // load the strings. TODO: After that this one will replace loadstrings
     //m_Messages = new CMessages();    delete ExeFile;
     //m_Messages->readData(char *buf, int episode, int version);
@@ -265,10 +270,9 @@ int CGame::loadResources(unsigned short Episode, char *DataDirectory)
     delete ExeFile;
 
 	// Load the sound data
-	int ok;
-	ok = g_pSound->loadSoundData(m_Episode, DataDirectory);
-	if( ok ) return ok;
-	return 0;
+	bool ok = g_pSound->loadSoundData(m_Episode, DataDirectory);
+	if( !ok ) return false;
+	return true;
 }
 
 void CGame::freeResources(void)
diff --git a/src/CGame.h b/src/CGame.h
index 6dd5ce2e0..9ca3a1011 100644
--- a/src/CGame.h
+++ b/src/CGame.h
@@ -17,7 +17,7 @@ public:
 	CGame();
 	virtual ~CGame();
 
-	int loadResources(unsigned short Episode, char *DataDirectory);
+	bool loadResources(unsigned short Episode, char *DataDirectory);
 	void freeResources(void);
 	short runCycle(stCloneKeenPlus *pCKP);
 	void preallocateCKP(stCloneKeenPlus *pCKP);
diff --git a/src/main.cpp b/src/main.cpp
index 28588de72..4d7ad50a5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,681 +1,683 @@
-
-/* MAIN.C
-  This is CloneKeen's main source file.
-
-  The CloneKeen source may be freely distributed and
-  modified as per the GPL but please give credit to
-  the original author, Caitlin Shaw and to the new author
-  Gerstrong.
-
-  If you make any changes or improvements to the code that
-  you feel merit inclusion in the source tree email them
-  to me at gerstrong@gmail.com or get my latest email
-  from the SourceForge site.
-
-  Thanks to ID Software for the "Commander Keen: Invasion of
-  the Vorticons" games. "Commander Keen" and it's associated
-  graphics, level, and sound files are the property of ID
-  Software. Commander Genius requires the original version of a
-  Commander Keen game in order to be able to emulate that
-  episode.
-
-  Enjoy the Code
-         - The Commander Genius Team
-
-  CloneKeen 		2003-2005 Caitlin Shaw
-  CloneKeenPlus 	2008-2009 Gerstrong
-  Commander Genius 	2009	  Tulip, Pickle, DaVince and Albert
-*/
-
-#include "keen.h"
-#include "sdl/joydrv.h"
-#include "sdl/CInput.h"
-#include "sdl/CTimer.h"
-#include "sdl/sound/CSound.h"
-#include "include/misc.h"
-#include "include/menu.h"
-#include "sdl/CVideoDriver.h"
-#include "include/game.h"
-#include "include/eseq_ep2.h"
-#include "include/fileio.h"
-#include "include/fileio/story.h"
-#include "include/main.h"
-#include "fileio/CParser.h"
-#include "vorticon/CPlayer.h"
-#include "vorticon/CHighScores.h"
-#include "CLogFile.h"
-#include "CGame.h"
-#include "CGraphics.h"
-#include "sdl/CSettings.h"
-
-int IntroCanceled;
-int NessieObjectHandle;
-int DemoObjectHandle;
-int BlankSprite;
-int DemoSprite;
-int framebyframe;
-int fps=0, curfps=0;
-
-stOption *options;
-
-
-unsigned int demo_RLERunLen;
-unsigned char demo_data[DEMO_MAX_SIZE+1];
-unsigned int demo_data_index;
-
-char QuitState = NO_QUIT;
-
-stString strings[MAX_STRINGS+1];
-int numStrings;
-
-int demomode;
-FILE *demofile;
-
-char ScreenIsScrolling;
-int gunfiretimer, gunfirefreq;
-
-extern unsigned long scroll_x;
-extern unsigned int scrollx_buf;
-extern unsigned char scrollpix;
-extern unsigned int mapx;
-extern unsigned int mapxstripepos;
-extern unsigned int scroll_y;
-extern unsigned int scrolly_buf;
-extern unsigned char scrollpixy;
-extern unsigned int mapy;
-extern unsigned int mapystripepos;
-
-extern CPlayer *Player;
-
-char loadinggame, loadslot;
-
-stFade fade;
-stMap map;
-unsigned int AnimTileInUse[ATILEINUSE_SIZEX][ATILEINUSE_SIZEY];
-stTile tiles[MAX_TILES+1];
-int numtiles;
-int **TileProperty; // This version will replace the old stTile Structure and save memory
-unsigned char tiledata[MAX_TILES+1][16][16];
-stSprite *sprites;
-stBitmap bitmaps[MAX_BITMAPS+1];
-stObject objects[MAX_OBJECTS+1];
-char font[MAX_FONT+1][8][8];
-stAnimTile animtiles[MAX_ANIMTILES+1];
-stPlayer player[MAX_PLAYERS];
-stPlayer net_lastplayer[MAX_PLAYERS];
-
-unsigned int scroll_y = 0;
-unsigned int objdefsprites[NUM_OBJ_TYPES+1];
-char frameskiptimer=0;
-
-int thisplayer;
-unsigned int primaryplayer;
-unsigned int numplayers;
-
-int crashflag,crashflag2,crashflag3;
-const char *why_term_ptr = "No reason given.";
-
-int main(int argc, char *argv[])
-{
-
-	stCloneKeenPlus CKP; // This is the future main structure of CloneKeen. It will be one variable which controls all
-						 // the program instead of having global variables around somewhere.
-
-	g_pLogFile->CreateLogfile("CGLog.html");
-
-	banner(); // Intro on the text-console.
-
-	CGame* Game;
-	Game = new CGame();
-
-	Game->preallocateCKP(&CKP);
-
-	CSettings *Settings;
-	Settings = new CSettings;
-
-	if(Settings->loadDrvCfg() != 0) // Always return 0 if no ERROR
-	{
-		g_pLogFile->textOut(RED,"First time message: CKP didn't find the driver config file. However, it is going to generate one basing on default configurations.<br>");
-		Settings->saveDrvCfg();
-	}
-
-	if(readCommandLine(argc, argv, &CKP) != 0)
-	{
-		g_pLogFile->textOut(RED,"Sorry, but CKP needs correct command line parameters.<br>");
-		printf("Sorry, but CKP needs correct command line parameters.\n");
-	}
-
-	if(loadCKPDrivers(&CKP) != 0)
-	{
-		g_pLogFile->textOut(RED,"The game cannot start, because you do not meet the hardware requirements.<br>");
-		return 1;
-	}
-
-	Settings->loadDefaultGameCfg(CKP.Option);
-	if(Settings->loadGameCfg(CKP.Option) != 0)
-	{
-		g_pLogFile->textOut(PURPLE,"There are no settings! CKP is going to use the default options. You can change them later in the game.<br>");
-		Settings->saveGameCfg(CKP.Option);
-	}
-	delete Settings; Settings = NULL;
-
-	if(loadResourcesforStartMenu(&CKP, Game) != 0)
-	{
-		g_pLogFile->textOut(RED,"Error! Resources for start menu cannot be loaded! Maybe you need to copy the data files!<br>");
-		return 1;
-	}
-
-	if(!CKP.Control.skipstarting)
-	{
-		if(loadStartMenu(&CKP) == 1)
-		{
-			cleanupResources(&CKP);
-			return 0;
-		}
-	}
-
-	if(!g_pInput->getExitEvent())
-	{
-
-		CKP.Control.levelcontrol.episode = CKP.GameData[CKP.Resources.GameSelected-1].Episode; // Assign the correct Episode
-
-		options = CKP.Option;
-		Game->loadResources(CKP.Control.levelcontrol.episode, CKP.GameData[CKP.Resources.GameSelected-1].DataDirectory);
-
-		//Game->runCycle();
-
-		CKP.shutdown = SHUTDOWN_BOOTUP; // Prepare game for starting
-
-		while( CKP.shutdown == SHUTDOWN_RESTART || CKP.shutdown == SHUTDOWN_BOOTUP )
-		{
-			CKP.shutdown = SHUTDOWN_NONE; // Game is runnning
-			Game->runCycle(&CKP);
-
-			if(CKP.shutdown == SHUTDOWN_NEW_GAME)
-			{
-	    	  if(loadStartMenu(&CKP) == 1)
-	    	  {
-	    		  CKP.shutdown = SHUTDOWN_EXIT;
-	    		  break;
-	    	  }
-	    	  else
-	    	  {
-	    		  //loadResourcesforGame(pCKP);
-	    		  Game->loadResources(CKP.Control.levelcontrol.episode, CKP.GameData[CKP.Resources.GameSelected-1].DataDirectory);
-
-	    		  CKP.shutdown = SHUTDOWN_RESTART;
-	    	  }
-			}
-		}
-	}
-
-	if(Game){ delete Game; Game = NULL; }
-
-	cleanupResources(&CKP);
-
-	printf("Thank you very much for playing this wonderful game!");
-
-	return 0;
-}
-
-void cleanupResources(stCloneKeenPlus *pCKP)
-{
-	cleanup(pCKP);
-	return;
-}
-
-short loadCKPDrivers(stCloneKeenPlus *pCKP)
-{
-	g_pGraphics->allocScrollBufmem();
-
-	// initialize/activate all drivers
-	g_pLogFile->ftextOut("Starting graphics driver...<br>");
-
-	if (!g_pVideoDriver->start())
-		return abortCKP(pCKP);
-
-	g_pLogFile->ftextOut("Starting sound driver...<br>");
-
-	g_pSound->init();
-
-	g_pLogFile->ftextOut("Starting input driver...<br>");
-	JoyDrv_Start(&(pCKP->Device.Joystick));
-	g_pInput->loadControlconfig();
-
-	return 0;
-}
-
-short abortCKP(stCloneKeenPlus *pCKP)
-{
-	  g_pLogFile->ftextOut("Fatal error, cleaning up.<br>");
-	  cleanup(pCKP);
-	  g_pLogFile->ftextOut("A fatal error has occurred; game is shutting down.<br>");
-	  return 1;
-}
-
-short closeCKP(stCloneKeenPlus *pCKP)
-{
-	int count;
-	int i;
-	CSettings Settings;
-
-	banner();
-
-	Settings.saveGameCfg(pCKP->Option);
-
-	g_pLogFile->ftextOut("<br>Thanks for playing!<br><br>");
-	cleanup(pCKP);
-	if (crashflag)
-	{
-		if (crashflag != QUIT_NONFATAL) g_pLogFile->ftextOut("\a");
-		g_pLogFile->ftextOut("abnormal program termination, error code %d/%d/%d<br>explanation: %s<br>", crashflag,crashflag2,crashflag3, why_term_ptr);
-
-		g_pLogFile->ftextOut("numplayers: %d<br>", numplayers);
-
-		for(count=0,i=0;i<MAX_PLAYERS;i++) if (player[i].isPlaying) count++;
-
-		g_pLogFile->ftextOut("# of player instances with isPlaying set: %d<br>", count);
-	}
-	return 0;
-}
-
-void playgame_levelmanager(stCloneKeenPlus *pCKP)
-{
-  int i, o, wm, firsttime = 1;
-  char levelname[80];
-  char SaveGameFileName[40];
-  int newlevel;
-
-  stLevelControl *p_levelcontrol;
-  stOption	*p_option;
-
-  p_option = pCKP->Option;
-  p_levelcontrol = &(pCKP->Control.levelcontrol);
-
-  if( p_levelcontrol->command != LVLC_START_LEVEL )
-  {
-	  p_levelcontrol->command = LVLC_CHANGE_LEVEL;
-	  p_levelcontrol->chglevelto = WM_MAP_NUM;
-  }
-  p_levelcontrol->tobonuslevel = 0;
-  p_levelcontrol->success = 0;
-  map.firsttime = 1;
-
-  do
-  {
-    initgame(pCKP);
-
-    newlevel = p_levelcontrol->chglevelto;
-    if (p_levelcontrol->episode==1 && p_levelcontrol->hardmode)
-    {
-        // in high-difficulity mode switch levels 5 & 9 so
-        // you can't get the pogo stick until you make it
-        // to the dark side of mars.
-        if (newlevel==5)
-           newlevel = 9;
-        else if (newlevel==9)
-           newlevel = 5;
-    }
-    sprintf(levelname, "level%02d.ck%d", newlevel, p_levelcontrol->episode);
-
-    if (p_levelcontrol->chglevelto==WORLD_MAP)
-    {
-      wm = 1;
-    }
-    else
-    {
-      wm = 0;
-    }
-    p_levelcontrol->canexit = 1;   // assume can exit before loading map
-    if (loadmap(levelname, pCKP->GameData[pCKP->Resources.GameSelected-1].DataDirectory, p_levelcontrol->chglevelto, wm, pCKP))
-    {
-      crashflag = 1;
-      crashflag2 = p_levelcontrol->chglevelto;
-      why_term_ptr = "Unable to load the map (# shown in crashflag2).";
-    }
-
-    p_levelcontrol->curlevel = p_levelcontrol->chglevelto;
-    if (p_levelcontrol->curlevel == FINAL_MAP)
-    {
-      p_levelcontrol->isfinallevel = 1;
-      p_levelcontrol->canexit = 0;
-    }
-    else
-    {
-      p_levelcontrol->isfinallevel = 0;
-    }
-
-    if (firsttime)
-    {
-    	int op;
-    	for(i=0;i<MAX_PLAYERS;i++)
-    	{
-    		op = player[i].useObject;
-      		player[i].mapplayx = player[i].x;
-    		player[i].mapplayy = player[i].y;
-    		player[i].w = sprites[objects[op].sprite].xsize-4;
-    		player[i].h = sprites[objects[op].sprite].ysize;
-    	}
-    }
-    firsttime = 0;
-
-    p_levelcontrol->command = LVLC_NOCOMMAND;
-
-    p_levelcontrol->dark = 0;
-    if (loadinggame)
-    {
-      sprintf(SaveGameFileName, "ep%csave%c.dat", p_levelcontrol->episode+'0', loadslot+'0');
-      wm = savegameiswm(SaveGameFileName);
-      if (game_load(SaveGameFileName, pCKP))
-      {
-        crashflag = 1;
-        crashflag2 = loadslot;
-        why_term_ptr = "Error loading game (slot # in flag2)! The save file may be corrupt or created by a different version of CloneKeen.";
-        return;
-      }
-    }
-	g_pGraphics->initPalette(p_levelcontrol->dark);
-
-    // Now load HQ Stuff, because the game could have been loaded too.
-	g_pGraphics->loadHQGraphics(p_levelcontrol->episode,p_levelcontrol->chglevelto,pCKP->GameData[pCKP->Resources.GameSelected-1].DataDirectory);
-
-	g_pInput->flushAll();
-
-    if (wm)
-    {  // entering map from normal level, or first time around
-      if (!p_levelcontrol->tobonuslevel)
-      {
-        if (!loadinggame)
-        {
-          for(i=0;i<MAX_PLAYERS;i++)
-          {
-            player[i].x = player[i].mapplayx;
-            player[i].y = player[i].mapplayy;
-          }
-        }
-      }
-      else
-      {  // respawn at the bonus level
-        for(i=0;i<MAX_PLAYERS;i++)
-        {
-          player[i].x = BONUSLEVEL_RESPAWN_X;
-          player[i].y = BONUSLEVEL_RESPAWN_Y;
-          if (player[i].isPlaying && player[i].inventory.lives)
-          {
-             player[i].hideplayer = 1;
-             o = spawn_object((player[i].x>>CSF>>4)<<CSF<<4,((player[i].y>>CSF>>4)+1)<<CSF<<4,OBJ_TELEPORTER);
-             objects[o].ai.teleport.direction = TELEPORTING_IN;
-             objects[o].ai.teleport.whichplayer = i;
-             objects[o].ai.teleport.baseframe = TELEPORT_RED_BASEFRAME_EP1;
-             objects[o].ai.teleport.idleframe = TELEPORT_RED_IDLEFRAME_EP1;
-             g_pSound->playStereofromCoord(SOUND_TELEPORT, PLAY_NOW, objects[player[i].useObject].scrx);
-          }
-        }
-      }
-
-      if (!p_levelcontrol->success || firsttime)
-      {
-        if (!p_levelcontrol->tobonuslevel) p_levelcontrol->dokeensleft = 1;
-        // when you die you lose all keycards
-        for(i=0;i<MAX_PLAYERS;i++)
-        {
-          if (player[i].isPlaying)
-          {
-              take_keycard(DOOR_YELLOW, i);
-              take_keycard(DOOR_RED, i);
-              take_keycard(DOOR_GREEN, i);
-              take_keycard(DOOR_BLUE, i);
-           }
-        }
-      }
-      else p_levelcontrol->dokeensleft = 0;
-
-      gameloop(pCKP);
-
-      for(i=0;i<MAX_PLAYERS;i++)
-      {
-        player[i].mapplayx = player[i].x;
-        player[i].mapplayy = player[i].y;
-      }
-
-    }
-    else
-    {
-       // entering a normal level from map
-       p_levelcontrol->dokeensleft = 0;
-       gameloop(pCKP);
-
-       // after completion of a normal level check if the game is won
-       if (gameiswon(pCKP))
-       {
-          p_levelcontrol->command = LVLC_END_SEQUENCE;
-       }
-    }
-
-    if(QuitState==QUIT_PROGRAM)
-    {
-    	pCKP->shutdown = SHUTDOWN_EXIT;
-    	break;
-    }
-    g_pGraphics->unloadHQGraphics();
-
-    for(unsigned int i=0;i<numplayers;i++)
-    {
-    	player[i].x = 0;
-    	player[i].y = 0;
-    }
-
-  } while(p_levelcontrol->command==LVLC_CHANGE_LEVEL && !crashflag);
-
-  g_pGraphics->unloadHQGraphics();
-
-  if (p_levelcontrol->command==LVLC_END_SEQUENCE)
-  {
-    endsequence(pCKP);
-    g_pLogFile->ftextOut("eseq complete<br>");
-  }
-  else if (p_levelcontrol->command==LVLC_TANTALUS_RAY)
-  {
-    eseq2_vibrate(pCKP);
-    eseq2_TantalusRay(pCKP);
-    IntroCanceled = 1;               // popup main menu immediately
-  }
-}
-
-// plays the demo file specified in fname
-// returns:
-//  DEMO_RESULT_FILE_BAD               demo does not exist or file corrupt
-//  DEMO_RESULT_COMPLETED              demo played all the way through
-//  DEMO_RESULT_CANCELED               user canceled the demo
-char play_demo(int demonum, stCloneKeenPlus *pCKP, int s)
-{
-int i;
-int byt;
-int lvl;
-char filename[40];
-char SaveOptions[NUM_OPTIONS];
-	stLevelControl *p_levelcontrol;
-	stOption *p_option;
-
-	p_levelcontrol = &(pCKP->Control.levelcontrol);
-	p_option = pCKP->Option;
-
-   // open the demo file
-   sprintf(filename, "ep%ddemo%d.dat", p_levelcontrol->episode, demonum);
-   demofile = fopen(filename, "rb");
-   if (!demofile)
-   {
-     return DEMO_RESULT_FILE_BAD;
-   }
-
-   // read in the header
-   if (fgetc(demofile) != 'D') goto demoHeaderCorrupt;
-   if (fgetc(demofile) != 'M') goto demoHeaderCorrupt;
-   if (fgetc(demofile) != 'O') goto demoHeaderCorrupt;
-   if (fgetc(demofile) != p_levelcontrol->episode) goto demoHeaderCorrupt;
-   lvl = fgetc(demofile);
-
-   // load the compressed demo into the demo_data[] array
-   for(i=0;i<DEMO_MAX_SIZE;i++)
-   {
-     byt = fgetc(demofile);     // get byte from file
-     if (byt<0) goto gotEOF;    // check for EOF
-     demo_data[i] = byt;        // copy to demo_data[]
-   }
-   why_term_ptr = "Demo file is too big! (Increase DEMO_MAX_SIZE)";
-   crashflag = 1;
-gotEOF: ;
-   fclose(demofile);
-   demofile = NULL;
-
-   // initilize some variables
-   demo_RLERunLen = 0;
-   demo_data_index = 0;
-   demomode = DEMO_PLAYBACK;
-   loadinggame = 0;
-   p_levelcontrol->curlevel = lvl;
-   p_levelcontrol->command = LVLC_NOCOMMAND;
-
-   initgamefirsttime(pCKP, s);
-   initgame(pCKP);
-
-   // now load the map and play the level
-   sprintf(filename, "level%02d.ck%d", p_levelcontrol->curlevel, p_levelcontrol->episode);
-   if (loadmap(filename, pCKP->GameData[pCKP->Resources.GameSelected-1].DataDirectory,
-		   p_levelcontrol->curlevel, 0, pCKP)) return DEMO_RESULT_FILE_BAD;
-
-   for(i=0;i<NUM_OPTIONS;i++) SaveOptions[i] = p_option[i].value;
-   // SetDefaultOptions();
-   gameloop(pCKP);
-   for(i=0;i<NUM_OPTIONS;i++) p_option[i].value = SaveOptions[i];
-
-   // based on success/failure returned from gameloop let the
-   // calling procedure know whether the user canceled or not
-
-   if (p_levelcontrol->success)
-   {
-     return DEMO_RESULT_COMPLETED;
-   }
-   else
-   {
-     return DEMO_RESULT_CANCELED;
-   }
-
-// this label is jumped to when there's an error reading the header.
-// it closes the demo file and aborts.
-demoHeaderCorrupt: ;
-   fclose(demofile);
-   demofile = NULL;
-   return DEMO_RESULT_FILE_BAD;
-}
-
-short readCommandLine(int argc, char *argv[], stCloneKeenPlus *pCKP)
-{
-	int i;
-	char tempbuf[MAX_STRING_LENGTH];
-
-
-	unsigned short *p_gamesel;
-	  // process command line options
-	  g_pLogFile->ftextOut("Processing command-line options.<br>");
-	  numplayers = 1;
-	  p_gamesel = &(pCKP->Resources.GameSelected);
-
-	  if (argc>1)
-	  {
-	    for(i=1;i<argc;i++)
-	    {
-	      strcpy(tempbuf, argv[i]);
-	      if (strcmp(tempbuf, "-1player")==0)
-	      {
-	        numplayers = 1;
-	      }
-	      else if (strcmp(tempbuf, "-2player")==0)
-	      {
-	        numplayers = 2;
-	      }
-	      else if (strcmp(tempbuf, "-3player")==0)
-	      {
-	        numplayers = 3;
-	      }
-	      else if (strcmp(tempbuf, "-4player")==0)
-	      {
-	        numplayers = 4;
-	      }
-	      else if (strcmp(tempbuf, "-single")==0)
-	      {
-	        numplayers = 1;
-	      }
-	      else if (strcmp(tempbuf, "-nopk")==0)     // do not allow players to kill each other
-	      {
-	    	  pCKP->Option[OPT_ALLOWPKING].value = 0;
-	      }
-	      else if (strncmp(tempbuf, "-game",strlen("-game"))==0)      // select the game
-	      {
-	    	int g;
-
-	    	sscanf(tempbuf+strlen("-game"),"%d",&g);
-
-	        *p_gamesel = g;
-	      }
-	      else if (strcmp(tempbuf, "-dtm")==0)      // direct to map
-	      {
-	        pCKP->Control.dtm = 1;
-	      }
-	      else if (strcmp(tempbuf, "-mean")==0)     // increase difficulty
-	      {
-			  pCKP->Control.levelcontrol.hardmode = true;
-	      }
-	      else if (strcmp(tempbuf, "-cheat")==0)    // enable cheat codes
-	      {
-	    	  pCKP->Option[OPT_CHEATS].value = 1;
-	      }
-	      else if (strcmp(tempbuf, "-rec")==0)      // record a demo
-	      {
-	        demomode = DEMO_RECORD;
-	      }
-	      else if (strcmp(tempbuf, "-eseq")==0)     // play end sequence
-	      {
-	        pCKP->Control.eseq = 1;
-	      }
-
-	      else if (strcmp(tempbuf, "-story")==0)     // play end sequence
-	      {
-	        pCKP->Control.storyboard = 1;
-	        pCKP->Control.skipstarting = 1;
-	      }
-	      else if (strcmp(tempbuf, "-fs")==0)       // full-screen
-	      {
-	        g_pVideoDriver->isFullscreen(true);
-	      }
-	      else if (strcmp(tempbuf, "-dbl")==0)       // 2x
-	      {
-	        g_pVideoDriver->setZoom(2);
-	      }
-	      else if (strcmp(tempbuf, "-stereo")==0)       // Enable Stereo Sound
-	      {
-	    	  g_pSound->setSoundmode(0,true);
-	      }
-	      else if (strcmp(tempbuf, "-showfps")==0)  // show fps
-	      {
-	        g_pVideoDriver->showFPS(true);
-	      }
-	      else if (strncmp(tempbuf, "-level",strlen("-level"))==0)      // select the game
-	      {
-	    	int g;
-	    	sscanf(tempbuf+strlen("-level"),"%d",&g);
-
-			  pCKP->Control.levelcontrol.command = LVLC_START_LEVEL;
-			  pCKP->Control.levelcontrol.chglevelto = g;
-			  pCKP->Control.skipstarting = 1;
-	      }
-	      else if (i!=1 || atoi(argv[i])==0)
-	      {
-	        g_pLogFile->ftextOut("Wait a minute...what the hell does '%s' mean? I'm going to ignore this!<br>",tempbuf);
-	        usage();
-	        return 1;
-	      }
-	    }
-	  }
-	  return 0;
-}
+
+/* MAIN.C
+  This is CloneKeen's main source file.
+
+  The CloneKeen source may be freely distributed and
+  modified as per the GPL but please give credit to
+  the original author, Caitlin Shaw and to the new author
+  Gerstrong.
+
+  If you make any changes or improvements to the code that
+  you feel merit inclusion in the source tree email them
+  to me at gerstrong@gmail.com or get my latest email
+  from the SourceForge site.
+
+  Thanks to ID Software for the "Commander Keen: Invasion of
+  the Vorticons" games. "Commander Keen" and it's associated
+  graphics, level, and sound files are the property of ID
+  Software. Commander Genius requires the original version of a
+  Commander Keen game in order to be able to emulate that
+  episode.
+
+  Enjoy the Code
+         - The Commander Genius Team
+
+  CloneKeen 		2003-2005 Caitlin Shaw
+  CloneKeenPlus 	2008-2009 Gerstrong
+  Commander Genius 	2009	  Tulip, Pickle, DaVince and Albert
+*/
+
+#include "keen.h"
+#include "sdl/joydrv.h"
+#include "sdl/CInput.h"
+#include "sdl/CTimer.h"
+#include "sdl/sound/CSound.h"
+#include "include/misc.h"
+#include "include/menu.h"
+#include "sdl/CVideoDriver.h"
+#include "include/game.h"
+#include "include/eseq_ep2.h"
+#include "include/fileio.h"
+#include "include/fileio/story.h"
+#include "include/main.h"
+#include "fileio/CParser.h"
+#include "vorticon/CPlayer.h"
+#include "vorticon/CHighScores.h"
+#include "CLogFile.h"
+#include "CGame.h"
+#include "CGraphics.h"
+#include "sdl/CSettings.h"
+
+int IntroCanceled;
+int NessieObjectHandle;
+int DemoObjectHandle;
+int BlankSprite;
+int DemoSprite;
+int framebyframe;
+int fps=0, curfps=0;
+
+stOption *options;
+
+
+unsigned int demo_RLERunLen;
+unsigned char demo_data[DEMO_MAX_SIZE+1];
+unsigned int demo_data_index;
+
+char QuitState = NO_QUIT;
+
+stString strings[MAX_STRINGS+1];
+int numStrings;
+
+int demomode;
+FILE *demofile;
+
+char ScreenIsScrolling;
+int gunfiretimer, gunfirefreq;
+
+extern unsigned long scroll_x;
+extern unsigned int scrollx_buf;
+extern unsigned char scrollpix;
+extern unsigned int mapx;
+extern unsigned int mapxstripepos;
+extern unsigned int scroll_y;
+extern unsigned int scrolly_buf;
+extern unsigned char scrollpixy;
+extern unsigned int mapy;
+extern unsigned int mapystripepos;
+
+extern CPlayer *Player;
+
+char loadinggame, loadslot;
+
+stFade fade;
+stMap map;
+unsigned int AnimTileInUse[ATILEINUSE_SIZEX][ATILEINUSE_SIZEY];
+stTile tiles[MAX_TILES+1];
+int numtiles;
+int **TileProperty; // This version will replace the old stTile Structure and save memory
+unsigned char tiledata[MAX_TILES+1][16][16];
+stSprite *sprites;
+stBitmap bitmaps[MAX_BITMAPS+1];
+stObject objects[MAX_OBJECTS+1];
+char font[MAX_FONT+1][8][8];
+stAnimTile animtiles[MAX_ANIMTILES+1];
+stPlayer player[MAX_PLAYERS];
+stPlayer net_lastplayer[MAX_PLAYERS];
+
+unsigned int scroll_y = 0;
+unsigned int objdefsprites[NUM_OBJ_TYPES+1];
+char frameskiptimer=0;
+
+int thisplayer;
+unsigned int primaryplayer;
+unsigned int numplayers;
+
+int crashflag,crashflag2,crashflag3;
+const char *why_term_ptr = "No reason given.";
+
+int main(int argc, char *argv[])
+{
+
+	stCloneKeenPlus CKP; // This is the future main structure of CloneKeen. It will be one variable which controls all
+						 // the program instead of having global variables around somewhere.
+
+	g_pLogFile->CreateLogfile("CGLog.html");
+
+	banner(); // Intro on the text-console.
+
+	CGame* Game;
+	Game = new CGame();
+
+	Game->preallocateCKP(&CKP);
+
+	CSettings *Settings;
+	Settings = new CSettings;
+
+	if(Settings->loadDrvCfg() != 0) // Always return 0 if no ERROR
+	{
+		g_pLogFile->textOut(RED,"First time message: CKP didn't find the driver config file. However, it is going to generate one basing on default configurations.<br>");
+		Settings->saveDrvCfg();
+	}
+
+	if(readCommandLine(argc, argv, &CKP) != 0)
+	{
+		g_pLogFile->textOut(RED,"Sorry, but CKP needs correct command line parameters.<br>");
+		printf("Sorry, but CKP needs correct command line parameters.\n");
+	}
+
+	if(loadCKPDrivers(&CKP) != 0)
+	{
+		g_pLogFile->textOut(RED,"The game cannot start, because you do not meet the hardware requirements.<br>");
+		return 1;
+	}
+
+	Settings->loadDefaultGameCfg(CKP.Option);
+	if(Settings->loadGameCfg(CKP.Option) != 0)
+	{
+		g_pLogFile->textOut(PURPLE,"There are no settings! CKP is going to use the default options. You can change them later in the game.<br>");
+		Settings->saveGameCfg(CKP.Option);
+	}
+	delete Settings; Settings = NULL;
+
+	if(loadResourcesforStartMenu(&CKP, Game) != 0)
+	{
+		g_pLogFile->textOut(RED,"Error! Resources for start menu cannot be loaded! Maybe you need to copy the data files!<br>");
+		return 1;
+	}
+
+	if(!CKP.Control.skipstarting)
+	{
+		if(loadStartMenu(&CKP) == 1)
+		{
+			cleanupResources(&CKP);
+			return 0;
+		}
+	}
+
+	if(!g_pInput->getExitEvent())
+	{
+
+		CKP.Control.levelcontrol.episode = CKP.GameData[CKP.Resources.GameSelected-1].Episode; // Assign the correct Episode
+
+		options = CKP.Option;
+		if(Game->loadResources(CKP.Control.levelcontrol.episode, CKP.GameData[CKP.Resources.GameSelected-1].DataDirectory))
+			CKP.shutdown = SHUTDOWN_BOOTUP; // Prepare game for starting
+		else
+			CKP.shutdown = SHUTDOWN_NEW_GAME;
+
+		while( CKP.shutdown == SHUTDOWN_RESTART || CKP.shutdown == SHUTDOWN_BOOTUP || CKP.shutdown == SHUTDOWN_NEW_GAME )
+		{
+			if(CKP.shutdown != SHUTDOWN_NEW_GAME) {
+				CKP.shutdown = SHUTDOWN_NONE; // Game is runnning
+				Game->runCycle(&CKP);
+			}
+			
+			if(CKP.shutdown == SHUTDOWN_NEW_GAME)
+			{
+	    	  if(loadStartMenu(&CKP) == 1)
+	    	  {
+	    		  CKP.shutdown = SHUTDOWN_EXIT;
+	    		  break;
+	    	  }
+	    	  else
+	    	  {
+	    		  //loadResourcesforGame(pCKP);
+	    		  if(Game->loadResources(CKP.Control.levelcontrol.episode, CKP.GameData[CKP.Resources.GameSelected-1].DataDirectory))
+					  CKP.shutdown = SHUTDOWN_RESTART;
+				  else
+					  CKP.shutdown = SHUTDOWN_NEW_GAME;
+	    	  }
+			}
+		}
+	}
+
+	if(Game){ delete Game; Game = NULL; }
+
+	cleanupResources(&CKP);
+
+	printf("Thank you very much for playing this wonderful game!");
+
+	return 0;
+}
+
+void cleanupResources(stCloneKeenPlus *pCKP)
+{
+	cleanup(pCKP);
+	return;
+}
+
+short loadCKPDrivers(stCloneKeenPlus *pCKP)
+{
+	g_pGraphics->allocScrollBufmem();
+
+	// initialize/activate all drivers
+	g_pLogFile->ftextOut("Starting graphics driver...<br>");
+
+	if (!g_pVideoDriver->start())
+		return abortCKP(pCKP);
+
+	g_pLogFile->ftextOut("Starting sound driver...<br>");
+
+	g_pSound->init();
+
+	g_pLogFile->ftextOut("Starting input driver...<br>");
+	JoyDrv_Start(&(pCKP->Device.Joystick));
+	g_pInput->loadControlconfig();
+
+	return 0;
+}
+
+short abortCKP(stCloneKeenPlus *pCKP)
+{
+	  g_pLogFile->ftextOut("Fatal error, cleaning up.<br>");
+	  cleanup(pCKP);
+	  g_pLogFile->ftextOut("A fatal error has occurred; game is shutting down.<br>");
+	  return 1;
+}
+
+short closeCKP(stCloneKeenPlus *pCKP)
+{
+	int count;
+	int i;
+	CSettings Settings;
+
+	banner();
+
+	Settings.saveGameCfg(pCKP->Option);
+
+	g_pLogFile->ftextOut("<br>Thanks for playing!<br><br>");
+	cleanup(pCKP);
+	if (crashflag)
+	{
+		if (crashflag != QUIT_NONFATAL) g_pLogFile->ftextOut("\a");
+		g_pLogFile->ftextOut("abnormal program termination, error code %d/%d/%d<br>explanation: %s<br>", crashflag,crashflag2,crashflag3, why_term_ptr);
+
+		g_pLogFile->ftextOut("numplayers: %d<br>", numplayers);
+
+		for(count=0,i=0;i<MAX_PLAYERS;i++) if (player[i].isPlaying) count++;
+
+		g_pLogFile->ftextOut("# of player instances with isPlaying set: %d<br>", count);
+	}
+	return 0;
+}
+
+void playgame_levelmanager(stCloneKeenPlus *pCKP)
+{
+  int i, o, wm, firsttime = 1;
+  char levelname[80];
+  char SaveGameFileName[40];
+  int newlevel;
+
+  stLevelControl *p_levelcontrol;
+  stOption	*p_option;
+
+  p_option = pCKP->Option;
+  p_levelcontrol = &(pCKP->Control.levelcontrol);
+
+  if( p_levelcontrol->command != LVLC_START_LEVEL )
+  {
+	  p_levelcontrol->command = LVLC_CHANGE_LEVEL;
+	  p_levelcontrol->chglevelto = WM_MAP_NUM;
+  }
+  p_levelcontrol->tobonuslevel = 0;
+  p_levelcontrol->success = 0;
+  map.firsttime = 1;
+
+  do
+  {
+    initgame(pCKP);
+
+    newlevel = p_levelcontrol->chglevelto;
+    if (p_levelcontrol->episode==1 && p_levelcontrol->hardmode)
+    {
+        // in high-difficulity mode switch levels 5 & 9 so
+        // you can't get the pogo stick until you make it
+        // to the dark side of mars.
+        if (newlevel==5)
+           newlevel = 9;
+        else if (newlevel==9)
+           newlevel = 5;
+    }
+    sprintf(levelname, "level%02d.ck%d", newlevel, p_levelcontrol->episode);
+
+    if (p_levelcontrol->chglevelto==WORLD_MAP)
+    {
+      wm = 1;
+    }
+    else
+    {
+      wm = 0;
+    }
+    p_levelcontrol->canexit = 1;   // assume can exit before loading map
+    if (loadmap(levelname, pCKP->GameData[pCKP->Resources.GameSelected-1].DataDirectory, p_levelcontrol->chglevelto, wm, pCKP))
+    {
+      crashflag = 1;
+      crashflag2 = p_levelcontrol->chglevelto;
+      why_term_ptr = "Unable to load the map (# shown in crashflag2).";
+    }
+
+    p_levelcontrol->curlevel = p_levelcontrol->chglevelto;
+    if (p_levelcontrol->curlevel == FINAL_MAP)
+    {
+      p_levelcontrol->isfinallevel = 1;
+      p_levelcontrol->canexit = 0;
+    }
+    else
+    {
+      p_levelcontrol->isfinallevel = 0;
+    }
+
+    if (firsttime)
+    {
+    	int op;
+    	for(i=0;i<MAX_PLAYERS;i++)
+    	{
+    		op = player[i].useObject;
+      		player[i].mapplayx = player[i].x;
+    		player[i].mapplayy = player[i].y;
+    		player[i].w = sprites[objects[op].sprite].xsize-4;
+    		player[i].h = sprites[objects[op].sprite].ysize;
+    	}
+    }
+    firsttime = 0;
+
+    p_levelcontrol->command = LVLC_NOCOMMAND;
+
+    p_levelcontrol->dark = 0;
+    if (loadinggame)
+    {
+      sprintf(SaveGameFileName, "ep%csave%c.dat", p_levelcontrol->episode+'0', loadslot+'0');
+      wm = savegameiswm(SaveGameFileName);
+      if (game_load(SaveGameFileName, pCKP))
+      {
+        crashflag = 1;
+        crashflag2 = loadslot;
+        why_term_ptr = "Error loading game (slot # in flag2)! The save file may be corrupt or created by a different version of CloneKeen.";
+        return;
+      }
+    }
+	g_pGraphics->initPalette(p_levelcontrol->dark);
+
+    // Now load HQ Stuff, because the game could have been loaded too.
+	g_pGraphics->loadHQGraphics(p_levelcontrol->episode,p_levelcontrol->chglevelto,pCKP->GameData[pCKP->Resources.GameSelected-1].DataDirectory);
+
+	g_pInput->flushAll();
+
+    if (wm)
+    {  // entering map from normal level, or first time around
+      if (!p_levelcontrol->tobonuslevel)
+      {
+        if (!loadinggame)
+        {
+          for(i=0;i<MAX_PLAYERS;i++)
+          {
+            player[i].x = player[i].mapplayx;
+            player[i].y = player[i].mapplayy;
+          }
+        }
+      }
+      else
+      {  // respawn at the bonus level
+        for(i=0;i<MAX_PLAYERS;i++)
+        {
+          player[i].x = BONUSLEVEL_RESPAWN_X;
+          player[i].y = BONUSLEVEL_RESPAWN_Y;
+          if (player[i].isPlaying && player[i].inventory.lives)
+          {
+             player[i].hideplayer = 1;
+             o = spawn_object((player[i].x>>CSF>>4)<<CSF<<4,((player[i].y>>CSF>>4)+1)<<CSF<<4,OBJ_TELEPORTER);
+             objects[o].ai.teleport.direction = TELEPORTING_IN;
+             objects[o].ai.teleport.whichplayer = i;
+             objects[o].ai.teleport.baseframe = TELEPORT_RED_BASEFRAME_EP1;
+             objects[o].ai.teleport.idleframe = TELEPORT_RED_IDLEFRAME_EP1;
+             g_pSound->playStereofromCoord(SOUND_TELEPORT, PLAY_NOW, objects[player[i].useObject].scrx);
+          }
+        }
+      }
+
+      if (!p_levelcontrol->success || firsttime)
+      {
+        if (!p_levelcontrol->tobonuslevel) p_levelcontrol->dokeensleft = 1;
+        // when you die you lose all keycards
+        for(i=0;i<MAX_PLAYERS;i++)
+        {
+          if (player[i].isPlaying)
+          {
+              take_keycard(DOOR_YELLOW, i);
+              take_keycard(DOOR_RED, i);
+              take_keycard(DOOR_GREEN, i);
+              take_keycard(DOOR_BLUE, i);
+           }
+        }
+      }
+      else p_levelcontrol->dokeensleft = 0;
+
+      gameloop(pCKP);
+
+      for(i=0;i<MAX_PLAYERS;i++)
+      {
+        player[i].mapplayx = player[i].x;
+        player[i].mapplayy = player[i].y;
+      }
+
+    }
+    else
+    {
+       // entering a normal level from map
+       p_levelcontrol->dokeensleft = 0;
+       gameloop(pCKP);
+
+       // after completion of a normal level check if the game is won
+       if (gameiswon(pCKP))
+       {
+          p_levelcontrol->command = LVLC_END_SEQUENCE;
+       }
+    }
+
+    if(QuitState==QUIT_PROGRAM)
+    {
+    	pCKP->shutdown = SHUTDOWN_EXIT;
+    	break;
+    }
+    g_pGraphics->unloadHQGraphics();
+
+    for(unsigned int i=0;i<numplayers;i++)
+    {
+    	player[i].x = 0;
+    	player[i].y = 0;
+    }
+
+  } while(p_levelcontrol->command==LVLC_CHANGE_LEVEL && !crashflag);
+
+  g_pGraphics->unloadHQGraphics();
+
+  if (p_levelcontrol->command==LVLC_END_SEQUENCE)
+  {
+    endsequence(pCKP);
+    g_pLogFile->ftextOut("eseq complete<br>");
+  }
+  else if (p_levelcontrol->command==LVLC_TANTALUS_RAY)
+  {
+    eseq2_vibrate(pCKP);
+    eseq2_TantalusRay(pCKP);
+    IntroCanceled = 1;               // popup main menu immediately
+  }
+}
+
+// plays the demo file specified in fname
+// returns:
+//  DEMO_RESULT_FILE_BAD               demo does not exist or file corrupt
+//  DEMO_RESULT_COMPLETED              demo played all the way through
+//  DEMO_RESULT_CANCELED               user canceled the demo
+char play_demo(int demonum, stCloneKeenPlus *pCKP, int s)
+{
+int i;
+int byt;
+int lvl;
+char filename[40];
+char SaveOptions[NUM_OPTIONS];
+	stLevelControl *p_levelcontrol;
+	stOption *p_option;
+
+	p_levelcontrol = &(pCKP->Control.levelcontrol);
+	p_option = pCKP->Option;
+
+   // open the demo file
+   sprintf(filename, "ep%ddemo%d.dat", p_levelcontrol->episode, demonum);
+   demofile = fopen(filename, "rb");
+   if (!demofile)
+   {
+     return DEMO_RESULT_FILE_BAD;
+   }
+
+   // read in the header
+   if (fgetc(demofile) != 'D') goto demoHeaderCorrupt;
+   if (fgetc(demofile) != 'M') goto demoHeaderCorrupt;
+   if (fgetc(demofile) != 'O') goto demoHeaderCorrupt;
+   if (fgetc(demofile) != p_levelcontrol->episode) goto demoHeaderCorrupt;
+   lvl = fgetc(demofile);
+
+   // load the compressed demo into the demo_data[] array
+   for(i=0;i<DEMO_MAX_SIZE;i++)
+   {
+     byt = fgetc(demofile);     // get byte from file
+     if (byt<0) goto gotEOF;    // check for EOF
+     demo_data[i] = byt;        // copy to demo_data[]
+   }
+   why_term_ptr = "Demo file is too big! (Increase DEMO_MAX_SIZE)";
+   crashflag = 1;
+gotEOF: ;
+   fclose(demofile);
+   demofile = NULL;
+
+   // initilize some variables
+   demo_RLERunLen = 0;
+   demo_data_index = 0;
+   demomode = DEMO_PLAYBACK;
+   loadinggame = 0;
+   p_levelcontrol->curlevel = lvl;
+   p_levelcontrol->command = LVLC_NOCOMMAND;
+
+   initgamefirsttime(pCKP, s);
+   initgame(pCKP);
+
+   // now load the map and play the level
+   sprintf(filename, "level%02d.ck%d", p_levelcontrol->curlevel, p_levelcontrol->episode);
+   if (loadmap(filename, pCKP->GameData[pCKP->Resources.GameSelected-1].DataDirectory,
+		   p_levelcontrol->curlevel, 0, pCKP)) return DEMO_RESULT_FILE_BAD;
+
+   for(i=0;i<NUM_OPTIONS;i++) SaveOptions[i] = p_option[i].value;
+   // SetDefaultOptions();
+   gameloop(pCKP);
+   for(i=0;i<NUM_OPTIONS;i++) p_option[i].value = SaveOptions[i];
+
+   // based on success/failure returned from gameloop let the
+   // calling procedure know whether the user canceled or not
+
+   if (p_levelcontrol->success)
+   {
+     return DEMO_RESULT_COMPLETED;
+   }
+   else
+   {
+     return DEMO_RESULT_CANCELED;
+   }
+
+// this label is jumped to when there's an error reading the header.
+// it closes the demo file and aborts.
+demoHeaderCorrupt: ;
+   fclose(demofile);
+   demofile = NULL;
+   return DEMO_RESULT_FILE_BAD;
+}
+
+short readCommandLine(int argc, char *argv[], stCloneKeenPlus *pCKP)
+{
+	int i;
+	char tempbuf[MAX_STRING_LENGTH];
+
+
+	unsigned short *p_gamesel;
+	  // process command line options
+	  g_pLogFile->ftextOut("Processing command-line options.<br>");
+	  numplayers = 1;
+	  p_gamesel = &(pCKP->Resources.GameSelected);
+
+	  if (argc>1)
+	  {
+	    for(i=1;i<argc;i++)
+	    {
+	      strcpy(tempbuf, argv[i]);
+	      if (strcmp(tempbuf, "-1player")==0)
+	      {
+	        numplayers = 1;
+	      }
+	      else if (strcmp(tempbuf, "-2player")==0)
+	      {
+	        numplayers = 2;
+	      }
+	      else if (strcmp(tempbuf, "-3player")==0)
+	      {
+	        numplayers = 3;
+	      }
+	      else if (strcmp(tempbuf, "-4player")==0)
+	      {
+	        numplayers = 4;
+	      }
+	      else if (strcmp(tempbuf, "-single")==0)
+	      {
+	        numplayers = 1;
+	      }
+	      else if (strcmp(tempbuf, "-nopk")==0)     // do not allow players to kill each other
+	      {
+	    	  pCKP->Option[OPT_ALLOWPKING].value = 0;
+	      }
+	      else if (strncmp(tempbuf, "-game",strlen("-game"))==0)      // select the game
+	      {
+	    	int g;
+
+	    	sscanf(tempbuf+strlen("-game"),"%d",&g);
+
+	        *p_gamesel = g;
+	      }
+	      else if (strcmp(tempbuf, "-dtm")==0)      // direct to map
+	      {
+	        pCKP->Control.dtm = 1;
+	      }
+	      else if (strcmp(tempbuf, "-mean")==0)     // increase difficulty
+	      {
+			  pCKP->Control.levelcontrol.hardmode = true;
+	      }
+	      else if (strcmp(tempbuf, "-cheat")==0)    // enable cheat codes
+	      {
+	    	  pCKP->Option[OPT_CHEATS].value = 1;
+	      }
+	      else if (strcmp(tempbuf, "-rec")==0)      // record a demo
+	      {
+	        demomode = DEMO_RECORD;
+	      }
+	      else if (strcmp(tempbuf, "-eseq")==0)     // play end sequence
+	      {
+	        pCKP->Control.eseq = 1;
+	      }
+
+	      else if (strcmp(tempbuf, "-story")==0)     // play end sequence
+	      {
+	        pCKP->Control.storyboard = 1;
+	        pCKP->Control.skipstarting = 1;
+	      }
+	      else if (strcmp(tempbuf, "-fs")==0)       // full-screen
+	      {
+	        g_pVideoDriver->isFullscreen(true);
+	      }
+	      else if (strcmp(tempbuf, "-dbl")==0)       // 2x
+	      {
+	        g_pVideoDriver->setZoom(2);
+	      }
+	      else if (strcmp(tempbuf, "-stereo")==0)       // Enable Stereo Sound
+	      {
+	    	  g_pSound->setSoundmode(0,true);
+	      }
+	      else if (strcmp(tempbuf, "-showfps")==0)  // show fps
+	      {
+	        g_pVideoDriver->showFPS(true);
+	      }
+	      else if (strncmp(tempbuf, "-level",strlen("-level"))==0)      // select the game
+	      {
+	    	int g;
+	    	sscanf(tempbuf+strlen("-level"),"%d",&g);
+
+			  pCKP->Control.levelcontrol.command = LVLC_START_LEVEL;
+			  pCKP->Control.levelcontrol.chglevelto = g;
+			  pCKP->Control.skipstarting = 1;
+	      }
+	      else if (i!=1 || atoi(argv[i])==0)
+	      {
+	        g_pLogFile->ftextOut("Wait a minute...what the hell does '%s' mean? I'm going to ignore this!<br>",tempbuf);
+	        usage();
+	        return 1;
+	      }
+	    }
+	  }
+	  return 0;
+}
diff --git a/src/sdl/sound/CSound.cpp b/src/sdl/sound/CSound.cpp
index 3c24087e7..85150fa5a 100644
--- a/src/sdl/sound/CSound.cpp
+++ b/src/sdl/sound/CSound.cpp
@@ -297,12 +297,12 @@ playsound: ;
   m_soundchannel[chnl].setupSound((unsigned short)snd, 0, true, WAVE_IN, 0, (mode==PLAY_FORCE) ? true : false );
 }
 
-char CSound::loadSoundData(unsigned short Episode, char *DataDirectory)
+bool CSound::loadSoundData(unsigned short Episode, char *DataDirectory)
 {
   if(!m_active) return false;
 
   char *path;
-  int ok;
+  bool ok = true;
   char soundfile[80];
   char buf[256];
 
@@ -338,52 +338,52 @@ char CSound::loadSoundData(unsigned short Episode, char *DataDirectory)
 	 fclose(p_file);
 
   ok  = m_soundslot[SOUND_KEEN_WALK].loadSound(soundfile, "KEENWALKSND", SOUND_KEEN_WALK);
-  ok |= m_soundslot[SOUND_KEEN_WALK2].loadSound(soundfile, "KEENWLK2SND", SOUND_KEEN_WALK2);
-  ok |= m_soundslot[SOUND_KEEN_JUMP].loadSound(soundfile, "KEENJUMPSND", SOUND_KEEN_JUMP);
-  ok |= m_soundslot[SOUND_KEEN_POGO].loadSound(soundfile, "KEENPOGOSND", SOUND_KEEN_POGO);
-  ok |= m_soundslot[SOUND_KEEN_LAND].loadSound(soundfile, "KEENLANDSND", SOUND_KEEN_LAND);
-  ok |= m_soundslot[SOUND_KEEN_BLOK].loadSound(soundfile, "KEENBLOKSND", SOUND_KEEN_BLOK);
-  ok |= m_soundslot[SOUND_KEEN_DIE].loadSound(soundfile, "KEENDIESND", SOUND_KEEN_DIE);
-  ok |= m_soundslot[SOUND_KEEN_FALL].loadSound(soundfile, "PLUMMETSND", SOUND_KEEN_FALL);
-  ok |= m_soundslot[SOUND_KEEN_BUMPHEAD].loadSound(soundfile, "BUMPHEADSND", SOUND_KEEN_BUMPHEAD);
-  ok |= m_soundslot[SOUND_ENTER_LEVEL].loadSound(soundfile, "WLDENTERSND", SOUND_ENTER_LEVEL);
-  ok |= m_soundslot[SOUND_KEENSLEFT].loadSound(soundfile, "keensleft", SOUND_KEENSLEFT);
+  ok &= m_soundslot[SOUND_KEEN_WALK2].loadSound(soundfile, "KEENWLK2SND", SOUND_KEEN_WALK2);
+  ok &= m_soundslot[SOUND_KEEN_JUMP].loadSound(soundfile, "KEENJUMPSND", SOUND_KEEN_JUMP);
+  ok &= m_soundslot[SOUND_KEEN_POGO].loadSound(soundfile, "KEENPOGOSND", SOUND_KEEN_POGO);
+  ok &= m_soundslot[SOUND_KEEN_LAND].loadSound(soundfile, "KEENLANDSND", SOUND_KEEN_LAND);
+  ok &= m_soundslot[SOUND_KEEN_BLOK].loadSound(soundfile, "KEENBLOKSND", SOUND_KEEN_BLOK);
+  ok &= m_soundslot[SOUND_KEEN_DIE].loadSound(soundfile, "KEENDIESND", SOUND_KEEN_DIE);
+  ok &= m_soundslot[SOUND_KEEN_FALL].loadSound(soundfile, "PLUMMETSND", SOUND_KEEN_FALL);
+  ok &= m_soundslot[SOUND_KEEN_BUMPHEAD].loadSound(soundfile, "BUMPHEADSND", SOUND_KEEN_BUMPHEAD);
+  ok &= m_soundslot[SOUND_ENTER_LEVEL].loadSound(soundfile, "WLDENTERSND", SOUND_ENTER_LEVEL);
+  ok &= m_soundslot[SOUND_KEENSLEFT].loadSound(soundfile, "keensleft", SOUND_KEENSLEFT);
 
-  ok |= m_soundslot[SOUND_KEEN_FIRE].loadSound(soundfile, "KEENFIRESND", SOUND_KEEN_FIRE);
-  ok |= m_soundslot[SOUND_GUN_CLICK].loadSound(soundfile, "GUNCLICK", SOUND_GUN_CLICK);
-  ok |= m_soundslot[SOUND_SHOT_HIT].loadSound(soundfile, "SHOTHIT", SOUND_SHOT_HIT);
+  ok &= m_soundslot[SOUND_KEEN_FIRE].loadSound(soundfile, "KEENFIRESND", SOUND_KEEN_FIRE);
+  ok &= m_soundslot[SOUND_GUN_CLICK].loadSound(soundfile, "GUNCLICK", SOUND_GUN_CLICK);
+  ok &= m_soundslot[SOUND_SHOT_HIT].loadSound(soundfile, "SHOTHIT", SOUND_SHOT_HIT);
 
-  ok |= m_soundslot[SOUND_GET_ITEM].loadSound(soundfile, "GOTITEMSND", SOUND_GET_ITEM);
-  ok |= m_soundslot[SOUND_GET_BONUS].loadSound(soundfile, "GOTBONUSSND", SOUND_GET_BONUS);
-  ok |= m_soundslot[SOUND_GET_PART].loadSound(soundfile, "GOTPARTSND", SOUND_GET_PART);
-  ok |= m_soundslot[SOUND_LEVEL_DONE].loadSound(soundfile, "LVLDONESND", SOUND_LEVEL_DONE);
-  ok |= m_soundslot[SOUND_GAME_OVER].loadSound(soundfile, "GAMEOVERSND", SOUND_GAME_OVER);
-  ok |= m_soundslot[SOUND_TELEPORT].loadSound(soundfile, "TELEPORTSND", SOUND_TELEPORT);
-  ok |= m_soundslot[SOUND_EXTRA_LIFE].loadSound(soundfile, "EXTRAMANSND", SOUND_EXTRA_LIFE);
-  ok |= m_soundslot[SOUND_CHUNKSMASH].loadSound(soundfile, "CHUNKSMASH", SOUND_CHUNKSMASH);
-  ok |= m_soundslot[SOUND_GOINDOOR].loadSound(soundfile, "GOINDOORSND", SOUND_GOINDOOR);
-  ok |= m_soundslot[SOUND_GET_CARD].loadSound(soundfile, "GETCARDSND", SOUND_GET_CARD);
-  ok |= m_soundslot[SOUND_USE_KEY].loadSound(soundfile, "USEKEYSND", SOUND_USE_KEY);
-  ok |= m_soundslot[SOUND_SWITCH_TOGGLE].loadSound(soundfile, "CLICKSND", SOUND_SWITCH_TOGGLE);
-  ok |= m_soundslot[SOUND_DOOR_OPEN].loadSound(soundfile, "DOOROPENSND", SOUND_DOOR_OPEN);
+  ok &= m_soundslot[SOUND_GET_ITEM].loadSound(soundfile, "GOTITEMSND", SOUND_GET_ITEM);
+  ok &= m_soundslot[SOUND_GET_BONUS].loadSound(soundfile, "GOTBONUSSND", SOUND_GET_BONUS);
+  ok &= m_soundslot[SOUND_GET_PART].loadSound(soundfile, "GOTPARTSND", SOUND_GET_PART);
+  ok &= m_soundslot[SOUND_LEVEL_DONE].loadSound(soundfile, "LVLDONESND", SOUND_LEVEL_DONE);
+  ok &= m_soundslot[SOUND_GAME_OVER].loadSound(soundfile, "GAMEOVERSND", SOUND_GAME_OVER);
+  ok &= m_soundslot[SOUND_TELEPORT].loadSound(soundfile, "TELEPORTSND", SOUND_TELEPORT);
+  ok &= m_soundslot[SOUND_EXTRA_LIFE].loadSound(soundfile, "EXTRAMANSND", SOUND_EXTRA_LIFE);
+  ok &= m_soundslot[SOUND_CHUNKSMASH].loadSound(soundfile, "CHUNKSMASH", SOUND_CHUNKSMASH);
+  ok &= m_soundslot[SOUND_GOINDOOR].loadSound(soundfile, "GOINDOORSND", SOUND_GOINDOOR);
+  ok &= m_soundslot[SOUND_GET_CARD].loadSound(soundfile, "GETCARDSND", SOUND_GET_CARD);
+  ok &= m_soundslot[SOUND_USE_KEY].loadSound(soundfile, "USEKEYSND", SOUND_USE_KEY);
+  ok &= m_soundslot[SOUND_SWITCH_TOGGLE].loadSound(soundfile, "CLICKSND", SOUND_SWITCH_TOGGLE);
+  ok &= m_soundslot[SOUND_DOOR_OPEN].loadSound(soundfile, "DOOROPENSND", SOUND_DOOR_OPEN);
 
-  ok |= m_soundslot[SOUND_YORP_BUMP].loadSound(soundfile, "YORPBUMPSND", SOUND_YORP_BUMP);
-  ok |= m_soundslot[SOUND_YORP_STUN].loadSound(soundfile, "YORPBOPSND", SOUND_YORP_STUN);
-  ok |= m_soundslot[SOUND_YORP_DIE].loadSound(soundfile, "YORPSCREAM", SOUND_YORP_DIE);
-  ok |= m_soundslot[SOUND_GARG_DIE].loadSound(soundfile, "GARGSCREAM", SOUND_GARG_DIE);
-  ok |= m_soundslot[SOUND_VORT_DIE].loadSound(soundfile, "vortscream", SOUND_VORT_DIE);
-  ok |= m_soundslot[SOUND_TANK_FIRE].loadSound(soundfile, "TANKFIRE", SOUND_TANK_FIRE);
+  ok &= m_soundslot[SOUND_YORP_BUMP].loadSound(soundfile, "YORPBUMPSND", SOUND_YORP_BUMP);
+  ok &= m_soundslot[SOUND_YORP_STUN].loadSound(soundfile, "YORPBOPSND", SOUND_YORP_STUN);
+  ok &= m_soundslot[SOUND_YORP_DIE].loadSound(soundfile, "YORPSCREAM", SOUND_YORP_DIE);
+  ok &= m_soundslot[SOUND_GARG_DIE].loadSound(soundfile, "GARGSCREAM", SOUND_GARG_DIE);
+  ok &= m_soundslot[SOUND_VORT_DIE].loadSound(soundfile, "vortscream", SOUND_VORT_DIE);
+  ok &= m_soundslot[SOUND_TANK_FIRE].loadSound(soundfile, "TANKFIRE", SOUND_TANK_FIRE);
 
   if (Episode == 2)
   {
-    ok |= m_soundslot[SOUND_KEEN_BLOK].loadSound(soundfile, "EARTHPOW", SOUND_EARTHPOW);
+    ok &= m_soundslot[SOUND_KEEN_BLOK].loadSound(soundfile, "EARTHPOW", SOUND_EARTHPOW);
   }
   else if (Episode == 3)
   {
-    ok |= m_soundslot[SOUND_MEEP].loadSound(soundfile, "MEEP", SOUND_MEEP);
-    ok |= m_soundslot[SOUND_ANKH].loadSound(soundfile, "ANKH", SOUND_ANKH);
-    ok |= m_soundslot[SOUND_MORTIMER].loadSound(soundfile, "MORTIMER", SOUND_MORTIMER);
-    ok |= m_soundslot[SOUND_FOOTSLAM].loadSound(soundfile, "FOOTSLAM", SOUND_FOOTSLAM);
+    ok &= m_soundslot[SOUND_MEEP].loadSound(soundfile, "MEEP", SOUND_MEEP);
+    ok &= m_soundslot[SOUND_ANKH].loadSound(soundfile, "ANKH", SOUND_ANKH);
+    ok &= m_soundslot[SOUND_MORTIMER].loadSound(soundfile, "MORTIMER", SOUND_MORTIMER);
+    ok &= m_soundslot[SOUND_FOOTSLAM].loadSound(soundfile, "FOOTSLAM", SOUND_FOOTSLAM);
   }
 
   for( unsigned short i=0 ; i<m_mixing_channels ; i++ )
diff --git a/src/sdl/sound/CSound.h b/src/sdl/sound/CSound.h
index 8ab64171d..62d27ad36 100644
--- a/src/sdl/sound/CSound.h
+++ b/src/sdl/sound/CSound.h
@@ -23,7 +23,7 @@ public:
 
 	bool init(void);
 	void stop(void);
-	char loadSoundData(unsigned short Episode, char *DataDirectory);
+	bool loadSoundData(unsigned short Episode, char *DataDirectory);
 	void stopAllSounds(void);
 
 	bool forcedisPlaying(void);
diff --git a/src/sdl/sound/CSoundSlot.cpp b/src/sdl/sound/CSoundSlot.cpp
index 243a44516..8d992b9ad 100644
--- a/src/sdl/sound/CSoundSlot.cpp
+++ b/src/sdl/sound/CSoundSlot.cpp
@@ -33,7 +33,7 @@ CSoundSlot::~CSoundSlot() {
 }
 
 // loads sound searchname from file fname, into sounds[] entry loadnum
-// return value is nonzero on failure
+// return value is false on failure
 bool CSoundSlot::loadSound(const char *fname, const char *searchname, unsigned int loadnum)
 {
 	// Unload the sound if any was previously loaded