X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=ef7598485386444b5a3476c33efc27419acb6818;hb=d5ff767196019eeb0001f921365bb1e4060eee5b;hp=e1ea0433fa973fb4d3bb962e31458ee5d770a2a8;hpb=b4cb68756603ec3f7edfcf94107fd05a1fc5a8f6;p=lugaru.git

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index e1ea043..ef75984 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "openal_wrapper.h"
 #include "Settings.h"
 #include "Input.h"
+#include "Animation.h"
 
 using namespace std;
 
@@ -47,9 +48,7 @@ extern XYZ viewer;
 extern int environment;
 extern float texscale;
 extern Terrain terrain;
-extern OPENAL_SAMPLE *samp[100];
 extern int channels[100];
-extern Sprites sprites;
 extern int kTextureSize;
 extern float screenwidth,screenheight;
 extern float gravity;
@@ -60,7 +59,6 @@ extern int slomo;
 extern float slomodelay;
 extern bool floatjump;
 extern float volume;
-extern Animation animation[animation_count];
 extern Light light;
 extern float texdetail;
 extern GLubyte bloodText[512*512*3];
@@ -72,9 +70,6 @@ extern float blackout;
 extern bool cellophane;
 extern bool musictoggle;
 extern int difficulty;
-extern Weapons weapons;
-extern Person player[maxplayers];
-extern int numplayers;
 extern int bloodtoggle;
 extern bool invertmouse;
 extern float windvar;
@@ -213,14 +208,6 @@ extern bool campaign;
 
 extern float oldgamespeed;
 
-extern float accountcampaignhighscore[10];
-extern float accountcampaignfasttime[10];
-extern float accountcampaignscore[10];
-extern float accountcampaigntime[10];
-
-extern int accountcampaignchoicesmade[10];
-extern int accountcampaignchoices[10][5000];
-
 static const char *rabbitskin[] = {
 ":Data:Textures:Fur3.jpg",
 ":Data:Textures:Fur.jpg",
@@ -251,7 +238,6 @@ static bool stripfx(const char *str, const char *pfx)
   return !strncasecmp(str, pfx, strlen(pfx));
 }
 
-extern OPENAL_STREAM * strm[20];
 extern "C"	void PlaySoundEx(int channel, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused);
 extern "C" void PlayStreamEx(int chan, OPENAL_STREAM *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused);
 
@@ -322,142 +308,131 @@ static void ch_save(Game *game, const char *args)
   fpackf(tfile, "Bi Bi", player[0].whichskin, player[0].creature);
 
   fpackf(tfile, "Bi", numdialogues);
-  if(numdialogues)
-    for(k=0;k<numdialogues;k++){
-      fpackf(tfile, "Bi", numdialogueboxes[k]);
-      fpackf(tfile, "Bi", dialoguetype[k]);
-      for(l=0;l<10;l++){
-	fpackf(tfile, "Bf Bf Bf", participantlocation[k][l].x, participantlocation[k][l].y, participantlocation[k][l].z);
-	fpackf(tfile, "Bf", participantrotation[k][l]);
-      }
-      if(numdialogueboxes)
-	for(l=0;l<numdialogueboxes[k];l++){
-	  fpackf(tfile, "Bi", dialogueboxlocation[k][l]);
-	  fpackf(tfile, "Bf", dialogueboxcolor[k][l][0]);
-	  fpackf(tfile, "Bf", dialogueboxcolor[k][l][1]);
-	  fpackf(tfile, "Bf", dialogueboxcolor[k][l][2]);
-	  fpackf(tfile, "Bi", dialogueboxsound[k][l]);
-
-	  templength=strlen(dialoguetext[k][l]);
-	  fpackf(tfile, "Bi",(templength));
-	  for(m=0;m<templength;m++){
-	    fpackf(tfile, "Bb", dialoguetext[k][l][m]);
-	    if(dialoguetext[k][l][m]=='\0')break;
-	  }
-
-	  templength=strlen(dialoguename[k][l]);
-	  fpackf(tfile, "Bi",templength);
-	  for(m=0;m<templength;m++){
-	    fpackf(tfile, "Bb", dialoguename[k][l][m]);
-	    if(dialoguename[k][l][m]=='\0')break;
-	  }
-
-	  fpackf(tfile, "Bf Bf Bf", dialoguecamera[k][l].x, dialoguecamera[k][l].y, dialoguecamera[k][l].z);
-	  fpackf(tfile, "Bi", participantfocus[k][l]);
-	  fpackf(tfile, "Bi", participantaction[k][l]);
-
-	  for(m=0;m<10;m++)
-	    fpackf(tfile, "Bf Bf Bf", participantfacing[k][l][m].x, participantfacing[k][l][m].y, participantfacing[k][l][m].z);
-
-	  fpackf(tfile, "Bf Bf",dialoguecamerarotation[k][l],dialoguecamerarotation2[k][l]);
+	for(k=0;k<numdialogues;k++){
+		fpackf(tfile, "Bi", numdialogueboxes[k]);
+		fpackf(tfile, "Bi", dialoguetype[k]);
+		for(l=0;l<10;l++){
+			fpackf(tfile, "Bf Bf Bf", participantlocation[k][l].x, participantlocation[k][l].y, participantlocation[k][l].z);
+			fpackf(tfile, "Bf", participantrotation[k][l]);
+		}
+		for(l=0;l<numdialogueboxes[k];l++){
+			fpackf(tfile, "Bi", dialogueboxlocation[k][l]);
+			fpackf(tfile, "Bf", dialogueboxcolor[k][l][0]);
+			fpackf(tfile, "Bf", dialogueboxcolor[k][l][1]);
+			fpackf(tfile, "Bf", dialogueboxcolor[k][l][2]);
+			fpackf(tfile, "Bi", dialogueboxsound[k][l]);
+
+			templength=strlen(dialoguetext[k][l]);
+			fpackf(tfile, "Bi",(templength));
+			for(m=0;m<templength;m++){
+				fpackf(tfile, "Bb", dialoguetext[k][l][m]);
+				if(dialoguetext[k][l][m]=='\0')break;
+			}
+
+			templength=strlen(dialoguename[k][l]);
+			fpackf(tfile, "Bi",templength);
+			for(m=0;m<templength;m++){
+				fpackf(tfile, "Bb", dialoguename[k][l][m]);
+				if(dialoguename[k][l][m]=='\0')break;
+			}
+
+			fpackf(tfile, "Bf Bf Bf", dialoguecamera[k][l].x, dialoguecamera[k][l].y, dialoguecamera[k][l].z);
+			fpackf(tfile, "Bi", participantfocus[k][l]);
+			fpackf(tfile, "Bi", participantaction[k][l]);
+
+			for(m=0;m<10;m++)
+				fpackf(tfile, "Bf Bf Bf", participantfacing[k][l][m].x, participantfacing[k][l][m].y, participantfacing[k][l][m].z);
+
+			fpackf(tfile, "Bf Bf",dialoguecamerarotation[k][l],dialoguecamerarotation2[k][l]);
+		}
 	}
-    }
 
-  if(player[0].numclothes)
-    for(k=0;k<player[0].numclothes;k++){
-      templength=strlen(player[0].clothes[k]);
-      fpackf(tfile, "Bi", templength);
-      for(l=0;l<templength;l++)
-	fpackf(tfile, "Bb", player[0].clothes[k][l]);
-      fpackf(tfile, "Bf Bf Bf", player[0].clothestintr[k], player[0].clothestintg[k], player[0].clothestintb[k]);
-    }
+	for(k=0;k<player[0].numclothes;k++){
+		templength=strlen(player[0].clothes[k]);
+		fpackf(tfile, "Bi", templength);
+		for(l=0;l<templength;l++)
+			fpackf(tfile, "Bb", player[0].clothes[k][l]);
+		fpackf(tfile, "Bf Bf Bf", player[0].clothestintr[k], player[0].clothestintg[k], player[0].clothestintb[k]);
+	}
 
   fpackf(tfile, "Bi", environment);
 
   fpackf(tfile, "Bi", objects.numobjects);
 
-  if(objects.numobjects)
     for(k=0;k<objects.numobjects;k++){
       fpackf(tfile, "Bi Bf Bf Bf Bf Bf Bf", objects.type[k], objects.rotation[k], objects.rotation2[k], objects.position[k].x, objects.position[k].y, objects.position[k].z, objects.scale[k]);
     }
 
   fpackf(tfile, "Bi", numhotspots);
-  if(numhotspots)
-    for(i=0;i<numhotspots;i++){
-      fpackf(tfile, "Bi Bf Bf Bf Bf", hotspottype[i],hotspotsize[i],hotspot[i].x,hotspot[i].y,hotspot[i].z);
-      templength=strlen(hotspottext[i]);
-      fpackf(tfile, "Bi",templength);
-      for(l=0;l<templength;l++)
-	fpackf(tfile, "Bb", hotspottext[i][l]);
-    }
+	for(i=0;i<numhotspots;i++){
+		fpackf(tfile, "Bi Bf Bf Bf Bf", hotspottype[i],hotspotsize[i],hotspot[i].x,hotspot[i].y,hotspot[i].z);
+		templength=strlen(hotspottext[i]);
+		fpackf(tfile, "Bi",templength);
+		for(l=0;l<templength;l++)
+			fpackf(tfile, "Bb", hotspottext[i][l]);
+	}
 
   fpackf(tfile, "Bi", numplayers);
-  if(numplayers>1&&numplayers<maxplayers)
+  if(numplayers<maxplayers)
     for(j=1;j<numplayers;j++){
-      fpackf(tfile, "Bi Bi Bf Bf Bf Bi Bi Bf Bb Bf", player[j].whichskin, player[j].creature, player[j].coords.x, player[j].coords.y, player[j].coords.z, player[j].num_weapons, player[j].howactive, player[j].scale, player[j].immobile, player[j].rotation);
-      if(player[j].num_weapons>0&&player[j].num_weapons<5)
-	for(k=0;k<player[j].num_weapons;k++){
-	  fpackf(tfile, "Bi", weapons.type[player[j].weaponids[k]]);
-	}
-      if(player[j].numwaypoints<30){
-	fpackf(tfile, "Bi", player[j].numwaypoints);
-	for(k=0;k<player[j].numwaypoints;k++){
-	  fpackf(tfile, "Bf", player[j].waypoints[k].x);
-	  fpackf(tfile, "Bf", player[j].waypoints[k].y);
-	  fpackf(tfile, "Bf", player[j].waypoints[k].z);
-	  fpackf(tfile, "Bi", player[j].waypointtype[k]);
-	}
-	fpackf(tfile, "Bi", player[j].waypoint);
-      }
-      else{
-	player[j].numwaypoints=0;
-	player[j].waypoint=0;
-	fpackf(tfile, "Bi Bi Bi", player[j].numwaypoints, player[j].waypoint, player[j].waypoint);
-      }
-
-      fpackf(tfile, "Bf Bf Bf", player[j].armorhead, player[j].armorhigh, player[j].armorlow);
-      fpackf(tfile, "Bf Bf Bf", player[j].protectionhead, player[j].protectionhigh, player[j].protectionlow);
-      fpackf(tfile, "Bf Bf Bf", player[j].metalhead, player[j].metalhigh, player[j].metallow);
-      fpackf(tfile, "Bf Bf", player[j].power, player[j].speedmult);
-
-      if(player[j].creature==wolftype){
-	headprop=player[j].proportionhead.x/1.1;
-	bodyprop=player[j].proportionbody.x/1.1;
-	armprop=player[j].proportionarms.x/1.1;
-	legprop=player[j].proportionlegs.x/1.1;
-      }
-
-      if(player[j].creature==rabbittype){
-	headprop=player[j].proportionhead.x/1.2;
-	bodyprop=player[j].proportionbody.x/1.05;
-	armprop=player[j].proportionarms.x/1.00;
-	legprop=player[j].proportionlegs.x/1.1;
-      }
-
-      fpackf(tfile, "Bf Bf Bf Bf", headprop, bodyprop, armprop, legprop);
+		fpackf(tfile, "Bi Bi Bf Bf Bf Bi Bi Bf Bb Bf", player[j].whichskin, player[j].creature, player[j].coords.x, player[j].coords.y, player[j].coords.z, player[j].num_weapons, player[j].howactive, player[j].scale, player[j].immobile, player[j].rotation);
+		if(player[j].num_weapons<5)
+			for(k=0;k<player[j].num_weapons;k++){
+				fpackf(tfile, "Bi", weapons.type[player[j].weaponids[k]]);
+			}
+		if(player[j].numwaypoints<30){
+			fpackf(tfile, "Bi", player[j].numwaypoints);
+			for(k=0;k<player[j].numwaypoints;k++){
+				fpackf(tfile, "Bf", player[j].waypoints[k].x);
+				fpackf(tfile, "Bf", player[j].waypoints[k].y);
+				fpackf(tfile, "Bf", player[j].waypoints[k].z);
+				fpackf(tfile, "Bi", player[j].waypointtype[k]);
+			}
+			fpackf(tfile, "Bi", player[j].waypoint);
+		} else {
+			player[j].numwaypoints=0;
+			player[j].waypoint=0;
+			fpackf(tfile, "Bi Bi Bi", player[j].numwaypoints, player[j].waypoint, player[j].waypoint);
+		}
 
+		fpackf(tfile, "Bf Bf Bf", player[j].armorhead, player[j].armorhigh, player[j].armorlow);
+		fpackf(tfile, "Bf Bf Bf", player[j].protectionhead, player[j].protectionhigh, player[j].protectionlow);
+		fpackf(tfile, "Bf Bf Bf", player[j].metalhead, player[j].metalhigh, player[j].metallow);
+		fpackf(tfile, "Bf Bf", player[j].power, player[j].speedmult);
+
+		if(player[j].creature==wolftype) {
+			headprop=player[j].proportionhead.x/1.1;
+			bodyprop=player[j].proportionbody.x/1.1;
+			armprop=player[j].proportionarms.x/1.1;
+			legprop=player[j].proportionlegs.x/1.1;
+		} else if(player[j].creature==rabbittype){
+			headprop=player[j].proportionhead.x/1.2;
+			bodyprop=player[j].proportionbody.x/1.05;
+			armprop=player[j].proportionarms.x/1.00;
+			legprop=player[j].proportionlegs.x/1.1;
+		}
 
+		fpackf(tfile, "Bf Bf Bf Bf", headprop, bodyprop, armprop, legprop);
 
-      fpackf(tfile, "Bi", player[j].numclothes);
-      if(player[j].numclothes)
-	for(k=0;k<player[j].numclothes;k++){
-	  int templength;
-	  templength=strlen(player[j].clothes[k]);
-	  fpackf(tfile, "Bi", templength);
-	  for(l=0;l<templength;l++)
-	    fpackf(tfile, "Bb", player[j].clothes[k][l]);
-	  fpackf(tfile, "Bf Bf Bf", player[j].clothestintr[k], player[j].clothestintg[k], player[j].clothestintb[k]);
-	}
+		fpackf(tfile, "Bi", player[j].numclothes);
+		if(player[j].numclothes)
+			for(k=0;k<player[j].numclothes;k++){
+				int templength;
+				templength=strlen(player[j].clothes[k]);
+				fpackf(tfile, "Bi", templength);
+				for(l=0;l<templength;l++)
+					fpackf(tfile, "Bb", player[j].clothes[k][l]);
+				fpackf(tfile, "Bf Bf Bf", player[j].clothestintr[k], player[j].clothestintg[k], player[j].clothestintb[k]);
+			}
     }
 
   fpackf(tfile, "Bi", game->numpathpoints);
-  if(game->numpathpoints)
-    for(j=0;j<game->numpathpoints;j++){
-      fpackf(tfile, "Bf Bf Bf Bi", game->pathpoint[j].x, game->pathpoint[j].y, game->pathpoint[j].z, game->numpathpointconnect[j]);
-      for(k=0;k<game->numpathpointconnect[j];k++){
-	fpackf(tfile, "Bi", game->pathpointconnect[j][k]);
-      }
-    }
+	for(j=0;j<game->numpathpoints;j++){
+		fpackf(tfile, "Bf Bf Bf Bi", game->pathpoint[j].x, game->pathpoint[j].y, game->pathpoint[j].z, game->numpathpointconnect[j]);
+		for(k=0;k<game->numpathpointconnect[j];k++){
+			fpackf(tfile, "Bi", game->pathpointconnect[j][k]);
+		}
+	}
 
   fpackf(tfile, "Bf Bf Bf Bf", game->mapcenter.x, game->mapcenter.y, game->mapcenter.z, game->mapradius);
 
@@ -544,9 +519,7 @@ static void set_proportion(int pnum, const char *args)
     player[pnum].proportionbody=1.1*bodyprop;
     player[pnum].proportionarms=1.1*armprop;
     player[pnum].proportionlegs=1.1*legprop;
-  }
-
-  if(player[pnum].creature==rabbittype){
+  } else if(player[pnum].creature==rabbittype){
     player[pnum].proportionhead=1.2*headprop;
     player[pnum].proportionbody=1.05*bodyprop;
     player[pnum].proportionarms=1.00*armprop;
@@ -818,23 +791,21 @@ static void ch_notindemo(Game *game, const char *args)
 static void ch_type(Game *game, const char *args)
 {
   int i, n = sizeof(editortypenames) / sizeof(editortypenames[0]);
-  for (i = 0; i < n; i++)
-    if (stripfx(args, editortypenames[i]))
-      {
-	editoractive = i;
-	break;
-      }
+	for (i = 0; i < n; i++)
+		if (stripfx(args, editortypenames[i])) {
+			editoractive = i;
+			break;
+		}
 }
 
 static void ch_path(Game *game, const char *args)
 {
   int i, n = sizeof(pathtypenames) / sizeof(pathtypenames[0]);
   for (i = 0; i < n; i++)
-    if (stripfx(args, pathtypenames[i]))
-      {
-	editorpathtype = i;
-	break;
-      }
+    if (stripfx(args, pathtypenames[i])) {
+		editorpathtype = i;
+		break;
+    }
 }
 
 static void ch_hs(Game *game, const char *args)
@@ -1003,9 +974,7 @@ static void ch_default(Game *game, const char *args)
     player[0].proportionbody=1.1;
     player[0].proportionarms=1.1;
     player[0].proportionlegs=1.1;
-  }
-
-  if(player[0].creature==rabbittype){
+  } else if(player[0].creature==rabbittype){
     player[0].proportionhead=1.2;
     player[0].proportionbody=1.05;
     player[0].proportionarms=1.00;
@@ -1185,7 +1154,7 @@ static void cmd_dispatch(Game *game, const char *cmd)
 }
 
 /********************> Tick() <*****/
-extern void ScreenShot(const char * fname);
+extern bool save_image(const char * fname);
 void Screenshot	(void)
 {
 	char temp[1024];
@@ -1198,8 +1167,8 @@ void Screenshot	(void)
 	#else
 	mkdir("Screenshots", S_IRWXU);
 	#endif
-
-	ScreenShot(temp);
+	
+	save_image(temp);
 }
 
 
@@ -1415,7 +1384,7 @@ void	Game::Setenvironment(int which)
 		windvector.z=3;
 		if(ambientsound){
 			//PlaySoundEx( wind, samp[wind], NULL, true);
-			PlayStreamEx(stream_wind, strm[stream_wind], 0, true);
+			PlayStreamEx(stream_wind, samp[stream_wind], 0, true);
 			OPENAL_SetPaused(channels[stream_wind], false);
 			OPENAL_SetVolume(channels[stream_wind], 256);
 		}
@@ -1425,18 +1394,10 @@ void	Game::Setenvironment(int which)
 		LoadTexture(":Data:Textures:bouldersnow.jpg",&objects.rocktextureptr,1,0);
 		LoadTexture(":Data:Textures:snowbox.jpg",&objects.boxtextureptr,1,0);
 
-		OPENAL_Sample_Free(samp[footstepsound]);
-		OPENAL_Sample_Free(samp[footstepsound2]);
-		OPENAL_Sample_Free(samp[footstepsound3]);
-		OPENAL_Sample_Free(samp[footstepsound4]);
-		samp[footstepsound] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:footstepsnow1.ogg"), OPENAL_HW3D, 0, 0);
-		samp[footstepsound2] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:footstepsnow2.ogg"), OPENAL_HW3D, 0, 0);
-		samp[footstepsound3] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:footstepstone1.ogg"), OPENAL_HW3D, 0, 0);
-		samp[footstepsound4] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:footstepstone2.ogg"), OPENAL_HW3D, 0, 0);
-		OPENAL_Sample_SetMinMaxDistance(samp[footstepsound], 4.0f, 1000.0f);
-		OPENAL_Sample_SetMinMaxDistance(samp[footstepsound2], 4.0f, 1000.0f);
-		OPENAL_Sample_SetMinMaxDistance(samp[footstepsound3], 4.0f, 1000.0f);
-		OPENAL_Sample_SetMinMaxDistance(samp[footstepsound4], 4.0f, 1000.0f);
+		footstepsound = footstepsn1;
+		footstepsound2 = footstepsn2;
+		footstepsound3 = footstepst1;
+		footstepsound4 = footstepst2;
 
 		LoadTexture(":Data:Textures:snow.jpg",&terraintexture,1,0);
 
@@ -1474,23 +1435,15 @@ void	Game::Setenvironment(int which)
 
 		if(ambientsound){
 			//PlaySoundEx( desertambient, samp[desertambient], NULL, true);
-			PlayStreamEx( stream_desertambient, strm[stream_desertambient], NULL, true);
+			PlayStreamEx( stream_desertambient, samp[stream_desertambient], NULL, true);
 			OPENAL_SetPaused(channels[stream_desertambient], false);
 			OPENAL_SetVolume(channels[stream_desertambient], 256);
 		}
 
-		OPENAL_Sample_Free(samp[footstepsound]);
-		OPENAL_Sample_Free(samp[footstepsound2]);
-		OPENAL_Sample_Free(samp[footstepsound3]);
-		OPENAL_Sample_Free(samp[footstepsound4]);
-		samp[footstepsound] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:footstepsnow1.ogg"), OPENAL_HW3D, 0, 0);
-		samp[footstepsound2] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:footstepsnow2.ogg"), OPENAL_HW3D, 0, 0);
-		samp[footstepsound3] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:footstepsnow1.ogg"), OPENAL_HW3D, 0, 0);
-		samp[footstepsound4] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:footstepsnow2.ogg"), OPENAL_HW3D, 0, 0);
-		OPENAL_Sample_SetMinMaxDistance(samp[footstepsound], 4.0f, 1000.0f);
-		OPENAL_Sample_SetMinMaxDistance(samp[footstepsound2], 4.0f, 1000.0f);
-		OPENAL_Sample_SetMinMaxDistance(samp[footstepsound3], 4.0f, 1000.0f);
-		OPENAL_Sample_SetMinMaxDistance(samp[footstepsound4], 4.0f, 1000.0f);
+		footstepsound = footstepsn1;
+		footstepsound2 = footstepsn2;
+		footstepsound3 = footstepsn1;
+		footstepsound4 = footstepsn2;
 
 		LoadTexture(":Data:Textures:sand.jpg",&terraintexture,1,0);
 
@@ -1525,23 +1478,15 @@ void	Game::Setenvironment(int which)
 		LoadTexture(":Data:Textures:grassbox.jpg",&objects.boxtextureptr,1,0);
 
 		if(ambientsound){
-			PlayStreamEx( stream_wind, strm[stream_wind], NULL, true);
+			PlayStreamEx( stream_wind, samp[stream_wind], NULL, true);
 			OPENAL_SetPaused(channels[stream_wind], false);
 			OPENAL_SetVolume(channels[stream_wind], 100);
 		}
 
-		OPENAL_Sample_Free(samp[footstepsound]);
-		OPENAL_Sample_Free(samp[footstepsound2]);
-		OPENAL_Sample_Free(samp[footstepsound3]);
-		OPENAL_Sample_Free(samp[footstepsound4]);
-		samp[footstepsound] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:footstepgrass1.ogg"), OPENAL_HW3D, 0, 0);
-		samp[footstepsound2] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:footstepgrass2.ogg"), OPENAL_HW3D, 0, 0);
-		samp[footstepsound3] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:footstepstone1.ogg"), OPENAL_HW3D, 0, 0);
-		samp[footstepsound4] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:footstepstone2.ogg"), OPENAL_HW3D, 0, 0);
-		OPENAL_Sample_SetMinMaxDistance(samp[footstepsound], 4.0f, 1000.0f);
-		OPENAL_Sample_SetMinMaxDistance(samp[footstepsound2], 4.0f, 1000.0f);
-		OPENAL_Sample_SetMinMaxDistance(samp[footstepsound3], 4.0f, 1000.0f);
-		OPENAL_Sample_SetMinMaxDistance(samp[footstepsound4], 4.0f, 1000.0f);
+		footstepsound = footstepgr1;
+		footstepsound2 = footstepgr2;
+		footstepsound3 = footstepst1;
+		footstepsound4 = footstepst2;
 
 		LoadTexture(":Data:Textures:grassdirt.jpg",&terraintexture,1,0);
 
@@ -1599,26 +1544,6 @@ void	Game::Loadlevel(int which){
 	whichlevel=which;
 }
 
-/*char * Game::MD5_string (unsigned char *string){
-char temp[50];
-char temp2[100];
-
-strcpy(temp2,(const char *)string);
-strcat((char *)temp2,(const char *)"Lugaru");
-sprintf (temp, "%d",strlen((char *)temp2));
-strcat((char *)temp2,temp);
-
-MD5 context;
-unsigned int len = strlen ( (char *)temp2);
-
-context.update   ((unsigned char *)temp2, len);
-context.finalize ();
-
-return context.hex_digest();
-}*/
-
-
-
 void	Game::Loadlevel(char *name){
 	int i,j,k,l,m;
 	static int oldlevel;
@@ -1675,7 +1600,7 @@ void	Game::Loadlevel(char *name){
 		won=0;
 
 		//campaign=0;
-		animation[bounceidleanim].Load((char *)":Data:Animations:Idle",middleheight,neutral);
+		animation[bounceidleanim].Load((char *)"Idle",middleheight,neutral);
 
 		numdialogues=0;
 
@@ -1745,7 +1670,7 @@ void	Game::Loadlevel(char *name){
 		if(!stealthloading)
 		{
 			terrain.numdecals=0;
-			sprites.numsprites=0;
+			Sprite::deleteSprites();
 			for(i=0;i<objects.numobjects;i++)
 			{
 				objects.model[i].numdecals=0;
@@ -2241,7 +2166,7 @@ void	Game::Loadlevel(char *name){
 				player[i].proportionlegs.z=0;
 			}
 
-			player[i].tempanimation.Load((char *)":Data:Animations:Tempanim",0,0);
+			player[i].tempanimation.Load((char *)"Tempanim",0,0);
 
 			player[i].headmorphness=0;
 			player[i].targetheadmorphness=1;
@@ -2342,7 +2267,7 @@ void	Game::Loadlevel(char *name){
 		{
 			if(ambientsound)
 			{
-				PlayStreamEx(stream_wind, strm[stream_wind], NULL, true);
+				PlayStreamEx(stream_wind, samp[stream_wind], NULL, true);
 				OPENAL_SetPaused(channels[stream_wind], false);
 				OPENAL_SetVolume(channels[stream_wind], 256);
 			}
@@ -2354,7 +2279,7 @@ void	Game::Loadlevel(char *name){
 				//PlaySoundEx(desertambient,
 				//	samp[desertambient], NULL, true);
 				PlayStreamEx(stream_desertambient,
-					strm[stream_desertambient], NULL, true);
+					samp[stream_desertambient], NULL, true);
 				OPENAL_SetPaused(channels[stream_desertambient], false);
 				OPENAL_SetVolume(channels[stream_desertambient], 256);
 			}
@@ -2364,7 +2289,7 @@ void	Game::Loadlevel(char *name){
 			if(ambientsound)
 			{
 				//PlaySoundEx(wind, samp[wind], NULL, true);
-				PlayStreamEx(stream_wind, strm[stream_wind], NULL, true);
+				PlayStreamEx(stream_wind, samp[stream_wind], NULL, true);
 				OPENAL_SetPaused(channels[stream_wind], false);
 				OPENAL_SetVolume(channels[stream_wind], 100);
 			}
@@ -2449,7 +2374,7 @@ void	Game::Tick()
 		if(mainmenu&&endgame==1)mainmenu=10;
 		if( (Input::isKeyDown(SDLK_ESCAPE)||(mainmenu==0&&((Input::isKeyDown(jumpkey)||Input::isKeyDown(SDLK_SPACE)||(campaign)))&&!oldjumpkeydown&&campaign&&winfreeze))
 		    && !mainmenutogglekeydown
-		    && (!mainmenu||gameon||mainmenu==3||mainmenu==4||mainmenu==5||mainmenu==6||(mainmenu==7&&!entername)||mainmenu==9||mainmenu==11||mainmenu==13||mainmenu==17||mainmenu==10)
+		    && (!mainmenu||gameon||mainmenu==3||mainmenu==4||mainmenu==5||mainmenu==6||(mainmenu==7&&!entername)||mainmenu==9||mainmenu==10)
 		  ) { // go back
 			selected=-1;
 			if(mainmenu==1||mainmenu==2||mainmenu==0){
@@ -2462,7 +2387,7 @@ void	Game::Tick()
 				if(mainmenu&&musictoggle){
 					if(mainmenu==1||mainmenu==2||mainmenu==100){
 						OPENAL_SetFrequency(OPENAL_ALL, 0.001);
-						PlayStreamEx( stream_music3, strm[stream_music3], NULL, true);
+						PlayStreamEx( stream_music3, samp[stream_music3], NULL, true);
 						OPENAL_SetPaused(channels[stream_music3], false);
 						OPENAL_SetVolume(channels[stream_music3], 256);
 						OPENAL_SetPaused(channels[music1], true);
@@ -2485,7 +2410,7 @@ void	Game::Tick()
 
 				SaveSettings(*this);
 			}
-			if(mainmenu==4||mainmenu==5||mainmenu==6||mainmenu==7||mainmenu==9||mainmenu==13||mainmenu==10||mainmenu==11||mainmenu==100){
+			if(mainmenu==4||mainmenu==5||mainmenu==6||mainmenu==7||mainmenu==9||mainmenu==10||mainmenu==100){
 				fireSound();
 
 				flash();
@@ -2498,8 +2423,6 @@ void	Game::Tick()
 			if(mainmenu==6)mainmenu=5;
 			if(mainmenu==7)mainmenu=1;
 			if(mainmenu==9)mainmenu=5;
-			if(mainmenu==11)mainmenu=5;
-			if(mainmenu==13)mainmenu=12;
 			if(mainmenu==10)mainmenu=5;
 			if(mainmenu==100){
 				mainmenu=5;
@@ -2513,16 +2436,6 @@ void	Game::Tick()
 		}
 	}
 
-	/*static bool minimaptogglekeydown;
-	if(Input::isKeyDown(SDLK_TAB)&&!minimaptogglekeydown){
-	minimap=1-minimap;
-	minimaptogglekeydown=1;
-	}
-	if(!Input::isKeyDown(SDLK_TAB)){
-	minimaptogglekeydown=0;
-	}
-	*/
-
 	static bool minimaptogglekeydown;
 	if(Input::isKeyDown(SDLK_TAB)&&!minimaptogglekeydown&&tutoriallevel){
 		if(tutorialstage!=51)
@@ -2539,7 +2452,7 @@ void	Game::Tick()
 	if(mainmenu){
 		//menu buttons
 		if(mainmenu==1||mainmenu==2){
-			if(Button()&&!oldbutton&&selected==1){
+			if(Input::Button()&&!oldbutton&&selected==1){
 				if(!gameon){
 					fireSound(firestartsound);
 
@@ -2562,7 +2475,7 @@ void	Game::Tick()
 				}
 			}
 
-			if(Button()&&!oldbutton&&selected==2){
+			if(Input::Button()&&!oldbutton&&selected==2){
 				fireSound();
 
 				flash();
@@ -2579,7 +2492,7 @@ void	Game::Tick()
 				if(newscreenheight<0)newscreenheight=screenheight;
 			}
 
-			if(Button()&&!oldbutton&&selected==3){
+			if(Input::Button()&&!oldbutton&&selected==3){
 				fireSound();
 
 				flash();
@@ -2597,10 +2510,10 @@ void	Game::Tick()
 			}
 		}
 		if(mainmenu==3){
-			if(Button()&&!oldbutton&&selected!=-1){
+			if(Input::Button()&&!oldbutton&&selected!=-1){
 				fireSound();
 			}
-			if(Button()&&!oldbutton&&selected==0){
+			if(Input::Button()&&!oldbutton&&selected==0){
 			
 				extern SDL_Rect **resolutions;
 				bool isCustomResolution = true;
@@ -2648,25 +2561,25 @@ void	Game::Tick()
 
 				
 			}
-			if(Button()&&!oldbutton&&selected==1){
+			if(Input::Button()&&!oldbutton&&selected==1){
 				newdetail++;
 				if(newdetail>2)newdetail=0;
 			}
-			if(Button()&&!oldbutton&&selected==2){
+			if(Input::Button()&&!oldbutton&&selected==2){
 				bloodtoggle++;
 				if(bloodtoggle>2)bloodtoggle=0;
 			}
-			if(Button()&&!oldbutton&&selected==3){
+			if(Input::Button()&&!oldbutton&&selected==3){
 				difficulty++;
 				if(difficulty>2)difficulty=0;
 			}
-			if(Button()&&!oldbutton&&selected==4){
+			if(Input::Button()&&!oldbutton&&selected==4){
 				ismotionblur=1-ismotionblur;
 			}
-			if(Button()&&!oldbutton&&selected==5){
+			if(Input::Button()&&!oldbutton&&selected==5){
 				decals=1-decals;
 			}
-			if(Button()&&!oldbutton&&selected==6){
+			if(Input::Button()&&!oldbutton&&selected==6){
 				musictoggle=1-musictoggle;
 
 				if(!musictoggle){
@@ -2681,24 +2594,24 @@ void	Game::Tick()
 				}
 
 				if(musictoggle){
-					PlayStreamEx( stream_music3, strm[stream_music3], NULL, true);
+					PlayStreamEx( stream_music3, samp[stream_music3], NULL, true);
 					OPENAL_SetPaused(channels[stream_music3], false);
 					OPENAL_SetVolume(channels[stream_music3], 256);
 				}
 			}
-			if(Button()&&!oldbutton&&selected==9){
+			if(Input::Button()&&!oldbutton&&selected==9){
 				invertmouse=1-invertmouse;
 			}
-			if(Button()&&!oldbutton&&selected==10){
+			if(Input::Button()&&!oldbutton&&selected==10){
 				usermousesensitivity+=.2;
 				if(usermousesensitivity>2)usermousesensitivity=.2;
 			}
-			if(Button()&&!oldbutton&&selected==11){
+			if(Input::Button()&&!oldbutton&&selected==11){
 				volume+=.1f;
 				if(volume>1.0001f)volume=0;
 				OPENAL_SetSFXMasterVolume((int)(volume*255));
 			}
-			if(Button()&&!oldbutton&&selected==7){
+			if(Input::Button()&&!oldbutton&&selected==7){
 				/*fireSound();
 				*/
 				flash();
@@ -2709,17 +2622,17 @@ void	Game::Tick()
 				selected=-1;
 				keyselect=-1;
 			}
-			if(Button() && !oldbutton && selected == 12) {
+			if(Input::Button() && !oldbutton && selected == 12) {
 				flash();
 				
 				newstereomode = stereomode;
 				mainmenu=18;
 				keyselect=-1;
 			}
-			if(Button() && !oldbutton && selected == 13) {
+			if(Input::Button() && !oldbutton && selected == 13) {
 				showdamagebar=!showdamagebar;
 			}
-			if(Button()&&!oldbutton&&selected==8){
+			if(Input::Button()&&!oldbutton&&selected==8){
 				fireSound();
 
 				flash();
@@ -2736,7 +2649,7 @@ void	Game::Tick()
 			}
 		}
 		if(mainmenu==4){
-			if(Button()&&!oldbutton&&selected!=-1&&!waiting){
+			if(Input::Button()&&!oldbutton&&selected!=-1&&!waiting){
 				fireSound();
 				if(selected<9&&keyselect==-1)
 					keyselect=selected;
@@ -2764,7 +2677,7 @@ void	Game::Tick()
 				endgame=0;
 			}
 
-			if(Button()&&!oldbutton&&selected==1){
+			if(Input::Button()&&!oldbutton&&selected==1){
 				fireSound();
 
 				flash();
@@ -2784,7 +2697,7 @@ void	Game::Tick()
 				gameon=1;
 				OPENAL_SetPaused(channels[stream_music3], true);
 			}
-			if(Button()&&!oldbutton&&(selected-7>=accountactive->getCampaignChoicesMade())){//selected>=7&&(selected-7<=campaignnumchoices)){
+			if(Input::Button()&&!oldbutton&&(selected-7>=accountactive->getCampaignChoicesMade())){
 				fireSound();
 
 				flash();
@@ -2821,7 +2734,7 @@ void	Game::Tick()
 				gameon=1;
 				OPENAL_SetPaused(channels[stream_music3], true);
 			}
-			if(Button()&&!oldbutton&&selected==4){
+			if(Input::Button()&&!oldbutton&&selected==4){
 				fireSound();
 
 				flash();
@@ -2829,21 +2742,21 @@ void	Game::Tick()
 				if(mainmenu==5&&gameon)mainmenu=2;
 				if(mainmenu==5&&!gameon)mainmenu=1;
 			}
-			if(Button()&&!oldbutton&&selected==5){
+			if(Input::Button()&&!oldbutton&&selected==5){
 				fireSound();
 
 				flash();
 
 				mainmenu=7;
 			}
-			if(Button()&&!oldbutton&&selected==3){
+			if(Input::Button()&&!oldbutton&&selected==3){
 				fireSound();
 
 				flash();
 
 				mainmenu=6;
 			}
-			if(Button()&&!oldbutton&&selected==2){
+			if(Input::Button()&&!oldbutton&&selected==2){
 				fireSound();
 
 				flash();
@@ -2851,8 +2764,8 @@ void	Game::Tick()
 				mainmenu=9;
 			}
 		}
-		if(mainmenu==9){
-			if(Button()&&!oldbutton&&selected<numchallengelevels&&selected>=0&&selected<=accountactive->getProgress()){
+		else if(mainmenu==9){
+			if(Input::Button()&&!oldbutton&&selected<numchallengelevels&&selected>=0&&selected<=accountactive->getProgress()){
 				fireSound();
 
 				flash();
@@ -2873,37 +2786,7 @@ void	Game::Tick()
 				gameon=1;
 				OPENAL_SetPaused(channels[stream_music3], true);
 			}
-			if(Button()&&!oldbutton&&selected==numchallengelevels){
-				fireSound();
-
-				flash();
-
-				mainmenu=5;
-			}
-		}
-		if(mainmenu==11){
-			if(Button()&&!oldbutton&&selected<numchallengelevels&&selected>=0&&selected<=accountactive->getProgress()){
-				fireSound();
-
-				flash();
-
-				startbonustotal=0;
-
-				loading=2;
-				loadtime=0;
-				targetlevel=selected;
-				if(firstload) {
-					TickOnceAfter();
-					Loadlevel(selected);
-				} else
-					LoadStuff();
-				campaign=0;
-
-				mainmenu=0;
-				gameon=1;
-				OPENAL_SetPaused(channels[stream_music3], true);
-			}
-			if(Button()&&!oldbutton&&selected==numchallengelevels){
+			if(Input::Button()&&!oldbutton&&selected==numchallengelevels){
 				fireSound();
 
 				flash();
@@ -2913,7 +2796,7 @@ void	Game::Tick()
 		}
 		if(mainmenu==10){
 			endgame=2;
-			if(Button()&&!oldbutton&&selected==3){
+			if(Input::Button()&&!oldbutton&&selected==3){
 				fireSound();
 
 				flash();
@@ -2923,7 +2806,7 @@ void	Game::Tick()
 		}
 
 		if(mainmenu==6){
-			if(Button()&&!oldbutton) {
+			if(Input::Button()&&!oldbutton) {
 				if(selected>-1){
 					fireSound();
 					if(selected==1) {
@@ -2938,7 +2821,7 @@ void	Game::Tick()
 			}
 		}
 		if(mainmenu==7){
-			if(Button()&&!oldbutton) {
+			if(Input::Button()&&!oldbutton) {
 				if(selected!=-1){
 					fireSound();
 					if(selected==0&&Account::getNbAccounts()<8){
@@ -2963,7 +2846,7 @@ void	Game::Tick()
 			}
 		}
 		if(mainmenu==8){
-			if(Button()&&!oldbutton&&selected>-1){
+			if(Input::Button()&&!oldbutton&&selected>-1){
 				fireSound();
 
 				if(selected<=2)
@@ -2976,7 +2859,7 @@ void	Game::Tick()
 			}
 		}
 		if (mainmenu==18) {			
-			if(Button()&&!oldbutton&&selected==0) {
+			if(Input::Button()&&!oldbutton&&selected==0) {
 				newstereomode = (StereoMode)(newstereomode + 1);
 				while(!CanInitStereo(newstereomode)) {
 					printf("Failed to initialize mode %s (%i)\n", StereoModeName(newstereomode), newstereomode);
@@ -2994,11 +2877,11 @@ void	Game::Tick()
 				stereoseparation-=0.001;
 			}
 
-			if(Button()&&!oldbutton&&selected==2) {
+			if(Input::Button()&&!oldbutton&&selected==2) {
 				stereoreverse =! stereoreverse;
 			}
 			
-			if(Button()&&!oldbutton&&selected==3) {
+			if(Input::Button()&&!oldbutton&&selected==3) {
 				flash();
 
 				stereomode = newstereomode;
@@ -3009,7 +2892,7 @@ void	Game::Tick()
 		}
 
 
-		if(Button()||Input::isKeyDown(MOUSEBUTTON2))oldbutton=1;
+		if(Input::Button()||Input::isKeyDown(MOUSEBUTTON2))oldbutton=1;
 		else oldbutton=0;
 
 		if(Input::isKeyDown(SDLK_q)&&Input::isKeyDown(SDLK_LMETA)){
@@ -3318,7 +3201,7 @@ void	Game::Tick()
 								hotspotsprite=DoRotation(hotspotsprite,0,0,Random()%360);
 								hotspotsprite=DoRotation(hotspotsprite,0,Random()%360,0);
 								hotspotsprite+=hotspot[i];
-								sprites.MakeSprite(breathsprite, hotspotsprite, hotspotsprite*0, 1,0.5,0, 7, 0.4);
+								Sprite::MakeSprite(breathsprite, hotspotsprite, hotspotsprite*0, 1,0.5,0, 7, 0.4);
 								hotspotvisual[i]+=0.1/hotspotsize[i]/hotspotsize[i]/hotspotsize[i];
 							}
 						}
@@ -3398,7 +3281,7 @@ void	Game::Tick()
 									if(player[1].skeleton.free)temp2=player[1].skeleton.joints[i].velocity*player[1].scale/2;
 									if(!player[1].skeleton.free)temp=DoRotation(DoRotation(DoRotation(player[1].skeleton.joints[i].position,0,0,player[1].tilt),player[1].tilt2,0,0),0,player[1].rotation,0)*player[1].scale+player[1].coords;
 									if(player[1].skeleton.free)temp=player[1].skeleton.joints[i].position*player[1].scale+player[1].coords;
-									sprites.MakeSprite(breathsprite, temp,temp2, 1,1,1, .6+(float)abs(Random()%100)/200-.25, 1);
+									Sprite::MakeSprite(breathsprite, temp,temp2, 1,1,1, .6+(float)abs(Random()%100)/200-.25, 1);
 								}
 							}
 
@@ -3650,7 +3533,7 @@ void	Game::Tick()
 									if(player[1].skeleton.free)temp2=player[1].skeleton.joints[i].velocity*player[1].scale/2;
 									if(!player[1].skeleton.free)temp=DoRotation(DoRotation(DoRotation(player[1].skeleton.joints[i].position,0,0,player[1].tilt),player[1].tilt2,0,0),0,player[1].rotation,0)*player[1].scale+player[1].coords;
 									if(player[1].skeleton.free)temp=player[1].skeleton.joints[i].position*player[1].scale+player[1].coords;
-									sprites.MakeSprite(breathsprite, temp,temp2, 1,1,1, .6+(float)abs(Random()%100)/200-.25, 1);
+									Sprite::MakeSprite(breathsprite, temp,temp2, 1,1,1, .6+(float)abs(Random()%100)/200-.25, 1);
 								}
 							}
 
@@ -3838,7 +3721,7 @@ void	Game::Tick()
 								footpoint.y+=((float)abs(Random()%1200))/100-6;
 								footpoint.x+=((float)abs(Random()%1200))/100-6;
 								footpoint.z+=((float)abs(Random()%1200))/100-6;
-								sprites.MakeSprite(snowsprite, footpoint,footvel, 1,1,1, .1, 1);
+								Sprite::MakeSprite(snowsprite, footpoint,footvel, 1,1,1, .1, 1);
 							}
 						}
 						for(k=0;k<numplayers;k++){
@@ -4847,11 +4730,11 @@ void	Game::Tick()
 										flatvelocity2.z+=(float)(abs(Random()%100)-50)/10;
 										headspurtdirection=player[closest].skeleton.joints[player[closest].skeleton.jointlabels[head]].position-player[closest].skeleton.joints[player[closest].skeleton.jointlabels[neck]].position;
 										Normalise(&headspurtdirection);
-										sprites.MakeSprite(bloodflamesprite, flatfacing2,flatvelocity2, 1,1,1, .6, 1);
+										Sprite::MakeSprite(bloodflamesprite, flatfacing2,flatvelocity2, 1,1,1, .6, 1);
 										flatvelocity2+=headspurtdirection*8;
-										sprites.MakeSprite(bloodsprite, flatfacing2,flatvelocity2/2, 1,1,1, .16, 1);
+										Sprite::MakeSprite(bloodsprite, flatfacing2,flatvelocity2/2, 1,1,1, .16, 1);
 									}
-									sprites.MakeSprite(cloudsprite, flatfacing2,flatvelocity2*0, .6,0,0, 1, .5);
+									Sprite::MakeSprite(cloudsprite, flatfacing2,flatvelocity2*0, .6,0,0, 1, .5);
 
 									float gLoc[3];
 									float vel[3];
@@ -4928,9 +4811,9 @@ void	Game::Tick()
 										flatvelocity2.x+=(float)(abs(Random()%100)-50)/10;
 										flatvelocity2.y+=(float)(abs(Random()%100)-50)/10;
 										flatvelocity2.z+=(float)(abs(Random()%100)-50)/10;
-										sprites.MakeSprite(bloodflamesprite, flatfacing2,flatvelocity2, 1,1,1, 3, 1);
-										sprites.MakeSprite(bloodsprite, flatfacing2,flatvelocity2, 1,1,1, .3, 1);
-										sprites.MakeSprite(cloudsprite, flatfacing2,flatvelocity2*0, .6,0,0, 1, .5);
+										Sprite::MakeSprite(bloodflamesprite, flatfacing2,flatvelocity2, 1,1,1, 3, 1);
+										Sprite::MakeSprite(bloodsprite, flatfacing2,flatvelocity2, 1,1,1, .3, 1);
+										Sprite::MakeSprite(cloudsprite, flatfacing2,flatvelocity2*0, .6,0,0, 1, .5);
 									}
 
 									for(i=0;i<player[closest].skeleton.num_joints; i++){
@@ -4941,8 +4824,8 @@ void	Game::Tick()
 										flatvelocity2.x+=(float)(abs(Random()%100)-50)/10;
 										flatvelocity2.y+=(float)(abs(Random()%100)-50)/10;
 										flatvelocity2.z+=(float)(abs(Random()%100)-50)/10;
-										sprites.MakeSprite(bloodflamesprite, flatfacing2,flatvelocity2, 1,1,1, 3, 1);
-										sprites.MakeSprite(bloodsprite, flatfacing2,flatvelocity2, 1,1,1, .4, 1);
+										Sprite::MakeSprite(bloodflamesprite, flatfacing2,flatvelocity2, 1,1,1, 3, 1);
+										Sprite::MakeSprite(bloodsprite, flatfacing2,flatvelocity2, 1,1,1, .4, 1);
 									}
 
 									for(i=0;i<player[closest].skeleton.num_joints; i++){
@@ -4953,8 +4836,8 @@ void	Game::Tick()
 										flatvelocity2.x+=(float)(abs(Random()%100)-50)/10;
 										flatvelocity2.y+=(float)(abs(Random()%100)-50)/10;
 										flatvelocity2.z+=(float)(abs(Random()%100)-50)/10;
-										sprites.MakeSprite(bloodflamesprite, flatfacing2,flatvelocity2*2, 1,1,1, 3, 1);
-										sprites.MakeSprite(bloodsprite, flatfacing2,flatvelocity2*2, 1,1,1, .4, 1);
+										Sprite::MakeSprite(bloodflamesprite, flatfacing2,flatvelocity2*2, 1,1,1, 3, 1);
+										Sprite::MakeSprite(bloodsprite, flatfacing2,flatvelocity2*2, 1,1,1, .4, 1);
 									}
 
 									for(i=0;i<player[closest].skeleton.num_joints; i++){
@@ -4965,8 +4848,8 @@ void	Game::Tick()
 										flatvelocity2.x+=(float)(abs(Random()%100)-50)/10;
 										flatvelocity2.y+=(float)(abs(Random()%100)-50)/10;
 										flatvelocity2.z+=(float)(abs(Random()%100)-50)/10;
-										sprites.MakeSprite(bloodflamesprite, flatfacing2,flatvelocity2*2, 1,1,1, 3, 1);
-										sprites.MakeSprite(bloodsprite, flatfacing2,flatvelocity2*2, 1,1,1, .4, 1);
+										Sprite::MakeSprite(bloodflamesprite, flatfacing2,flatvelocity2*2, 1,1,1, 3, 1);
+										Sprite::MakeSprite(bloodsprite, flatfacing2,flatvelocity2*2, 1,1,1, .4, 1);
 									}
 
 									XYZ temppos;
@@ -5189,7 +5072,7 @@ void	Game::Tick()
 									player[numplayers].proportionlegs.z=0;
 								}
 
-								player[numplayers].tempanimation.Load((char *)":Data:Animations:Tempanim",0,0);
+								player[numplayers].tempanimation.Load((char *)"Tempanim",0,0);
 
 								player[numplayers].damagetolerance=200;
 
@@ -6765,21 +6648,6 @@ void	Game::Tick()
 																	else player[i].targetrotation-=90;
 																}
 															}
-															/*if(findDistancefast(&player[i].coords,&weapons.position[player[i].ally])<3){
-															if(abs(Random()%6)){
-															player[i].crouchkeydown=1;
-															if(!findDistancefast(&player[i].coords,&weapons.position[player[i].ally])<1){
-															if(player[i].isRun()){
-															player[i].targetframe=0;
-															player[i].target=0;
-															player[i].targetanimation=sneakanim;
-															}
-															}
-															else player[i].forwardkeydown=0;
-															}
-															else player[i].crouchkeydown=0;
-															}
-															else player[i].crouchkeydown=0;*/
 														}
 
 														player[i].leftkeydown=0;
@@ -7256,7 +7124,7 @@ void	Game::Tick()
 																				footpoint=weapons.position[k];
 																				if(player[i].victim->weaponstuck!=-1){
 																					if(player[i].victim->weaponids[player[i].victim->weaponstuck]==k){
-																						if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .8, .3);
+																						if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .8, .3);
 																						weapons.bloody[k]=2;
 																						weapons.blooddrip[k]=5;
 																						player[i].victim->weaponstuck=-1;
@@ -7762,65 +7630,76 @@ void	Game::Tick()
 
 							objects.DoStuff();
 							
-							if(numenvsounds!=0)
-								for(j=numenvsounds-1;j>=0;j--){
-									envsoundlife[j]-=multiplier;
-									if(envsoundlife[j]<0){
-										numenvsounds--;
-										envsoundlife[j]=envsoundlife[numenvsounds];
-										envsound[j]=envsound[numenvsounds];
-									}
+							for(j=numenvsounds-1;j>=0;j--){
+								envsoundlife[j]-=multiplier;
+								if(envsoundlife[j]<0){
+									numenvsounds--;
+									envsoundlife[j]=envsoundlife[numenvsounds];
+									envsound[j]=envsound[numenvsounds];
 								}
-								if(!slomo)OPENAL_SetFrequency(OPENAL_ALL, 22050);
-								if(slomo)OPENAL_SetFrequency(OPENAL_ALL, slomofreq);
-
-								if(tutoriallevel==1){
-									XYZ temp;
-									XYZ temp2;
-									XYZ temp3;
-									XYZ oldtemp;
-									XYZ oldtemp2;
-									temp.x=1011;
-									temp.y=84;
-									temp.z=491;
-									temp2.x=1025;
-									temp2.y=75;
-									temp2.z=447;
-									temp3.x=1038;
-									temp3.y=76;
-									temp3.z=453;
-									oldtemp=temp;
-									oldtemp2=temp2;
-									if(tutorialstage>=51)
+							}
+							if(slomo) OPENAL_SetFrequency(OPENAL_ALL, slomofreq);
+							else OPENAL_SetFrequency(OPENAL_ALL, 22050);
+
+							if(tutoriallevel==1){
+								XYZ temp;
+								XYZ temp2;
+								XYZ temp3;
+								XYZ oldtemp;
+								XYZ oldtemp2;
+								temp.x=1011;
+								temp.y=84;
+								temp.z=491;
+								temp2.x=1025;
+								temp2.y=75;
+								temp2.z=447;
+								temp3.x=1038;
+								temp3.y=76;
+								temp3.z=453;
+								oldtemp=temp;
+								oldtemp2=temp2;
+								if(tutorialstage>=51)
+									if(findDistancefast(&temp,&player[0].coords)>=findDistancefast(&temp,&temp2)-1||findDistancefast(&temp3,&player[0].coords)<4){
+										OPENAL_StopSound(OPENAL_ALL);  // hack...OpenAL renderer isn't stopping music after tutorial goes to level menu...
+										OPENAL_SetFrequency(OPENAL_ALL, 0.001);
+
+										PlayStreamEx( stream_music3, samp[stream_music3], NULL, true);
+										OPENAL_SetPaused(channels[stream_music3], false);
+										OPENAL_SetVolume(channels[stream_music3], 256);
+
+										gameon=0;
+										mainmenu=5;
+
+										fireSound();
+
+										flash();
+									}
+									if(tutorialstage<51)
 										if(findDistancefast(&temp,&player[0].coords)>=findDistancefast(&temp,&temp2)-1||findDistancefast(&temp3,&player[0].coords)<4){
-		                                    OPENAL_StopSound(OPENAL_ALL);  // hack...OpenAL renderer isn't stopping music after tutorial goes to level menu...
-											OPENAL_SetFrequency(OPENAL_ALL, 0.001);
-
-											PlayStreamEx( stream_music3, strm[stream_music3], NULL, true);
-											OPENAL_SetPaused(channels[stream_music3], false);
-											OPENAL_SetVolume(channels[stream_music3], 256);
-
-											gameon=0;
-											mainmenu=5;
-
-											float gLoc[3]={0,0,0};
-											float vel[3]={0,0,0};
-											OPENAL_Sample_SetMinMaxDistance(samp[fireendsound], 9999.0f, 99999.0f);
+											float gLoc[3];
+											float vel[3];
+											gLoc[0]=player[0].coords.x;
+											gLoc[1]=player[0].coords.y;
+											gLoc[2]=player[0].coords.z;
+											vel[0]=0;
+											vel[1]=0;
+											vel[2]=0;
 											PlaySoundEx( fireendsound, samp[fireendsound], NULL, true);
 											OPENAL_3D_SetAttributes(channels[fireendsound], gLoc, vel);
 											OPENAL_SetVolume(channels[fireendsound], 256);
 											OPENAL_SetPaused(channels[fireendsound], false);
-											OPENAL_Sample_SetMinMaxDistance(samp[fireendsound], 8.0f, 2000.0f);
+
+											player[0].coords=(oldtemp+oldtemp2)/2;
 
 											flash();
 										}
-										if(tutorialstage<51)
-											if(findDistancefast(&temp,&player[0].coords)>=findDistancefast(&temp,&temp2)-1||findDistancefast(&temp3,&player[0].coords)<4){
+										if(tutorialstage>=14&&tutorialstage<50)
+											if(findDistancefast(&temp,&player[1].coords)>=findDistancefast(&temp,&temp2)-1||findDistancefast(&temp3,&player[1].coords)<4){
 												float gLoc[3];
 												float vel[3];
-												gLoc[0]=player[0].coords.x;
-												gLoc[1]=player[0].coords.y;
-												gLoc[2]=player[0].coords.z;
+												gLoc[0]=player[1].coords.x;
+												gLoc[1]=player[1].coords.y;
+												gLoc[2]=player[1].coords.z;
 												vel[0]=0;
 												vel[1]=0;
 												vel[2]=0;
@@ -7829,87 +7708,68 @@ void	Game::Tick()
 												OPENAL_SetVolume(channels[fireendsound], 256);
 												OPENAL_SetPaused(channels[fireendsound], false);
 
-												player[0].coords=(oldtemp+oldtemp2)/2;
-
-												flash();
-											}
-											if(tutorialstage>=14&&tutorialstage<50)
-												if(findDistancefast(&temp,&player[1].coords)>=findDistancefast(&temp,&temp2)-1||findDistancefast(&temp3,&player[1].coords)<4){
-													float gLoc[3];
-													float vel[3];
-													gLoc[0]=player[1].coords.x;
-													gLoc[1]=player[1].coords.y;
-													gLoc[2]=player[1].coords.z;
-													vel[0]=0;
-													vel[1]=0;
-													vel[2]=0;
-													PlaySoundEx( fireendsound, samp[fireendsound], NULL, true);
-													OPENAL_3D_SetAttributes(channels[fireendsound], gLoc, vel);
-													OPENAL_SetVolume(channels[fireendsound], 256);
-													OPENAL_SetPaused(channels[fireendsound], false);
-
-													for(int i=0;i<player[1].skeleton.num_joints;i++){
-														if(Random()%2==0){
-															if(!player[1].skeleton.free)temp2=(player[1].coords-player[1].oldcoords)/multiplier/2;//velocity/2;
-															if(player[1].skeleton.free)temp2=player[1].skeleton.joints[i].velocity*player[1].scale/2;
-															if(!player[1].skeleton.free)temp=DoRotation(DoRotation(DoRotation(player[1].skeleton.joints[i].position,0,0,player[1].tilt),player[1].tilt2,0,0),0,player[1].rotation,0)*player[1].scale+player[1].coords;
-															if(player[1].skeleton.free)temp=player[1].skeleton.joints[i].position*player[1].scale+player[1].coords;
-															sprites.MakeSprite(breathsprite, temp,temp2, 1,1,1, .6+(float)abs(Random()%100)/200-.25, 1);
-														}
+												for(int i=0;i<player[1].skeleton.num_joints;i++){
+													if(Random()%2==0){
+														if(!player[1].skeleton.free)temp2=(player[1].coords-player[1].oldcoords)/multiplier/2;//velocity/2;
+														if(player[1].skeleton.free)temp2=player[1].skeleton.joints[i].velocity*player[1].scale/2;
+														if(!player[1].skeleton.free)temp=DoRotation(DoRotation(DoRotation(player[1].skeleton.joints[i].position,0,0,player[1].tilt),player[1].tilt2,0,0),0,player[1].rotation,0)*player[1].scale+player[1].coords;
+														if(player[1].skeleton.free)temp=player[1].skeleton.joints[i].position*player[1].scale+player[1].coords;
+														Sprite::MakeSprite(breathsprite, temp,temp2, 1,1,1, .6+(float)abs(Random()%100)/200-.25, 1);
 													}
+												}
 
-													player[1].coords=(oldtemp+oldtemp2)/2;
-													for(int i=0;i<player[1].skeleton.num_joints;i++){
-														player[1].skeleton.joints[i].velocity=0;
-														if(Random()%2==0){
-															if(!player[1].skeleton.free)temp2=(player[1].coords-player[1].oldcoords)/multiplier/2;//velocity/2;
-															if(player[1].skeleton.free)temp2=player[1].skeleton.joints[i].velocity*player[1].scale/2;
-															if(!player[1].skeleton.free)temp=DoRotation(DoRotation(DoRotation(player[1].skeleton.joints[i].position,0,0,player[1].tilt),player[1].tilt2,0,0),0,player[1].rotation,0)*player[1].scale+player[1].coords;
-															if(player[1].skeleton.free)temp=player[1].skeleton.joints[i].position*player[1].scale+player[1].coords;
-															sprites.MakeSprite(breathsprite, temp,temp2, 1,1,1, .6+(float)abs(Random()%100)/200-.25, 1);
-														}
+												player[1].coords=(oldtemp+oldtemp2)/2;
+												for(int i=0;i<player[1].skeleton.num_joints;i++){
+													player[1].skeleton.joints[i].velocity=0;
+													if(Random()%2==0){
+														if(!player[1].skeleton.free)temp2=(player[1].coords-player[1].oldcoords)/multiplier/2;//velocity/2;
+														if(player[1].skeleton.free)temp2=player[1].skeleton.joints[i].velocity*player[1].scale/2;
+														if(!player[1].skeleton.free)temp=DoRotation(DoRotation(DoRotation(player[1].skeleton.joints[i].position,0,0,player[1].tilt),player[1].tilt2,0,0),0,player[1].rotation,0)*player[1].scale+player[1].coords;
+														if(player[1].skeleton.free)temp=player[1].skeleton.joints[i].position*player[1].scale+player[1].coords;
+														Sprite::MakeSprite(breathsprite, temp,temp2, 1,1,1, .6+(float)abs(Random()%100)/200-.25, 1);
 													}
 												}
-								}
+											}
+							}
 
 
-								//3d sound
-								static float gLoc[3];
-								gLoc[0]=viewer.x;
-								gLoc[1]=viewer.y;
-								gLoc[2]=viewer.z;
-								static float vel[3];
-								vel[0]=(viewer.x-oldviewer.x)/multiplier;
-								vel[1]=(viewer.y-oldviewer.y)/multiplier;
-								vel[2]=(viewer.z-oldviewer.z)/multiplier;
+							//3d sound
+							static float gLoc[3];
+							gLoc[0]=viewer.x;
+							gLoc[1]=viewer.y;
+							gLoc[2]=viewer.z;
+							static float vel[3];
+							vel[0]=(viewer.x-oldviewer.x)/multiplier;
+							vel[1]=(viewer.y-oldviewer.y)/multiplier;
+							vel[2]=(viewer.z-oldviewer.z)/multiplier;
 
-								//Set orientation with forward and up vectors
-								static XYZ upvector;
-								upvector=0;
-								upvector.z=-1;
+							//Set orientation with forward and up vectors
+							static XYZ upvector;
+							upvector=0;
+							upvector.z=-1;
 
-								upvector=DoRotation(upvector,-rotation2+90,0,0);
-								upvector=DoRotation(upvector,0,0-rotation,0);
+							upvector=DoRotation(upvector,-rotation2+90,0,0);
+							upvector=DoRotation(upvector,0,0-rotation,0);
 
-								facing=0;
-								facing.z=-1;
+							facing=0;
+							facing.z=-1;
 
-								facing=DoRotation(facing,-rotation2,0,0);
-								facing=DoRotation(facing,0,0-rotation,0);
+							facing=DoRotation(facing,-rotation2,0,0);
+							facing=DoRotation(facing,0,0-rotation,0);
 
 
-								static float ori[6];
-								ori[0] = -facing.x;
-								ori[1] = facing.y;
-								ori[2] = -facing.z;
-								ori[3] = -upvector.x;
-								ori[4] = upvector.y;
-								ori[5] = -upvector.z;
+							static float ori[6];
+							ori[0] = -facing.x;
+							ori[1] = facing.y;
+							ori[2] = -facing.z;
+							ori[3] = -upvector.x;
+							ori[4] = upvector.y;
+							ori[5] = -upvector.z;
 
-								OPENAL_3D_Listener_SetAttributes(&gLoc[0], &vel[0], ori[0], ori[1], ori[2], ori[3], ori[4], ori[5]);
-								OPENAL_Update();
+							OPENAL_3D_Listener_SetAttributes(&gLoc[0], &vel[0], ori[0], ori[1], ori[2], ori[3], ori[4], ori[5]);
+							OPENAL_Update();
 
-								oldviewer=viewer;
+							oldviewer=viewer;
 		}
 	}
 
@@ -7920,15 +7780,16 @@ void	Game::Tick()
 }
 
 void	Game::TickOnce(){
-	if(!mainmenu)
-		if(directing||indialogue==-1){
+	if(mainmenu)
+		rotation+=multiplier*5;
+	else
+		if(directing||indialogue==-1) {
 			rotation+=deltah*.7;
 			if(!invertmouse)rotation2+=deltav*.7;
 			if(invertmouse)rotation2-=deltav*.7;
 			if(rotation2>90)rotation2=90;
 			if(rotation2<-70)rotation2=-70;
 		}
-		if(mainmenu)rotation+=multiplier*5;
 }
 
 void	Game::TickOnceAfter(){
@@ -8016,31 +7877,17 @@ void	Game::TickOnceAfter(){
 
 		if(musictoggle){
 			if(musicvolume[0]>0&&oldmusicvolume[0]<=0){
-				PlayStreamEx( music1, strm[music1], NULL, true);
+				PlayStreamEx( music1, samp[music1], NULL, true);
 				OPENAL_SetPaused(channels[music1], false);
 			}
 			if(musicvolume[1]>0&&oldmusicvolume[1]<=0){
-				PlayStreamEx( stream_music2, strm[stream_music2], NULL, true);
+				PlayStreamEx( stream_music2, samp[stream_music2], NULL, true);
 				OPENAL_SetPaused(channels[stream_music2], false);
 			}
 			if(musicvolume[2]>0&&oldmusicvolume[2]<=0){
-				PlayStreamEx( stream_music3, strm[stream_music3], NULL, true);
+				PlayStreamEx( stream_music3, samp[stream_music3], NULL, true);
 				OPENAL_SetPaused(channels[stream_music3], false);
 			}
-		}
-
-		if(!musictoggle){
-			OPENAL_SetPaused(channels[music1], true);
-			OPENAL_SetPaused(channels[stream_music2], true);
-			OPENAL_SetPaused(channels[stream_music3], true);
-
-			for(i=0;i<4;i++){
-				oldmusicvolume[i]=0;
-				musicvolume[i]=0;
-			}
-		}
-
-		if(musictoggle){
 			if(musicvolume[0]<=0&&oldmusicvolume[0]>0){
 				OPENAL_SetPaused(channels[music1], true);
 			}
@@ -8064,283 +7911,276 @@ void	Game::TickOnceAfter(){
 			for(i=0;i<3;i++){
 				oldmusicvolume[i]=musicvolume[i];
 			}
+		} else {
+			OPENAL_SetPaused(channels[music1], true);
+			OPENAL_SetPaused(channels[stream_music2], true);
+			OPENAL_SetPaused(channels[stream_music3], true);
+
+			for(i=0;i<4;i++){
+				oldmusicvolume[i]=0;
+				musicvolume[i]=0;
+			}
 		}
 
 		killhotspot=2;
-		if(numhotspots)
-			for(i=0;i<numhotspots;i++){
-				if(hotspottype[i]>10&&hotspottype[i]<20){
-					if(player[hotspottype[i]-10].dead==0){
-						killhotspot=0;
-					}
-					else if(killhotspot==2)
-						killhotspot=1;
+		for(i=0;i<numhotspots;i++){
+			if(hotspottype[i]>10&&hotspottype[i]<20){
+				if(player[hotspottype[i]-10].dead==0){
+					killhotspot=0;
 				}
+				else if(killhotspot==2)
+					killhotspot=1;
 			}
-			if(killhotspot==2)killhotspot=0;
+		}
+		if(killhotspot==2)killhotspot=0;
 
 
-			winhotspot=0;
-			if(numhotspots)
-				for(i=0;i<numhotspots;i++){
-					if(hotspottype[i]==-1){
-						if(findDistancefast(&player[0].coords,&hotspot[i])<hotspotsize[i])
-							winhotspot=1;
-					}
-				}
+		winhotspot=0;
+		for(i=0;i<numhotspots;i++){
+			if(hotspottype[i]==-1){
+				if(findDistancefast(&player[0].coords,&hotspot[i])<hotspotsize[i])
+					winhotspot=1;
+			}
+		}
 
-				int numalarmed=0;
-				if(numplayers>1)
-					for(i=1;i<numplayers;i++){
-						if(!player[i].dead&&player[i].aitype==attacktypecutoff&&player[i].surprised<=0)numalarmed++;
-					}
-					if(numalarmed>maxalarmed)maxalarmed=numalarmed;
+		int numalarmed=0;
+		for(i=1;i<numplayers;i++){
+			if(!player[i].dead&&player[i].aitype==attacktypecutoff&&player[i].surprised<=0)numalarmed++;
+		}
+		if(numalarmed>maxalarmed)maxalarmed=numalarmed;
 
-					if(changedelay<=0&&!loading&&!editorenabled&&gameon&&!tutoriallevel&&changedelay!=-999&&!won){
-						if(player[0].dead&&changedelay<=0){
-							changedelay=1;
-							targetlevel=whichlevel;
-						}
-						alldead=1;
-						if(numplayers>1)
-							for(i=1;i<numplayers;i++){
-								if(!player[i].dead&&player[i].howactive<typedead1)alldead=0;
-							}
+		if(changedelay<=0&&!loading&&!editorenabled&&gameon&&!tutoriallevel&&changedelay!=-999&&!won){
+			if(player[0].dead&&changedelay<=0){
+				changedelay=1;
+				targetlevel=whichlevel;
+			}
+			alldead=1;
+			for(i=1;i<numplayers;i++){
+				if(!player[i].dead&&player[i].howactive<typedead1)alldead=0;
+			}
 
 
-							if(alldead&&!player[0].dead&&maptype==mapkilleveryone){
-								changedelay=1;
-								targetlevel=whichlevel+1;
-								if(targetlevel>numchallengelevels-1)targetlevel=0;
-							}
-							if(winhotspot||windialogue){
-								changedelay=0.1;
-								targetlevel=whichlevel+1;
-								if(targetlevel>numchallengelevels-1)targetlevel=0;
-							}
+			if(alldead&&!player[0].dead&&maptype==mapkilleveryone){
+				changedelay=1;
+				targetlevel=whichlevel+1;
+				if(targetlevel>numchallengelevels-1)targetlevel=0;
+			}
+			if(winhotspot||windialogue){
+				changedelay=0.1;
+				targetlevel=whichlevel+1;
+				if(targetlevel>numchallengelevels-1)targetlevel=0;
+			}
 
 
-							if(killhotspot){
-								changedelay=1;
-								targetlevel=whichlevel+1;
-								if(targetlevel>numchallengelevels-1)targetlevel=0;
-							}
+			if(killhotspot){
+				changedelay=1;
+				targetlevel=whichlevel+1;
+				if(targetlevel>numchallengelevels-1)targetlevel=0;
+			}
 
-							if(changedelay>0&&!player[0].dead&&!won){
-								//high scores, awards, win
-								if(campaign){
-									won=1;
-									accountactive->winCampaignLevel(whichchoice, bonustotal, leveltime);
-									/*accountcampaignchoices[accountactive][accountactive->getCampaignChoicesMade()]=whichchoice;
-									accountactive->getCampaignChoicesMade()++;
-									accountcampaignscore[accountactive]+=bonustotal;
-									accountcampaigntime[accountactive]+=leveltime;
-									if(accountcampaignscore[accountactive]>accountcampaignhighscore[accountactive])
-										accountcampaignhighscore[accountactive]=accountcampaignscore[accountactive];*/
-									scoreadded=1;
-								}
-								else
-								{
-									won=1;
-									accountactive->winLevel(whichlevel,bonustotal-startbonustotal,leveltime);
-								}
-							}
-					}
+			if(changedelay>0&&!player[0].dead&&!won){
+				//high scores, awards, win
+				if(campaign){
+					accountactive->winCampaignLevel(whichchoice, bonustotal, leveltime);
+					scoreadded=1;
+				}
+				else
+				{
+					accountactive->winLevel(whichlevel,bonustotal-startbonustotal,leveltime);
+				}
+				won=1;
+			}
+		}
 
-					if(!winfreeze){
+		if(!winfreeze){
 
-						if(leveltime<1){
-							loading=0;
-							changedelay=.1;
-							alldead=0;
-							winhotspot=0;
-							killhotspot=0;
-						}
+			if(leveltime<1){
+				loading=0;
+				changedelay=.1;
+				alldead=0;
+				winhotspot=0;
+				killhotspot=0;
+			}
 
-						if(!editorenabled&&gameon&&!mainmenu){
-							if(changedelay!=-999)changedelay-=multiplier/7;
-							if(player[0].dead)targetlevel=whichlevel;
-							if(loading==2&&!campaign){
-								flash();
+			if(!editorenabled&&gameon&&!mainmenu){
+				if(changedelay!=-999)changedelay-=multiplier/7;
+				if(player[0].dead)targetlevel=whichlevel;
+				if(loading==2&&!campaign){
+					flash();
 
-								fireSound(firestartsound);
+					fireSound(firestartsound);
 
-								if(!player[0].dead&&targetlevel!=whichlevel){
-									startbonustotal=bonustotal;
-								}
-								if(!player[0].dead)Loadlevel(targetlevel);
-								if(player[0].dead)Loadlevel(whichlevel);
+					if(!player[0].dead&&targetlevel!=whichlevel){
+						startbonustotal=bonustotal;
+					}
+					if(player[0].dead) Loadlevel(whichlevel);
+					else Loadlevel(targetlevel);
+
+					fireSound();
 
-								fireSound();
+					loading=3;
+				}
+				if(loading==2&&targetlevel==whichlevel){
+					flash();
+					loadtime=0;
 
-								loading=3;
-							}
-							if(loading==2&&targetlevel==whichlevel){
-								flash();
-								loadtime=0;
+					fireSound(firestartsound);
 
-								float gLoc[3]={0,0,0};
-								float vel[3]={0,0,0};
-								fireSound(firestartsound);
+					for(i=0;i<255;i++){
+						mapname[i]='\0';
+					}
+					mapname[0]=':';
+					mapname[1]='D';
+					mapname[2]='a';
+					mapname[3]='t';
+					mapname[4]='a';
+					mapname[5]=':';
+					mapname[6]='M';
+					mapname[7]='a';
+					mapname[8]='p';
+					mapname[9]='s';
+					mapname[10]=':';
+					strcat(mapname,campaignmapname[levelorder[accountactive->getCampaignChoicesMade()]]);//[campaignchoicewhich[whichchoice]]);
+					Loadlevel(mapname);
 
-								for(i=0;i<255;i++){
-									mapname[i]='\0';
-								}
-								mapname[0]=':';
-								mapname[1]='D';
-								mapname[2]='a';
-								mapname[3]='t';
-								mapname[4]='a';
-								mapname[5]=':';
-								mapname[6]='M';
-								mapname[7]='a';
-								mapname[8]='p';
-								mapname[9]='s';
-								mapname[10]=':';
-								strcat(mapname,campaignmapname[levelorder[accountactive->getCampaignChoicesMade()]]);//[campaignchoicewhich[whichchoice]]);
-								Loadlevel(mapname);
-
-								fireSound();
-
-								loading=3;
-							}
-							if(changedelay<=-999&&whichlevel!=-2&&!loading&&(player[0].dead||(alldead&&maptype==mapkilleveryone)||(winhotspot)||(killhotspot))&&!winfreeze)loading=1;
-							if((player[0].dead||(alldead&&maptype==mapkilleveryone)||(winhotspot)||(windialogue)||(killhotspot))&&changedelay<=0){
-                        {
-									if(whichlevel!=-2&&!loading&&!player[0].dead){
-										winfreeze=1;
-										changedelay=-999;
-									}
-									if(player[0].dead)loading=1;
-								}
-							}
+					fireSound();
+
+					loading=3;
+				}
+				if(changedelay<=-999&&whichlevel!=-2&&!loading&&(player[0].dead||(alldead&&maptype==mapkilleveryone)||(winhotspot)||(killhotspot))&&!winfreeze)loading=1;
+				if((player[0].dead||(alldead&&maptype==mapkilleveryone)||(winhotspot)||(windialogue)||(killhotspot))&&changedelay<=0){
+			{
+						if(whichlevel!=-2&&!loading&&!player[0].dead){
+							winfreeze=1;
+							changedelay=-999;
 						}
+						if(player[0].dead)loading=1;
+					}
+				}
+			}
 
-						if(campaign)
-							if(mainmenu==0&&winfreeze&&(campaignchoosenext[campaignchoicewhich[whichchoice]])==1){
-								if(campaignnumnext[campaignchoicewhich[whichchoice]]==0){
-									endgame=1;
-								}
-							}
-							else if(mainmenu==0&&winfreeze){
-								if(campaignchoosenext[campaignchoicewhich[whichchoice]]==2)
-									stealthloading=1;
-								else stealthloading=0;
+			if(campaign)
+				if(mainmenu==0&&winfreeze&&(campaignchoosenext[campaignchoicewhich[whichchoice]])==1){
+					if(campaignnumnext[campaignchoicewhich[whichchoice]]==0){
+						endgame=1;
+					}
+				}
+				else if(mainmenu==0&&winfreeze){
+					if(campaignchoosenext[campaignchoicewhich[whichchoice]]==2)
+						stealthloading=1;
+					else stealthloading=0;
 
-								if(!stealthloading){
-									float gLoc[3]={0,0,0};
-									float vel[3]={0,0,0};
-									fireSound(firestartsound);
+					if(!stealthloading){
+						float gLoc[3]={0,0,0};
+						float vel[3]={0,0,0};
+						fireSound(firestartsound);
 
-									flash();
-								}
+						flash();
+					}
 
-								startbonustotal=0;
-
-								ifstream ipstream(ConvertFileName(":Data:Campaigns:main.txt"));
-								ipstream.ignore(256,':');
-								ipstream >> campaignnumlevels;
-								for(i=0;i<campaignnumlevels;i++){
-									ipstream.ignore(256,':');
-									ipstream.ignore(256,':');
-									ipstream.ignore(256,' ');
-									ipstream >> campaignmapname[i];
-									ipstream.ignore(256,':');
-									ipstream >> campaigndescription[i];
-									for(j=0;j<256;j++){
-										if(campaigndescription[i][j]=='_')campaigndescription[i][j]=' ';
-									}
-									ipstream.ignore(256,':');
-									ipstream >> campaignchoosenext[i];
-									ipstream.ignore(256,':');
-									ipstream >> campaignnumnext[i];
-									if(campaignnumnext[i])
-										for(j=0;j<campaignnumnext[i];j++){
-											ipstream.ignore(256,':');
-											ipstream >> campaignnextlevel[i][j];
-											campaignnextlevel[i][j]-=1;
-										}
-										ipstream.ignore(256,':');
-										ipstream >> campaignlocationx[i];
-										ipstream.ignore(256,':');
-										ipstream >> campaignlocationy[i];
-								}
-								ipstream.close();
+					startbonustotal=0;
+
+					ifstream ipstream(ConvertFileName(":Data:Campaigns:main.txt"));
+					ipstream.ignore(256,':');
+					ipstream >> campaignnumlevels;
+					for(i=0;i<campaignnumlevels;i++){
+						ipstream.ignore(256,':');
+						ipstream.ignore(256,':');
+						ipstream.ignore(256,' ');
+						ipstream >> campaignmapname[i];
+						ipstream.ignore(256,':');
+						ipstream >> campaigndescription[i];
+						for(j=0;j<256;j++){
+							if(campaigndescription[i][j]=='_')campaigndescription[i][j]=' ';
+						}
+						ipstream.ignore(256,':');
+						ipstream >> campaignchoosenext[i];
+						ipstream.ignore(256,':');
+						ipstream >> campaignnumnext[i];
+						for(j=0;j<campaignnumnext[i];j++){
+							ipstream.ignore(256,':');
+							ipstream >> campaignnextlevel[i][j];
+							campaignnextlevel[i][j]-=1;
+						}
+						ipstream.ignore(256,':');
+						ipstream >> campaignlocationx[i];
+						ipstream.ignore(256,':');
+						ipstream >> campaignlocationy[i];
+					}
+					ipstream.close();
 
-								for(i=0;i<campaignnumlevels;i++){
-									levelvisible[i]=0;
-									levelhighlight[i]=0;
-								}
+					for(i=0;i<campaignnumlevels;i++){
+						levelvisible[i]=0;
+						levelhighlight[i]=0;
+					}
 
 
-								for(i=0;i<campaignnumlevels;i++){
-									levelvisible[i]=0;
-									levelhighlight[i]=0;
-								}
+					for(i=0;i<campaignnumlevels;i++){
+						levelvisible[i]=0;
+						levelhighlight[i]=0;
+					}
 
-								levelorder[0]=0;
-								levelvisible[0]=1;
-								if(accountactive->getCampaignChoicesMade())
-									for(i=0;i<accountactive->getCampaignChoicesMade();i++){
-										levelorder[i+1]=campaignnextlevel[levelorder[i]][accountactive->getCampaignChoice(i)];
-										levelvisible[levelorder[i+1]]=1;
-									}
-									int whichlevelstart;
-									whichlevelstart=accountactive->getCampaignChoicesMade()-1;
-									if(whichlevelstart<0){
-										campaignchoicenum=1;
-										campaignchoicewhich[0]=0;
-									}
-									else
-									{
-										campaignchoicenum=campaignnumnext[levelorder[whichlevelstart]];
-										if(campaignchoicenum)
-											for(i=0;i<campaignchoicenum;i++){
-												campaignchoicewhich[i]=campaignnextlevel[levelorder[whichlevelstart]][i];
-												levelvisible[campaignnextlevel[levelorder[whichlevelstart]][i]]=1;
-												levelhighlight[campaignnextlevel[levelorder[whichlevelstart]][i]]=1;
-											}
-									}
+					levelorder[0]=0;
+					levelvisible[0]=1;
+					for(i=0;i<accountactive->getCampaignChoicesMade();i++){
+						levelorder[i+1]=campaignnextlevel[levelorder[i]][accountactive->getCampaignChoice(i)];
+						levelvisible[levelorder[i+1]]=1;
+					}
+					int whichlevelstart;
+					whichlevelstart=accountactive->getCampaignChoicesMade()-1;
+					if(whichlevelstart<0){
+						campaignchoicenum=1;
+						campaignchoicewhich[0]=0;
+					}
+					else
+					{
+						campaignchoicenum=campaignnumnext[levelorder[whichlevelstart]];
+						for(i=0;i<campaignchoicenum;i++){
+							campaignchoicewhich[i]=campaignnextlevel[levelorder[whichlevelstart]][i];
+							levelvisible[campaignnextlevel[levelorder[whichlevelstart]][i]]=1;
+							levelhighlight[campaignnextlevel[levelorder[whichlevelstart]][i]]=1;
+						}
+					}
 
-									loading=2;
-									loadtime=0;
-									targetlevel=7;
-									//if(firstload)TickOnceAfter();
-									if(!firstload)LoadStuff();
-									//else {
-									for(i=0;i<255;i++){
-										mapname[i]='\0';
-									}
-									mapname[0]=':';
-									mapname[1]='D';
-									mapname[2]='a';
-									mapname[3]='t';
-									mapname[4]='a';
-									mapname[5]=':';
-									mapname[6]='M';
-									mapname[7]='a';
-									mapname[8]='p';
-									mapname[9]='s';
-									mapname[10]=':';
-
-									strcat(mapname,campaignmapname[campaignchoicewhich[0]]);
-									whichchoice=0;
-									visibleloading=1;
-									stillloading=1;
-									Loadlevel(mapname);
-									campaign=1;
-									mainmenu=0;
-									gameon=1;
-									OPENAL_SetPaused(channels[stream_music3], true);
-
-									stealthloading=0;
-							}
+					loading=2;
+					loadtime=0;
+					targetlevel=7;
+					//if(firstload)TickOnceAfter();
+					if(!firstload)LoadStuff();
+					//else {
+					for(i=0;i<255;i++){
+						mapname[i]='\0';
+					}
+					mapname[0]=':';
+					mapname[1]='D';
+					mapname[2]='a';
+					mapname[3]='t';
+					mapname[4]='a';
+					mapname[5]=':';
+					mapname[6]='M';
+					mapname[7]='a';
+					mapname[8]='p';
+					mapname[9]='s';
+					mapname[10]=':';
+
+					strcat(mapname,campaignmapname[campaignchoicewhich[0]]);
+					whichchoice=0;
+					visibleloading=1;
+					stillloading=1;
+					Loadlevel(mapname);
+					campaign=1;
+					mainmenu=0;
+					gameon=1;
+					OPENAL_SetPaused(channels[stream_music3], true);
 
-							if(loading==3)loading=0;
+					stealthloading=0;
+				}
 
-					}
+				if(loading==3)loading=0;
+
+			}
 
-					oldmusictype=musictype;
+			oldmusictype=musictype;
 	}
 
 	facing=0;