X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=3115b4396611e592018e1fa3d51f763e8b09a1e6;hb=cd46cab54acd39ff8c02b204844f1ce53fd2edbc;hp=8138608f19f01a8c7e85a23631300f4138587ed4;hpb=346d9e2d119ea3fa236905d5db018479f54c225f;p=lugaru.git

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 8138608..3115b43 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -46,7 +46,7 @@ extern XYZ viewer;
 extern int environment;
 extern float texscale;
 extern Terrain terrain;
-extern OPENAL_SAMPLE	*samp[100];
+extern OPENAL_SAMPLE *samp[100];
 extern int channels[100];
 extern Sprites sprites;
 extern int kTextureSize;
@@ -168,16 +168,6 @@ extern int currenthotspot;
 extern int kBitsPerPixel;
 extern int hostile;
 
-extern int numaccounts;
-extern int accountactive;
-extern int accountdifficulty[10];
-extern int accountprogress[10];
-extern float accountpoints[10];
-extern float accounthighscore[10][50];
-extern float accountfasttime[10][50];
-extern bool accountunlocked[10][60];
-extern char accountname[10][256];
-
 extern bool stillloading;
 extern bool winfreeze;
 
@@ -224,14 +214,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",
@@ -333,142 +315,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);
 
@@ -555,9 +526,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;
@@ -829,23 +798,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)
@@ -1014,9 +981,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;
@@ -1195,8 +1160,6 @@ static void cmd_dispatch(Game *game, const char *cmd)
     }
 }
 
-
-
 /********************> Tick() <*****/
 extern void ScreenShot(const char * fname);
 void Screenshot	(void)
@@ -1212,192 +1175,7 @@ void Screenshot	(void)
 	mkdir("Screenshots", S_IRWXU);
 	#endif
 
-	ScreenShot(temp/*"Screenshots\\Screenshot.png"*/);
-
-	/*FSSpec				MAC_file;
-	GraphicsExportComponent	QT_exporter;
-	OSErr				MAC_error_code;
-	CGrafPtr			MAC_currentPort;
-	GDHandle			MAC_currentDevice;
-	unsigned char*		MAC_pixels;
-	Rect				MAC_picture_rectangle;
-	GWorldPtr			MAC_offscreen_graphics_port;
-
-	static int numscreenshots=0;
-
-	// Make an FSSpec
-	static char buf[256];
-	if(numscreenshots==0){
-	buf[0]=26;
-	buf[1]=':';
-	buf[2]='S';
-	buf[3]='c';
-	buf[4]='r';
-	buf[5]='e';
-	buf[6]='e';
-	buf[7]='n';
-	buf[8]='s';
-	buf[9]='h';
-	buf[10]='o';
-	buf[11]='t';
-	buf[12]='s';
-	buf[13]=':';
-	buf[14]='S';
-	buf[15]='c';
-	buf[16]='r';
-	buf[17]='e';
-	buf[18]='e';
-	buf[19]='n';
-	buf[20]='s';
-	buf[21]='h';
-	buf[22]='o';
-	buf[23]='t';
-	buf[24]='0';
-	buf[25]='0';
-	buf[26]='0';
-	}
-
-	FInfo *fndrInfo;
-	FSMakeFSSpec(0, 0, (unsigned char*)buf, &MAC_file);
-	while(!FSpGetFInfo (&MAC_file, fndrInfo)){
-	FSMakeFSSpec(0, 0, (unsigned char*)buf, &MAC_file);
-	if(!FSpGetFInfo (&MAC_file, fndrInfo)){
-	numscreenshots++;
-	buf[26]++;
-	if(buf[26]==':'){
-	buf[26]='0';
-	buf[25]++;
-	if(buf[25]==':'){
-	buf[25]='0';
-	buf[24]++;
-	if(buf[24]==':'){
-	buf[24]='9';
-	buf[25]='9';
-	buf[26]='9';
-	}
-	}
-	}
-	}
-	}
-
-
-	// Get the GWorld
-	GWorldPtr			MAC_gWorld = (CGrafPtr) FrontWindow();
-	//assert(MAC_gWorld != NULL);
-
-	// Allocate memory for loading image
-	MAC_pixels = new unsigned char[(int)(screenheight * screenwidth * 4)];
-	if (MAC_pixels == NULL) {
-	//UTIL_Error("Could not create Texture data.");
-	return;
-	}
-
-	// Get GWorld
-	::GetGWorld(&MAC_currentPort, &MAC_currentDevice);
-
-	// Make a picture Rectangle
-	MAC_picture_rectangle.left = 0;
-	MAC_picture_rectangle.right = screenwidth;
-	MAC_picture_rectangle.top = 0;
-	MAC_picture_rectangle.bottom = screenheight;
-
-	// Create new offscreen GWorld
-	MAC_error_code = ::QTNewGWorldFromPtr (&MAC_offscreen_graphics_port, k32ARGBPixelFormat, &MAC_picture_rectangle, NULL, NULL, 0, (char *) MAC_pixels, screenwidth * 4);
-	if (MAC_error_code)	{
-	::SetGWorld(MAC_currentPort, MAC_currentDevice);
-	delete MAC_pixels;
-	//UTIL_Error("Could not create offscreen GWorld. ");
-	return;
-
-	}
-
-	// Copy OpenGL Context to new GWorld
-	glReadBuffer(GL_FRONT);
-	glReadPixels(0,0,screenwidth,screenheight,GL_RGBA,GL_UNSIGNED_BYTE,MAC_pixels);
-
-	// Swizzle texture
-	for (unsigned long byte = 0; byte < screenheight * screenwidth * 4; byte+=4) {
-	unsigned char temp = MAC_pixels[byte+0];
-	MAC_pixels[byte+0] = MAC_pixels[byte+3];
-	MAC_pixels[byte+3] = MAC_pixels[byte+2];
-	MAC_pixels[byte+2] = MAC_pixels[byte+1];
-	MAC_pixels[byte+1] = temp;
-	}
-
-	// Flip the image  :(   This could probably be optimized
-	int vert;
-	int src_index;
-	int dst_index;
-	unsigned char temp;
-	for (int horz = 0; horz < screenwidth; ++horz)
-	for (vert = 0; vert < screenheight / 2; ++vert) {
-	src_index = (screenwidth * vert + horz) * 4;
-	dst_index = (screenwidth * (screenheight - vert - 1) + horz) * 4;
-
-	temp=MAC_pixels[src_index+0];
-	MAC_pixels[src_index+0]=MAC_pixels[dst_index+0];
-	MAC_pixels[dst_index+0]=temp;
-
-	temp=MAC_pixels[src_index+1];
-	MAC_pixels[src_index+1]=MAC_pixels[dst_index+1];
-	MAC_pixels[dst_index+1]=temp;
-
-	temp=MAC_pixels[src_index+2];
-	MAC_pixels[src_index+2]=MAC_pixels[dst_index+2];
-	MAC_pixels[dst_index+2]=temp;
-
-	temp=MAC_pixels[src_index+3];
-	MAC_pixels[src_index+3]=MAC_pixels[dst_index+3];
-	MAC_pixels[dst_index+3]=temp;
-	}
-
-
-
-	// Export the Gworld
-	MAC_error_code =  OpenADefaultComponent(GraphicsExporterComponentType, kQTFileTypeBMP, &QT_exporter);
-	if (MAC_error_code) {
-	//UTIL_Warning("Unable to export screenshot.");
-	::SetGWorld(MAC_currentPort, MAC_currentDevice);
-	::DisposeGWorld(MAC_offscreen_graphics_port);
-	delete MAC_pixels;
-	return;
-	}
-
-	MAC_error_code =  GraphicsExportSetInputGWorld(QT_exporter,MAC_offscreen_graphics_port);
-	if (MAC_error_code) {
-	::CloseComponent(QT_exporter);
-	::SetGWorld(MAC_currentPort, MAC_currentDevice);
-	::DisposeGWorld(MAC_offscreen_graphics_port);
-	delete MAC_pixels;
-	//UTIL_Warning("Unable to export screenshot.");
-	return;
-	}
-
-	MAC_error_code = GraphicsExportSetOutputFile(QT_exporter,&MAC_file);
-	if (MAC_error_code) {
-	::CloseComponent(QT_exporter);
-	::SetGWorld(MAC_currentPort, MAC_currentDevice);
-	::DisposeGWorld(MAC_offscreen_graphics_port);
-	delete MAC_pixels;
-	//UTIL_Warning("Unable to export screenshot.");
-	return;
-	}
-
-	MAC_error_code = GraphicsExportDoExport(QT_exporter,NULL);
-	if (MAC_error_code) {
-	::CloseComponent(QT_exporter);
-	::SetGWorld(MAC_currentPort, MAC_currentDevice);
-	::DisposeGWorld(MAC_offscreen_graphics_port);
-	delete MAC_pixels;
-	//UTIL_Warning("Unable to export screenshot.");
-	return;
-	}
-
-	::CloseComponent(QT_exporter);
-	::SetGWorld(MAC_currentPort, MAC_currentDevice);
-	::DisposeGWorld(MAC_offscreen_graphics_port);
-
-	delete MAC_pixels;*/
+	ScreenShot(temp);
 }
 
 
@@ -1888,7 +1666,7 @@ void	Game::Loadlevel(char *name){
 		damagedealt=0;
 		damagetaken=0;
 
-		if(accountactive!=-1)difficulty=accountdifficulty[accountactive];
+		if(accountactive)difficulty=accountactive->getDifficulty();
 
 		if(difficulty!=2)minimap=1;
 		else minimap=0;
@@ -2532,12 +2310,7 @@ void	Game::Loadlevel(char *name){
 			weapons.position[i]=-1000;
 			weapons.tippoint[i]=-1000;
 		}
-
-/*		for(i=0;i<32;i++){
-			//if(i<16||i>20)
-			OPENAL_StopSound(i);
-		}
-*/
+		
 		LOG("Starting background music...");
 
 		OPENAL_StopSound(OPENAL_ALL);
@@ -2577,17 +2350,6 @@ void	Game::Loadlevel(char *name){
 		oldmusicvolume[2]=0;
 		oldmusicvolume[3]=0;
 
-
-		/*LoadTexture(":Data:Textures:cloud.png",&sprites.cloudtexture,1,1);
-		LoadTexture(":Data:Textures:cloudimpact.png",&sprites.cloudimpacttexture,1,1);
-		LoadTexture(":Data:Textures:bloodparticle.png",&sprites.bloodtexture,1,1);
-		LoadTexture(":Data:Textures:snowflake.png",&sprites.snowflaketexture,1,1);
-		LoadTexture(":Data:Textures:flame.png",&sprites.flametexture,1,1);
-		LoadTexture(":Data:Textures:bloodflame.png",&sprites.bloodflametexture,1,1);
-		LoadTexture(":Data:Textures:smoke.png",&sprites.smoketexture,1,1);
-		LoadTexture(":Data:Textures:shine.png",&sprites.shinetexture,1,0);
-		*/
-
 		if(!firstload)
 		{
 			firstload=1;
@@ -2682,94 +2444,7 @@ void	Game::Tick()
 				if(mainmenu==0&&!winfreeze)mainmenu=2;
 				else if(mainmenu==0&&winfreeze&&(campaignchoosenext[campaignchoicewhich[whichchoice]])==1)mainmenu=100;
 				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};
-					OPENAL_Sample_SetMinMaxDistance(samp[firestartsound], 9999.0f, 99999.0f);
-					PlaySoundEx( firestartsound, samp[firestartsound], NULL, true);
-					OPENAL_3D_SetAttributes(channels[firestartsound], gLoc, vel);
-					OPENAL_SetVolume(channels[firestartsound], 256);
-					OPENAL_SetPaused(channels[firestartsound], false);
-					OPENAL_Sample_SetMinMaxDistance(samp[firestartsound], 8.0f, 2000.0f);
-
-					flashr=1;
-					flashg=0;
-					flashb=0;
-					flashamount=1;
-					flashdelay=1;
-					}
-
-					startbonustotal=0;
-
-					for(i=0;i<campaignnumlevels;i++){
-					levelvisible[i]=0;
-					levelhighlight[i]=0;
-					}
-
-					levelorder[0]=0;
-					levelvisible[0]=1;
-					if(accountcampaignchoicesmade[accountactive])
-					for(i=0;i<accountcampaignchoicesmade[accountactive];i++){
-					levelorder[i+1]=campaignnextlevel[levelorder[i]][accountcampaignchoices[accountactive][i]];
-					levelvisible[levelorder[i+1]]=1;
-					}
-					int whichlevelstart;
-					whichlevelstart=accountcampaignchoicesmade[accountactive]-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;
-					}
-					}
-
-					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]=':';
-
-					//accountcampaignchoices[accountactive][accountcampaignchoicesmade[accountactive]]=whichchoice;
-					//accountcampaignchoicesmade[accountactive]++;
-
-
-					strcat(mapname,campaignmapname[campaignchoicewhich[0]]);
-					whichchoice=0;
-					visibleloading=1;
-					stillloading=1;
-					Loadlevel(mapname);
-					campaign=1;
-					mainmenu=0;
-					gameon=1;
-					OPENAL_SetPaused(channels[music3], true);
-
-					stealthloading=0;*/
+					
 				}
 				else if(mainmenu==1||mainmenu==2)mainmenu=0;
 				if(mainmenu&&musictoggle){
@@ -2843,23 +2518,23 @@ void	Game::Tick()
 			}
 			mainmenutogglekeydown=1;
 		}
-		if(!IsKeyDown(theKeyMap, MAC_ESCAPE_KEY)){
+		if(!Input::isKeyDown(SDLK_ESCAPE)){
 			mainmenutogglekeydown=0;
 		}
 	}
 
 	/*static bool minimaptogglekeydown;
-	if(IsKeyDown(theKeyMap, MAC_TAB_KEY)&&!minimaptogglekeydown){
+	if(Input::isKeyDown(SDLK_TAB)&&!minimaptogglekeydown){
 	minimap=1-minimap;
 	minimaptogglekeydown=1;
 	}
-	if(!IsKeyDown(theKeyMap, MAC_TAB_KEY)){
+	if(!Input::isKeyDown(SDLK_TAB)){
 	minimaptogglekeydown=0;
 	}
 	*/
 
 	static bool minimaptogglekeydown;
-	if(IsKeyDown(theKeyMap, MAC_TAB_KEY)&&!minimaptogglekeydown&&tutoriallevel){
+	if(Input::isKeyDown(SDLK_TAB)&&!minimaptogglekeydown&&tutoriallevel){
 		if(tutorialstage!=51)
 			tutorialstagetime=tutorialmaxtime;
 		PlaySoundEx( consolefailsound, samp[consolefailsound], NULL, true);
@@ -2867,46 +2542,26 @@ void	Game::Tick()
 		OPENAL_SetPaused(channels[consolefailsound], false);
 		minimaptogglekeydown=1;
 	}
-	if(!IsKeyDown(theKeyMap, MAC_TAB_KEY)){
+	if(!Input::isKeyDown(SDLK_TAB)){
 		minimaptogglekeydown=0;
 	}
 
 	if(mainmenu){
 		//menu buttons
 		if(mainmenu==1||mainmenu==2){
-			if(Button()&&!oldbutton&&selected==1){
+			if(Input::Button()&&!oldbutton&&selected==1){
 				if(!gameon){
-					float gLoc[3]={0,0,0};
-					float vel[3]={0,0,0};
-					OPENAL_Sample_SetMinMaxDistance(samp[firestartsound], 9999.0f, 99999.0f);
-					PlaySoundEx( firestartsound, samp[firestartsound], NULL, true);
-					OPENAL_3D_SetAttributes(channels[firestartsound], gLoc, vel);
-					OPENAL_SetVolume(channels[firestartsound], 256);
-					OPENAL_SetPaused(channels[firestartsound], false);
-					OPENAL_Sample_SetMinMaxDistance(samp[firestartsound], 8.0f, 2000.0f);
-
-					flashr=1;
-					flashg=0;
-					flashb=0;
-					flashamount=1;
-					flashdelay=1;
+					fireSound(firestartsound);
+
+					flash();
 
 					//new game
-					if(accountactive!=-1)mainmenu=5;
-					else mainmenu=7;
-					/*
-					startbonustotal=0;
-
-					loading=2;
-					loadtime=0;
-					if(firstload)TickOnceAfter();
-					if(!firstload)LoadStuff();
-					else {
-					Loadlevel(0);
+					if(accountactive) {
+						mainmenu=5;
+					} else {
+						mainmenu=7;
 					}
-					mainmenu=0;
-					gameon=1;
-					OPENAL_SetPaused(channels[music3], true);	*/
+					selected=-1;
 				}
 				else
 				{
@@ -2917,21 +2572,10 @@ void	Game::Tick()
 				}
 			}
 
-			if(Button()&&!oldbutton&&selected==2){
-				float gLoc[3]={0,0,0};
-				float vel[3]={0,0,0};
-				OPENAL_Sample_SetMinMaxDistance(samp[firestartsound], 9999.0f, 99999.0f);
-				PlaySoundEx( firestartsound, samp[firestartsound], NULL, true);
-				OPENAL_3D_SetAttributes(channels[firestartsound], gLoc, vel);
-				OPENAL_SetVolume(channels[firestartsound], 256);
-				OPENAL_SetPaused(channels[firestartsound], false);
-				OPENAL_Sample_SetMinMaxDistance(samp[firestartsound], 8.0f, 2000.0f);
+			if(Input::Button()&&!oldbutton&&selected==2){
+				fireSound();
 
-				flashr=1;
-				flashg=0;
-				flashb=0;
-				flashamount=1;
-				flashdelay=1;
+				flash();
 
 				//options
 
@@ -2945,21 +2589,10 @@ void	Game::Tick()
 				if(newscreenheight<0)newscreenheight=screenheight;
 			}
 
-			if(Button()&&!oldbutton&&selected==3){
-				float gLoc[3]={0,0,0};
-				float vel[3]={0,0,0};
-				OPENAL_Sample_SetMinMaxDistance(samp[fireendsound], 9999.0f, 99999.0f);
-				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);
+			if(Input::Button()&&!oldbutton&&selected==3){
+				fireSound();
 
-				flashr=1;
-				flashg=0;
-				flashb=0;
-				flashamount=1;
-				flashdelay=1;
+				flash();
 
 				if(!gameon){
 					//quit
@@ -2972,22 +2605,12 @@ void	Game::Tick()
 					mainmenu=1;
 				}
 			}
-			if(Button())oldbutton=1;
-			else oldbutton=0;
 		}
-
 		if(mainmenu==3){
-			if(Button()&&!oldbutton&&selected!=-1){
-				float gLoc[3]={0,0,0};
-				float vel[3]={0,0,0};
-				OPENAL_Sample_SetMinMaxDistance(samp[firestartsound], 9999.0f, 99999.0f);
-				PlaySoundEx( firestartsound, samp[firestartsound], NULL, true);
-				OPENAL_3D_SetAttributes(channels[firestartsound], gLoc, vel);
-				OPENAL_SetVolume(channels[firestartsound], 256);
-				OPENAL_SetPaused(channels[firestartsound], false);
-				OPENAL_Sample_SetMinMaxDistance(samp[firestartsound], 8.0f, 2000.0f);
+			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;
@@ -3231,9 +2854,7 @@ void	Game::Tick()
 		if(mainmenu==5){
 
 			if(endgame==2){
-				accountcampaignchoicesmade[accountactive]=0;
-				accountcampaignscore[accountactive]=0;
-				accountcampaigntime[accountactive]=0;
+				accountactive->endGame();
 				endgame=0;
 			}
 
@@ -3289,9 +2910,8 @@ void	Game::Tick()
 				loading=2;
 				loadtime=0;
 				targetlevel=7;
-				if(firstload)TickOnceAfter();
-				if(!firstload)LoadStuff();
-				//else {
+				if(firstload) TickOnceAfter();
+				else LoadStuff();
 				for(i=0;i<255;i++){
 					mapname[i]='\0';
 				}
@@ -3306,13 +2926,12 @@ void	Game::Tick()
 				mapname[8]='p';
 				mapname[9]='s';
 				mapname[10]=':';
-				strcat(mapname,campaignmapname[campaignchoicewhich[selected-7-accountcampaignchoicesmade[accountactive]]]);
-				whichchoice=selected-7-accountcampaignchoicesmade[accountactive];
+				strcat(mapname,campaignmapname[campaignchoicewhich[selected-7-accountactive->getCampaignChoicesMade()]]);
+				whichchoice=selected-7-accountactive->getCampaignChoicesMade();
 				visibleloading=1;
 				stillloading=1;
 				Loadlevel(mapname);
 				//Loadlevel(campaignmapname[levelorder[selected-7]]);
-				//}
 				campaign=1;
 				mainmenu=0;
 				gameon=1;
@@ -3470,11 +3089,11 @@ void	Game::Tick()
 				loading=2;
 				loadtime=0;
 				targetlevel=selected;
-				if(firstload)TickOnceAfter();
-				if(!firstload)LoadStuff();
-				else {
+				if(firstload) {
+					TickOnceAfter();
 					Loadlevel(selected);
-				}
+				} else
+					LoadStuff();
 				campaign=0;
 
 				mainmenu=0;
@@ -3527,156 +3146,59 @@ void	Game::Tick()
 		}
 
 		if(mainmenu==6){
-			if(Button()&&!oldbutton&&selected!=-1){
-				float gLoc[3]={0,0,0};
-				float vel[3]={0,0,0};
-				OPENAL_Sample_SetMinMaxDistance(samp[firestartsound], 9999.0f, 99999.0f);
-				PlaySoundEx( firestartsound, samp[firestartsound], NULL, true);
-				OPENAL_3D_SetAttributes(channels[firestartsound], gLoc, vel);
-				OPENAL_SetVolume(channels[firestartsound], 256);
-				OPENAL_SetPaused(channels[firestartsound], false);
-				OPENAL_Sample_SetMinMaxDistance(samp[firestartsound], 8.0f, 2000.0f);
-			}
-			if(Button()&&!oldbutton&&selected==1){
-				float gLoc[3]={0,0,0};
-				float vel[3]={0,0,0};
-				OPENAL_Sample_SetMinMaxDistance(samp[fireendsound], 9999.0f, 99999.0f);
-				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);
-
-				flashr=1;
-				flashg=0;
-				flashb=0;
-				flashamount=1;
-				flashdelay=1;
-
-				for(i=accountactive;i<numaccounts-1;i++){
-					accountdifficulty[i]=accountdifficulty[i+1];
-					accountcampaignchoicesmade[i]=accountcampaignchoicesmade[i+1];
-					for(j=0;j<accountcampaignchoicesmade[i+1];j++){
-						accountcampaignchoices[i][j]=accountcampaignchoices[i+1][j];
-					}
-					accountpoints[i]=accountpoints[i+1];
-					for(j=0;j<50;j++){
-						accounthighscore[i][j]=accounthighscore[i+1][j];
-						accountfasttime[i][j]=accountfasttime[i+1][j];
-					}
-					for(j=0;j<60;j++){
-						accountunlocked[i][j]=accountunlocked[i+1][j];
+			if(Input::Button()&&!oldbutton) {
+				if(selected>-1){
+					fireSound();
+					if(selected==1) {
+						flash();
+						accountactive = Account::destroy(accountactive);
+						mainmenu=7;
+					} else if(selected==2) {
+						flash();
+						mainmenu=5;
 					}
-					for(j=0;j<256;j++){
-						accountname[i][j]=accountname[i+1][j];
-					}
-					accountcampaignhighscore[i]=accountcampaignhighscore[i+1];
-					accountprogress[i]=accountprogress[i+1];
-					accountcampaignfasttime[i]=accountcampaignfasttime[i+1];
-					accountcampaignscore[i]=accountcampaignscore[i+1];
-					accountcampaigntime[i]=accountcampaigntime[i+1];
 				}
-
-				numaccounts--;
-				accountactive=-1;
-
-
-				mainmenu=7;
-			}
-			if(Button()&&!oldbutton&&selected==2){
-				float gLoc[3]={0,0,0};
-				float vel[3]={0,0,0};
-				OPENAL_Sample_SetMinMaxDistance(samp[fireendsound], 9999.0f, 99999.0f);
-				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);
-
-				flashr=1;
-				flashg=0;
-				flashb=0;
-				flashamount=1;
-				flashdelay=1;
-
-				mainmenu=5;
 			}
 			if(Button())oldbutton=1;
 			else oldbutton=0;
 		}
 		if(mainmenu==7){
-			if(Button()&&!oldbutton&&selected!=-1){
-				float gLoc[3]={0,0,0};
-				float vel[3]={0,0,0};
-				OPENAL_Sample_SetMinMaxDistance(samp[firestartsound], 9999.0f, 99999.0f);
-				PlaySoundEx( firestartsound, samp[firestartsound], NULL, true);
-				OPENAL_3D_SetAttributes(channels[firestartsound], gLoc, vel);
-				OPENAL_SetVolume(channels[firestartsound], 256);
-				OPENAL_SetPaused(channels[firestartsound], false);
-				OPENAL_Sample_SetMinMaxDistance(samp[firestartsound], 8.0f, 2000.0f);
-			}
-			if(Button()&&!oldbutton&&selected==0&&numaccounts<8){
-				entername=1;
-			}
-			if(Button()&&!oldbutton&&selected>0&&selected<numaccounts+1){
-				accountactive=selected-1;
-				mainmenu=5;
-				flashr=1;
-				flashg=0;
-				flashb=0;
-				flashamount=1;
-				flashdelay=1;
-			}
-			if(Button()&&!oldbutton&&selected==numaccounts+1){
-				float gLoc[3]={0,0,0};
-				float vel[3]={0,0,0};
-				OPENAL_Sample_SetMinMaxDistance(samp[fireendsound], 9999.0f, 99999.0f);
-				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);
-
-				flashr=1;
-				flashg=0;
-				flashb=0;
-				flashamount=1;
-				flashdelay=1;
-
-				mainmenu=1;
-
-				for(j=0;j<255;j++){
-					displaytext[0][j]=' ';
+			if(Input::Button()&&!oldbutton) {
+				if(selected!=-1){
+					fireSound();
+					if(selected==0&&Account::getNbAccounts()<8){
+						entername=1;
+					} else if (selected<Account::getNbAccounts()+1) {
+						accountactive=Account::get(selected-1);
+						mainmenu=5;
+						flash();
+					} else if (selected==Account::getNbAccounts()+1) {
+						flash();
+
+						mainmenu=1;
+
+						for(j=0;j<255;j++){
+							displaytext[0][j]=' ';
+						}
+						displaychars[0]=0;
+						displayselected=0;
+						entername=0;
+					}
 				}
-				displaychars[0]=0;
-				displayselected=0;
-				entername=0;
 			}
 			if(Button())oldbutton=1;
 			else oldbutton=0;
 		}
 		if(mainmenu==8){
-			if(Button()&&!oldbutton&&selected!=-1){
-				float gLoc[3]={0,0,0};
-				float vel[3]={0,0,0};
-				OPENAL_Sample_SetMinMaxDistance(samp[firestartsound], 9999.0f, 99999.0f);
-				PlaySoundEx( firestartsound, samp[firestartsound], NULL, true);
-				OPENAL_3D_SetAttributes(channels[firestartsound], gLoc, vel);
-				OPENAL_SetVolume(channels[firestartsound], 256);
-				OPENAL_SetPaused(channels[firestartsound], false);
-				OPENAL_Sample_SetMinMaxDistance(samp[firestartsound], 8.0f, 2000.0f);
+			if(Input::Button()&&!oldbutton&&selected>-1){
+				fireSound();
 
-				if(selected==0)accountdifficulty[accountactive]=0;
-				if(selected==1)accountdifficulty[accountactive]=1;
-				if(selected==2)accountdifficulty[accountactive]=2;
+				if(selected<=2)
+					accountactive->setDifficulty(selected);
 
 				mainmenu=5;
 
-				flashr=1;
-				flashg=0;
-				flashb=0;
-				flashamount=1;
-				flashdelay=1;
+				flash();
 
 			}
 			if(Button())oldbutton=1;
@@ -4266,44 +3788,31 @@ void	Game::Tick()
 						}
 						if(tutorialstage==1){
 							tutorialmaxtime=5;
-						}
-						if(tutorialstage==2){
+						} else if(tutorialstage==2){
 							tutorialmaxtime=2;
-						}
-						if(tutorialstage==3){
+						} else if(tutorialstage==3){
 							tutorialmaxtime=600;
-						}
-						if(tutorialstage==4){
+						} else if(tutorialstage==4){
 							tutorialmaxtime=1000;
-						}
-						if(tutorialstage==5){
+						} else if(tutorialstage==5){
 							tutorialmaxtime=600;
-						}
-						if(tutorialstage==6){
+						} else if(tutorialstage==6){
 							tutorialmaxtime=600;
-						}
-						if(tutorialstage==7){
+						} else if(tutorialstage==7){
 							tutorialmaxtime=600;
-						}
-						if(tutorialstage==8){
+						} else if(tutorialstage==8){
 							tutorialmaxtime=600;
-						}
-						if(tutorialstage==9){
+						} else if(tutorialstage==9){
 							tutorialmaxtime=600;
-						}
-						if(tutorialstage==10){
+						} else if(tutorialstage==10){
 							tutorialmaxtime=2;
-						}
-						if(tutorialstage==11){
+						} else if(tutorialstage==11){
 							tutorialmaxtime=1000;
-						}
-						if(tutorialstage==12){
+						} else if(tutorialstage==12){
 							tutorialmaxtime=1000;
-						}
-						if(tutorialstage==13){
+						} else if(tutorialstage==13){
 							tutorialmaxtime=2;
-						}
-						if(tutorialstage==14){
+						} else if(tutorialstage==14){
 							tutorialmaxtime=3;
 
 							XYZ temp,temp2;
@@ -4340,107 +3849,82 @@ void	Game::Tick()
 								}
 							}
 
-						}
-						if(tutorialstage==15){
+						} else if(tutorialstage==15){
 							tutorialmaxtime=500;
-						}
-						if(tutorialstage==16){
+						} else if(tutorialstage==16){
 							tutorialmaxtime=500;
-						}
-						if(tutorialstage==17){
+						} else if(tutorialstage==17){
 							tutorialmaxtime=500;
-						}
-						if(tutorialstage==18){
+						} else if(tutorialstage==18){
 							tutorialmaxtime=500;
-						}
-						if(tutorialstage==19){
+						} else if(tutorialstage==19){
 							tutorialstage=20;
 							//tutorialmaxtime=500;
-						}
-						if(tutorialstage==20){
+						} else if(tutorialstage==20){
 							tutorialmaxtime=500;
-						}
-						if(tutorialstage==21){
+						} else if(tutorialstage==21){
 							tutorialmaxtime=500;
 							if(bonus==cannon){
 								bonus=Slicebonus;
 								againbonus=1;
 							}
 							else againbonus=0;
-						}
-						if(tutorialstage==22){
+						} else if(tutorialstage==22){
 							tutorialmaxtime=500;
-						}
-						if(tutorialstage==23){
+						} else if(tutorialstage==23){
 							tutorialmaxtime=500;
-						}
-						if(tutorialstage==24){
+						} else if(tutorialstage==24){
 							tutorialmaxtime=500;
-						}
-						if(tutorialstage==25){
+						} else if(tutorialstage==25){
 							tutorialmaxtime=500;
-						}
-						if(tutorialstage==26){
+						} else if(tutorialstage==26){
 							tutorialmaxtime=2;
-						}
-						if(tutorialstage==27){
+						} else if(tutorialstage==27){
 							tutorialmaxtime=4;
 							reversaltrain=1;
 							cananger=1;
 							player[1].aitype=attacktypecutoff;
-						}
-						if(tutorialstage==28){
+						} else if(tutorialstage==28){
 							tutorialmaxtime=400;
-						}
-						if(tutorialstage==29){
+						} else if(tutorialstage==29){
 							tutorialmaxtime=400;
 							player[0].escapednum=0;
-						}
-						if(tutorialstage==30){
+						} else if(tutorialstage==30){
 							tutorialmaxtime=4;
 							reversaltrain=0;
 							cananger=0;
 							player[1].aitype=passivetype;
-						}
-						if(tutorialstage==31){
+						} else if(tutorialstage==31){
 							tutorialmaxtime=13;
-						}
-						if(tutorialstage==32){
+						} else if(tutorialstage==32){
 							tutorialmaxtime=8;
-						}
-						if(tutorialstage==33){
+						} else if(tutorialstage==33){
 							tutorialmaxtime=400;
 							cananger=1;
 							canattack=1;
 							player[1].aitype=attacktypecutoff;
-						}
-						if(tutorialstage==34){
+						} else if(tutorialstage==34){
 							tutorialmaxtime=400;
-						}
-						if(tutorialstage==35){
+						} else if(tutorialstage==35){
 							tutorialmaxtime=400;
-						}
-						if(tutorialstage==36){
+						} else if(tutorialstage==36){
 							tutorialmaxtime=2;
 							reversaltrain=0;
 							cananger=0;
 							player[1].aitype=passivetype;
-						}
-						if(tutorialstage==37){
+						} else if(tutorialstage==37){
 							damagedealt=0;
 							damagetaken=0;
 							tutorialmaxtime=50;
 							cananger=1;
 							canattack=1;
 							player[1].aitype=attacktypecutoff;
-						}
-						if(tutorialstage==38){
+						} else if(tutorialstage==38){
 							tutorialmaxtime=4;
 							canattack=0;
 							cananger=0;
 							player[1].aitype=passivetype;
-						}
-						if(tutorialstage==39){
+						} else if(tutorialstage==39){
 							XYZ temp,temp2;
 
 							temp.x=1011;
@@ -4469,20 +3953,15 @@ void	Game::Tick()
 							weapons.physics[weapons.numweapons]=1;
 
 							weapons.numweapons++;
-						}
-						if(tutorialstage==40){
+						} else if(tutorialstage==40){
 							tutorialmaxtime=300;
-						}
-						if(tutorialstage==41){
+						} else if(tutorialstage==41){
 							tutorialmaxtime=300;
-						}
-						if(tutorialstage==42){
+						} else if(tutorialstage==42){
 							tutorialmaxtime=8;
-						}
-						if(tutorialstage==43){
+						} else if(tutorialstage==43){
 							tutorialmaxtime=300;
-						}
-						if(tutorialstage==44){
+						} else if(tutorialstage==44){
 							weapons.owner[0]=1;
 							player[0].weaponactive=-1;
 							player[0].num_weapons=0;
@@ -4495,8 +3974,7 @@ void	Game::Tick()
 							player[1].aitype=attacktypecutoff;
 
 							tutorialmaxtime=300;
-						}
-						if(tutorialstage==45){
+						} else if(tutorialstage==45){
 							weapons.owner[0]=1;
 							player[0].weaponactive=-1;
 							player[0].num_weapons=0;
@@ -4505,8 +3983,7 @@ void	Game::Tick()
 							player[1].weaponids[0]=0;
 
 							tutorialmaxtime=300;
-						}
-						if(tutorialstage==46){
+						} else if(tutorialstage==46){
 							weapons.owner[0]=1;
 							player[0].weaponactive=-1;
 							player[0].num_weapons=0;
@@ -4517,9 +3994,7 @@ void	Game::Tick()
 							weapons.type[0]=sword;
 
 							tutorialmaxtime=300;
-						}
-
-						if(tutorialstage==47){
+						} else if(tutorialstage==47){
 							tutorialmaxtime=10;
 
 							XYZ temp,temp2;
@@ -4558,8 +4033,7 @@ void	Game::Tick()
 							player[1].weaponids[0]=0;
 
 							weapons.numweapons++;
-						}
-						if(tutorialstage==48){
+						} else if(tutorialstage==48){
 							canattack=0;
 							cananger=0;
 							player[1].aitype=passivetype;
@@ -4579,8 +4053,7 @@ void	Game::Tick()
 							else weapons.type[0]=staff;
 
 							weapons.numweapons++;
-						}
-						if(tutorialstage==49){
+						} else if(tutorialstage==49){
 							canattack=0;
 							cananger=0;
 							player[1].aitype=passivetype;
@@ -4601,8 +4074,7 @@ void	Game::Tick()
 							weapons.type[0]=knife;
 
 							weapons.numweapons++;
-						}
-						if(tutorialstage==50){
+						} else if(tutorialstage==50){
 							tutorialmaxtime=8;
 
 							XYZ temp,temp2;
@@ -4643,8 +4115,7 @@ void	Game::Tick()
 							weapons.freetime[0]=0;
 							weapons.firstfree[0]=1;
 							weapons.physics[0]=1;
-						}
-						if(tutorialstage==51){
+						} else if(tutorialstage==51){
 							tutorialmaxtime=80000;
 						}
 						if(tutorialstage<=51)tutorialstagetime=0;
@@ -5501,115 +4972,6 @@ void	Game::Tick()
 
 						static float keyrefreshdelay=0,bigrefreshdelay=0;
 
-						//Net updates
-
-						/*keyrefreshdelay-=multiplier;
-						bigrefreshdelay-=multiplier;
-
-						if(keyrefreshdelay<=0){
-						static int concat[4];
-
-						concat[0]=player[0].forwardkeydown;
-						concat[0]=concat[0]*2+player[0].forwardstogglekeydown;
-						concat[0]=concat[0]*2+player[0].rightkeydown;
-						concat[0]=concat[0]*2+player[0].leftkeydown;
-						concat[0]=concat[0]*2+player[0].backkeydown;
-						concat[0]=concat[0]*2+player[0].jumpkeydown;
-						concat[0]=concat[0]*2+player[0].jumptogglekeydown;
-						concat[0]=concat[0]*2+player[0].crouchkeydown;
-
-						concat[1]=player[0].crouchtogglekeydown;
-						concat[1]=concat[1]*2+player[0].drawkeydown;
-						concat[1]=concat[1]*2+player[0].drawtogglekeydown;
-						concat[1]=concat[1]*2+player[0].throwkeydown;
-						concat[1]=concat[1]*2+player[0].throwtogglekeydown;
-						concat[1]=concat[1]*2+player[0].attackkeydown;
-
-						//concat[2]=(char)((int)(rotation/2)%180);
-
-						//concat[3]=(char)((int)(rotation2/2)%180);
-
-						chatname[0]=concat[0]-128;
-						chatname[1]=concat[1]-128;
-						//chatname[2]=concat[2]-128;
-						//chatname[3]=concat[3]-128;
-						int temppoint=2;
-						memcpy(chatname+temppoint,&rotation,sizeof(float));
-						temppoint+=sizeof(float);
-						memcpy(chatname+temppoint,&rotation2,sizeof(float));
-						temppoint+=sizeof(float);
-
-						chatname[temppoint]='\0';
-
-						//if(!ishost)NetworkSendPlayerMessage( chatname, kMessageType_Keys );
-						//if(ishost)NetworkSendPlayerRelayMessage( chatname, kMessageType_Keys );
-						//keyrefreshdelay=.01;
-						keyrefreshdelay=.03;
-						}
-
-						if(bigrefreshdelay<=0){
-						for(i=0;i<1;i++){
-						/*int temppoint=0;
-						memcpy(chatname+temppoint,&i,sizeof(int));
-						temppoint+=sizeof(int);
-						memcpy(chatname+temppoint,&player[i].coords.x,sizeof(float));
-						temppoint+=sizeof(float);
-						memcpy(chatname+temppoint,&player[i].coords.y,sizeof(float));
-						temppoint+=sizeof(float);
-						memcpy(chatname+temppoint,&player[i].coords.z,sizeof(float));
-						temppoint+=sizeof(float);
-						memcpy(chatname+temppoint,&player[i].damage,sizeof(float));
-						temppoint+=sizeof(float);
-						memcpy(chatname+temppoint,&player[i].target,sizeof(float));
-						temppoint+=sizeof(float);
-						memcpy(chatname+temppoint,&player[i].targetanimation,sizeof(int));
-						temppoint+=sizeof(int);
-						memcpy(chatname+temppoint,&player[i].currentanimation,sizeof(int));
-						temppoint+=sizeof(int);
-						memcpy(chatname+temppoint,&player[i].velocity.x,sizeof(float));
-						temppoint+=sizeof(float);
-						memcpy(chatname+temppoint,&player[i].velocity.y,sizeof(float));
-						temppoint+=sizeof(float);
-						memcpy(chatname+temppoint,&player[i].velocity.z,sizeof(float));
-						temppoint+=sizeof(float);
-						memcpy(chatname+temppoint,&player[i].targetframe,sizeof(int));
-						temppoint+=sizeof(int);
-						memcpy(chatname+temppoint,&player[i].currentframe,sizeof(int));
-						temppoint+=sizeof(int);
-						memcpy(chatname+temppoint,&player[i].rotation,sizeof(float));
-						temppoint+=sizeof(float);
-						memcpy(chatname+temppoint,&player[i].targetrotation,sizeof(float));
-						temppoint+=sizeof(float);
-						memcpy(chatname+temppoint,&player[i].bloodloss,sizeof(float));
-						temppoint+=sizeof(float);
-						memcpy(chatname+temppoint,&player[i].weaponactive,sizeof(int));
-						temppoint+=sizeof(int);
-						memcpy(chatname+temppoint,&player[i].num_weapons,sizeof(int));
-						temppoint+=sizeof(int);
-						memcpy(chatname+temppoint,&player[i].weaponids[0],sizeof(int));
-						temppoint+=sizeof(int);
-						memcpy(chatname+temppoint,&player[i].weaponids[1],sizeof(int));
-						temppoint+=sizeof(int);
-						memcpy(chatname+temppoint,&player[i].weaponids[2],sizeof(int));
-						temppoint+=sizeof(int);
-						memcpy(chatname+temppoint,&player[i].weaponids[3],sizeof(int));
-						temppoint+=sizeof(int);
-						chatname[temppoint]='\0';
-
-						sprintf (chatname, "%d %f %f %f %f %f %d %d %f %f %f %d %d %f %f %f",i,player[i].coords.x,player[i].coords.y,player[i].coords.z,player[i].damage,player[i].target, player[i].targetanimation, player[i].currentanimation, player[i].velocity.x, player[i].velocity.y, player[i].velocity.z, player[i].targetframe, player[i].currentframe, player[i].rotation, player[i].targetrotation);
-						//if(ishost)NetworkSendPlayerRelayMessage( chatname, kMessageType_PlayerState );
-						//else NetworkSendPlayerMessage( chatname, kMessageType_PlayerState );
-
-						sprintf (chatname, "%d %f %d %d %d %d %d %d %d %d %f",i,player[i].bloodloss, player[i].weaponactive, player[i].num_weapons, player[i].weaponids[0], player[i].weaponids[1], player[i].weaponids[2], player[i].weaponids[3],player[i].dead,player[i].skeleton.free,player[i].permanentdamage);
-
-						//if(ishost)NetworkSendPlayerRelayMessage( chatname, kMessageType_PlayerStateMisc );
-						//else NetworkSendPlayerMessage( chatname, kMessageType_PlayerStateMisc );
-						}
-						//bigrefreshdelay=.02;
-						bigrefreshdelay=.1;
-						}
-						}*/
-
 						if(!player[0].jumpkeydown){
 							player[0].jumptogglekeydown=0;
 						}
@@ -5701,16 +5063,6 @@ void	Game::Tick()
 									weapons.length[player[0].weaponids[0]]=.25;
 								}
 							}
-
-							/*for(i=0;i<objects.numobjects;i++){
-							if(objects.type[i]==treeleavestype){
-							for(j=0;j<objects.numobjects;j++){
-							if(objects.type[j]==treetrunktype)
-							if(findDistancefast(&objects.position[i],&objects.position[j])<.5)
-							objects.scale[i]=objects.scale[j];
-							}
-							}
-							}*/
 							detailtogglekeydown=1;
 						}
 
@@ -6106,59 +5458,6 @@ void	Game::Tick()
 							explodetogglekeydown=0;
 						}
 
-						/*
-						if(IsKeyDown(theKeyMap, MAC_S_KEY)&&IsKeyDown(theKeyMap, MAC_COMMAND_KEY)&&!slomotogglekeydown){
-						FILE			*tfile;
-						//tfile=fopen( ":Data:Maps:mapsave", "wb" );
-						if(whichlevel==0)tfile=fopen( ":Data:Maps:map1", "wb" );
-						else if(whichlevel==1)tfile=fopen( ":Data:Maps:map2", "wb" );
-						else if(whichlevel==2)tfile=fopen( ":Data:Maps:map3", "wb" );
-						else if(whichlevel==3)tfile=fopen( ":Data:Maps:map4", "wb" );
-						else if(whichlevel==4)tfile=fopen( ":Data:Maps:map5", "wb" );
-						else tfile=fopen( ":Data:Maps:mapsave", "wb" );
-
-						fwrite( &player[0].coords, 1, sizeof(XYZ), tfile );
-						fwrite( &player[0].rotation, 1, sizeof(float), tfile );
-						fwrite( &player[0].targetrotation, 1, sizeof(float), tfile );
-						fwrite( &player[0].num_weapons, 1, sizeof(int), tfile );
-						for(j=0;j<player[0].num_weapons;j++){
-						fwrite( &weapons.type[player[0].weaponids[j]], 1, sizeof(int), tfile );
-						}
-						fwrite( &environment, 1, sizeof(int), tfile );
-
-						fwrite( &objects.numobjects, 1, sizeof(int), tfile );
-						fwrite( &objects.type, 1, sizeof(int)*objects.numobjects, tfile );
-						fwrite( &objects.rotation, 1, sizeof(float)*objects.numobjects, tfile );
-						fwrite( &objects.position, 1, sizeof(XYZ)*objects.numobjects, tfile );
-						fwrite( &objects.scale, 1, sizeof(float)*objects.numobjects, tfile );
-
-						fwrite( &numplayers, 1, sizeof(int), tfile );
-						if(numplayers>1&&numplayers<maxplayers)
-						for(i=1;i<numplayers;i++){
-						fwrite( &player[i].coords, 1, sizeof(XYZ), tfile );
-						fwrite( &player[i].num_weapons, 1, sizeof(int), tfile );
-						for(j=0;j<player[i].num_weapons;j++){
-						fwrite( &weapons.type[player[i].weaponids[j]], 1, sizeof(int), tfile );
-						}
-						if(player[i].numwaypoints<30){
-						fwrite( &player[i].numwaypoints, 1, sizeof(int), tfile );
-						fwrite( &player[i].waypoints, 1, sizeof(XYZ)*player[i].numwaypoints, tfile );
-						fwrite( &player[i].waypoint, 1, sizeof(int), tfile );
-						//fwrite( &player[i].jumppath, 1, sizeof(bool), tfile );
-						}
-						else{
-						player[i].numwaypoints=0;
-						player[i].waypoint=0;
-						fwrite( &player[i].numwaypoints, 1, sizeof(int), tfile );
-						fwrite( &player[i].waypoint, 1, sizeof(int), tfile );
-						fwrite( &player[i].waypoint, 1, sizeof(int), tfile );
-						}
-						}
-
-						fclose(tfile);
-
-						slomotogglekeydown=1;
-						}*/
 
 						if(!IsKeyDown(theKeyMap, MAC_B_KEY)&&!IsKeyDown(theKeyMap, MAC_F_KEY)&&!IsKeyDown(theKeyMap, MAC_K_KEY)&&!IsKeyDown(theKeyMap, MAC_S_KEY)){
 							slomotogglekeydown=0;
@@ -6187,11 +5486,6 @@ void	Game::Tick()
 							}
 							slomotogglekeydown=1;
 						}
-						/*
-						if(IsKeyDown(theKeyMap, MAC_L_KEY)){
-						if(player[0].bleeding<=0)
-						player[0].DoBlood(1,255);
-						}*/
 
 
 						if(IsKeyDown(theKeyMap, MAC_DELETE_KEY)&&editorenabled&&!drawmodetogglekeydown&&IsKeyDown(theKeyMap, MAC_SHIFT_KEY)){
@@ -6453,7 +5747,8 @@ void	Game::Tick()
 						}
 						if(IsKeyDown(theKeyMap, MAC_COMMA_KEY)&&!IsKeyDown(theKeyMap, MAC_SHIFT_KEY)&&!drawmodetogglekeydown&&editorenabled){
 							pathpointselected--;
-							if(pathpointselected<=-2)pathpointselected=numpathpoints-1;
+							if(pathpointselected<=-2)
+								pathpointselected=numpathpoints-1;
 							drawmodetogglekeydown=1;
 						}
 						if(IsKeyDown(theKeyMap, MAC_COMMA_KEY)&&IsKeyDown(theKeyMap, MAC_SHIFT_KEY)&&!drawmodetogglekeydown&&editorenabled){
@@ -6484,19 +5779,14 @@ void	Game::Tick()
 							editorenabled=1-editorenabled;
 							if(editorenabled){
 								player[0].damagetolerance=100000;
-								player[0].damage=0;
-								player[0].superpermanentdamage=0;
-								player[0].bloodloss=0;
-								player[0].deathbleeding=0;
-							}
-							if(!editorenabled){
+							} else {
 								player[0].damagetolerance=200;
-								player[0].damage=0;
-								player[0].permanentdamage=0;
-								player[0].superpermanentdamage=0;
-								player[0].bloodloss=0;
-								player[0].deathbleeding=0;
 							}
+							player[0].damage=0; // these lines were in both if and else, but I think they would better fit in the if
+							player[0].permanentdamage=0;
+							player[0].superpermanentdamage=0;
+							player[0].bloodloss=0;
+							player[0].deathbleeding=0;
 							drawmodetogglekeydown=1;
 						}
 
@@ -6544,23 +5834,6 @@ void	Game::Tick()
 						if(IsKeyDown(theKeyMap, MAC_ARROW_RIGHT_KEY)&&!drawmodetogglekeydown&&editorenabled&&IsKeyDown(theKeyMap, MAC_SHIFT_KEY)&&IsKeyDown(theKeyMap, MAC_CONTROL_KEY)){
 							mapradius+=multiplier*10;
 						}
-						/*
-						if(IsKeyDown(theKeyMap, MAC_ARROW_LEFT_KEY)&&editorenabled&&!IsKeyDown(theKeyMap, MAC_SHIFT_KEY)&&IsKeyDown(theKeyMap, MAC_CONTROL_KEY)){
-						mapcenter.x+=multiplier*20;
-						}
-
-						if(IsKeyDown(theKeyMap, MAC_ARROW_RIGHT_KEY)&&editorenabled&&!IsKeyDown(theKeyMap, MAC_SHIFT_KEY)&&IsKeyDown(theKeyMap, MAC_CONTROL_KEY)){
-						mapcenter.x-=multiplier*20;
-						}
-
-						if(IsKeyDown(theKeyMap, MAC_ARROW_UP_KEY)&&editorenabled&&IsKeyDown(theKeyMap, MAC_CONTROL_KEY)){
-						mapcenter.z+=multiplier*20;
-						}
-
-						if(IsKeyDown(theKeyMap, MAC_ARROW_DOWN_KEY)&&editorenabled&&IsKeyDown(theKeyMap, MAC_CONTROL_KEY)){
-						mapcenter.z-=multiplier*20;
-						}
-						*/
 						if(IsKeyDown(theKeyMap, MAC_ARROW_UP_KEY)&&editorenabled&&IsKeyDown(theKeyMap, MAC_CONTROL_KEY)){
 							editorrotation2+=multiplier*100;
 						}
@@ -7222,76 +6495,6 @@ void	Game::Tick()
 
 
 							//pile
-							/*
-							XYZ tempdiff;
-							XYZ tempoldpos;
-							XYZ temp1,temp2;
-							bool isgood;
-							static float checkdelay;
-							checkdelay-=multiplier;
-							int m;
-							static bool checkedcoll[maxplayers][maxplayers];
-							static bool above[maxplayers];
-
-							for(i=0;i<maxplayers;i++){
-							for(j=0;j<maxplayers;j++){
-							checkedcoll[i][j]=0;
-							}
-							}
-
-							if(numplayers>1&&checkdelay<=0){
-							checkdelay=.015;
-							for(k=0;k<numplayers;k++){
-							if(player[k].skeleton.free!=2)above[k]=-1;
-
-							for(i=k;i<numplayers;i++){
-							if(i==k)i++;
-							if(i<numplayers)
-							if(!checkedcoll[i][k]){
-							checkedcoll[i][k]=1;
-							checkedcoll[k][i]=1;
-							if(player[i].skeleton.free&&player[k].skeleton.free)
-							if(player[i].skeleton.free!=2||player[k].skeleton.free!=2)
-							if(i!=k&&player[i].whichpatchx==player[k].whichpatchx&&player[i].whichpatchz==player[k].whichpatchz)
-							if(player[i].coords.y>player[k].coords.y-3)
-							if(player[i].coords.y<player[k].coords.y+3)
-							if(player[i].coords.x>player[k].coords.x-3)
-							if(player[i].coords.x<player[k].coords.x+3)
-							if(player[i].coords.z>player[k].coords.z-3)
-							if(player[i].coords.z<player[k].coords.z+3)
-							if(findDistancefast(&player[i].coords,&player[k].coords)<3*((player[i].scale+player[k].scale)*2.5)*((player[i].scale+player[k].scale)*2.5)){
-							int stuck,moving;
-							if((player[i].skeleton.longdead>player[k].skeleton.longdead&&player[k].skeleton.free!=2)||player[i].skeleton.free==2){
-							stuck=i;
-							moving=k;
-							}
-							else
-							{
-							moving=i;
-							stuck=k;
-							}
-							isgood=1;
-
-							if(isgood){
-							above[moving]=stuck;
-							for(l=0;l<player[moving].skeleton.num_joints;l++){
-							for(m=0;m<player[stuck].skeleton.num_joints;m++){
-							while(findDistancefast(player[moving].skeleton.joints[l].position+player[moving].coords,player[stuck].skeleton.joints[m].position+player[stuck].coords)<.25)
-							{
-							player[moving].skeleton.joints[l].position.y+=.003;
-							if(player[moving].skeleton.joints[l].velocity.y<-.05)player[moving].skeleton.joints[l].velocity.y+=.003/.015/2;
-
-							}
-							}
-							}
-							}
-							}
-							}
-							}
-							}
-							}
-
-							*/
 
 							if(!IsKeyDown(theKeyMap, MAC_N_KEY)){
 								texturesizetogglekeydown=0;
@@ -7324,34 +6527,9 @@ void	Game::Tick()
 								leveltime=5;
 								slomotogglekeydown=1;
 							}
-
-							/*
-							if(IsKeyDown(theKeyMap, MAC_Z_KEY)){
-							//Respawn
-							OPENAL_SetPaused(channels[whooshsound], true);
-							changedelay=0;
-							for(k=0;k<numplayers;k++){
-							player[k].dead=0;
-							player[k].damage=0;
-							player[k].permanentdamage=0;
-							if(player[k].skeleton.free==2)player[k].skeleton.free=1;
-							player[k].aitype=passivetype;
-							}
-							player[0].aitype=playercontrolled;
-							}
-							*/
-
 							static bool movekey;
 							static bool connected;
-							/*player[0].forwardkeydown=IsKeyDown(theKeyMap, MAC_W_KEY);
-							player[0].leftkeydown=IsKeyDown(theKeyMap, MAC_A_KEY);
-							player[0].backkeydown=IsKeyDown(theKeyMap, MAC_S_KEY);
-							player[0].rightkeydown=IsKeyDown(theKeyMap, MAC_D_KEY);
-							player[0].jumpkeydown=IsKeyDown(theKeyMap, MAC_SPACE_KEY);
-							player[0].crouchkeydown=IsKeyDown(theKeyMap, MAC_SHIFT_KEY);*/
-
-							//if(!player[0].crouchkeydown)player[0].crouchkeydown=IsKeyDown(theKeyMap, MAC_CONTROL_KEY);
-
+							
 		for(int i=0;i<numplayers;i++){
 								if(!player[i].skeleton.free){
 									oldtargetrotation=player[i].targetrotation;
@@ -8198,21 +7376,9 @@ void	Game::Tick()
 																player[i].throwkeydown=0;
 
 																if(player[i].avoidcollided>.8&&!player[i].jumpkeydown&&player[i].collided<.8)player[i].targetrotation+=90*(player[i].whichdirection*2-1);
-																/*for(j=0;j<numplayers;j++){
-																if(player[j].victim->id==i&&(player[j].targetanimation==spinkickanim&&player[j].targetframe<3)){
-																player[i].crouchkeydown=1;
-																}
-																}*/
 																if(Random()%2==0/*||player[0].weaponactive!=-1*/||player[i].weaponactive!=-1||player[i].creature==wolftype)player[i].attackkeydown=1;
 																else player[i].attackkeydown=0;
 																if((player[i].isRun())&&Random()%6&&findDistancefast(&player[i].coords,&player[0].coords)>7)player[i].attackkeydown=0;
-																//if(player[i].attackkeydown&&findDistancefast(&player[i].coords,&player[0].coords)<3&&player[i].targetanimation!=runanim&&!player[0].skeleton.free)player[i].crouchkeydown=1;
-																/*if(player[0].targetanimation==rabbitkickanim&&!player[0].skeleton.free){
-																player[i].attackkeydown=0;
-																if(player[i].isIdle())player[i].crouchkeydown=1;
-																player[i].forwardkeydown=0;
-																player[i].aiupdatedelay=.02;
-																}*/
 
 																if(player[i].aitype!=playercontrolled&&(player[i].isIdle()||player[i].isCrouch()||player[i].isRun())){
 																	target=-2;
@@ -9050,42 +8216,7 @@ void	Game::Tick()
 							}
 
 							objects.DoStuff();
-							/*
-							player[0].righthandmorphstart=0;
-							player[0].righthandmorphend=1;
-							player[0].lefthandmorphstart=0;
-							player[0].lefthandmorphend=1;
-							player[0].headmorphstart=0;
-							player[0].headmorphend=2;*/
-
-							/*
-							if(IsKeyDown( theKeyMap, MAC_P_KEY )){
-							if(player[0].righthandmorphend!=1)player[0].righthandmorphness=0;
-							player[0].righthandmorphend=1;
-							player[0].targetrighthandmorphness=1;
-
-							if(player[0].lefthandmorphend!=0)player[0].lefthandmorphness=0;
-							player[0].lefthandmorphend=0;
-							player[0].targetlefthandmorphness=1;
-
-							if(player[0].headmorphend!=2)player[0].headmorphness=0;
-							player[0].headmorphend=2;
-							player[0].targetheadmorphness=1;
-							}
-							if(IsKeyDown( theKeyMap, MAC_L_KEY )){
-							if(player[0].righthandmorphend!=0)player[0].righthandmorphness=0;
-							player[0].righthandmorphend=0;
-							player[0].targetrighthandmorphness=1;
-
-							if(player[0].lefthandmorphend!=1)player[0].lefthandmorphness=0;
-							player[0].lefthandmorphend=1;
-							player[0].targetlefthandmorphness=1;
-
-							if(player[0].headmorphend!=0)player[0].headmorphness=0;
-							player[0].headmorphend=0;
-							player[0].targetheadmorphness=1;
-							}
-							*/
+							
 							if(numenvsounds!=0)
 								for(j=numenvsounds-1;j>=0;j--){
 									envsoundlife[j]-=multiplier;
@@ -9252,7 +8383,6 @@ void	Game::Tick()
 }
 
 void	Game::TickOnce(){
-	//if(!console){
 	if(!mainmenu)
 		if(directing||indialogue==-1){
 			rotation+=deltah*.7;
@@ -9262,8 +8392,6 @@ void	Game::TickOnce(){
 			if(rotation2<-70)rotation2=-70;
 		}
 		if(mainmenu)rotation+=multiplier*5;
-      
-		//}
 }
 
 void	Game::TickOnceAfter(){
@@ -9341,14 +8469,6 @@ void	Game::TickOnceAfter(){
 		else musicvolume[1]-=multiplier*450;
 		if(musicselected==stream_music3)musicvolume[2]+=multiplier*450;
 		else musicvolume[2]-=multiplier*450;
-		/*
-		if(musicselected==music1)musicvolume[0]+=multiplier*100;
-		else musicvolume[0]-=multiplier*450;
-		if(musicselected==music2)musicvolume[1]+=multiplier*150;
-		else if(player[0].dead)musicvolume[1]-=multiplier*450;
-		else musicvolume[1]-=multiplier*100;
-		if(musicselected==music3)musicvolume[2]+=multiplier*450;
-		else musicvolume[2]-=multiplier*450;*/
 
 		for(i=0;i<3;i++){
 			if(musicvolume[i]<0)musicvolume[i]=0;
@@ -9473,24 +8593,19 @@ void	Game::TickOnceAfter(){
 								//high scores, awards, win
 								if(campaign){
 									won=1;
-									accountcampaignchoices[accountactive][accountcampaignchoicesmade[accountactive]]=whichchoice;
-									accountcampaignchoicesmade[accountactive]++;
+									accountactive->winCampaignLevel(whichchoice, bonustotal, leveltime);
+									/*accountcampaignchoices[accountactive][accountactive->getCampaignChoicesMade()]=whichchoice;
+									accountactive->getCampaignChoicesMade()++;
 									accountcampaignscore[accountactive]+=bonustotal;
-									scoreadded=1;
 									accountcampaigntime[accountactive]+=leveltime;
-									if(accountcampaignscore[accountactive]>accountcampaignhighscore[accountactive])accountcampaignhighscore[accountactive]=accountcampaignscore[accountactive];
-
-									//if(accountprogress[accountactive]<whichlevel+1)accountprogress[accountactive]=whichlevel+1;
+									if(accountcampaignscore[accountactive]>accountcampaignhighscore[accountactive])
+										accountcampaignhighscore[accountactive]=accountcampaignscore[accountactive];*/
+									scoreadded=1;
 								}
 								else
 								{
 									won=1;
-									if(!debugmode){
-										if(bonustotal-startbonustotal>accounthighscore[accountactive][whichlevel])accounthighscore[accountactive][whichlevel]=bonustotal-startbonustotal;
-										if(accountfasttime[accountactive][whichlevel]==0||leveltime<accountfasttime[accountactive][whichlevel])accountfasttime[accountactive][whichlevel]=leveltime;
-									}
-									if(accountprogress[accountactive]<whichlevel+1)accountprogress[accountactive]=whichlevel+1;
-
+									accountactive->winLevel(whichlevel,bonustotal-startbonustotal,leveltime);
 								}
 							}
 					}
@@ -9571,7 +8686,7 @@ void	Game::TickOnceAfter(){
 								mapname[8]='p';
 								mapname[9]='s';
 								mapname[10]=':';
-								strcat(mapname,campaignmapname[levelorder[accountcampaignchoicesmade[accountactive]]]);//[campaignchoicewhich[whichchoice]]);
+								strcat(mapname,campaignmapname[levelorder[accountactive->getCampaignChoicesMade()]]);//[campaignchoicewhich[whichchoice]]);
 								Loadlevel(mapname);
 
 								OPENAL_Sample_SetMinMaxDistance(samp[fireendsound], 9999.0f, 99999.0f);
@@ -9626,8 +8741,6 @@ void	Game::TickOnceAfter(){
 								startbonustotal=0;
 
 								ifstream ipstream(ConvertFileName(":Data:Campaigns:main.txt"));
-								//campaignnumlevels=0;
-								//accountcampaignchoicesmade[accountactive]=0;
 								ipstream.ignore(256,':');
 								ipstream >> campaignnumlevels;
 								for(i=0;i<campaignnumlevels;i++){
@@ -9670,13 +8783,13 @@ void	Game::TickOnceAfter(){
 
 								levelorder[0]=0;
 								levelvisible[0]=1;
-								if(accountcampaignchoicesmade[accountactive])
-									for(i=0;i<accountcampaignchoicesmade[accountactive];i++){
-										levelorder[i+1]=campaignnextlevel[levelorder[i]][accountcampaignchoices[accountactive][i]];
+								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=accountcampaignchoicesmade[accountactive]-1;
+									whichlevelstart=accountactive->getCampaignChoicesMade()-1;
 									if(whichlevelstart<0){
 										campaignchoicenum=1;
 										campaignchoicewhich[0]=0;
@@ -9713,10 +8826,6 @@ void	Game::TickOnceAfter(){
 									mapname[9]='s';
 									mapname[10]=':';
 
-									//accountcampaignchoices[accountactive][accountcampaignchoicesmade[accountactive]]=whichchoice;
-									//accountcampaignchoicesmade[accountactive]++;
-
-
 									strcat(mapname,campaignmapname[campaignchoicewhich[0]]);
 									whichchoice=0;
 									visibleloading=1;