From ffc4398aa7e8536f0ba73600490bb3ce4c12ac42 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Sat, 21 Jul 2012 01:34:29 +0000
Subject: [PATCH] - Added a 90 degree offset to all voxels, since Build's
 compass directions start at north   rather than east.

SVN r3774 (trunk)
---
 src/g_shared/a_morph.cpp | 12 ++++++------
 src/r_data/voxels.cpp    |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/g_shared/a_morph.cpp b/src/g_shared/a_morph.cpp
index a027afcc5..862baa30b 100644
--- a/src/g_shared/a_morph.cpp
+++ b/src/g_shared/a_morph.cpp
@@ -47,12 +47,12 @@ bool P_MorphPlayer (player_t *activator, player_t *p, const PClass *spawntype, i
 	}
 	if (p->morphTics)
 	{ // Player is already a beast
-		if ((p->mo->GetClass() == spawntype)
-			&& (p->mo->PlayerFlags & PPF_CANSUPERMORPH)
-			&& (p->morphTics < (((duration) ? duration : MORPHTICS) - TICRATE))
-			&& (p->mo->FindInventory (RUNTIME_CLASS(APowerWeaponLevel2), true) == NULL))
-		{ // Make a super chicken
-			p->mo->GiveInventoryType (RUNTIME_CLASS(APowerWeaponLevel2));
+		if ((p->mo->GetClass() == spawntype)
+			&& (p->mo->PlayerFlags & PPF_CANSUPERMORPH)
+			&& (p->morphTics < (((duration) ? duration : MORPHTICS) - TICRATE))
+			&& (p->mo->FindInventory (RUNTIME_CLASS(APowerWeaponLevel2), true) == NULL))
+		{ // Make a super chicken
+			p->mo->GiveInventoryType (RUNTIME_CLASS(APowerWeaponLevel2));
 		}
 		return false;
 	}
diff --git a/src/r_data/voxels.cpp b/src/r_data/voxels.cpp
index 50705c5cc..eca4c89c4 100644
--- a/src/r_data/voxels.cpp
+++ b/src/r_data/voxels.cpp
@@ -71,7 +71,7 @@ TDeletingArray<FVoxelDef *> VoxelDefs;
 struct VoxelOptions
 {
 	VoxelOptions()
-	: DroppedSpin(0), PlacedSpin(0), Scale(FRACUNIT), AngleOffset(0)
+	: DroppedSpin(0), PlacedSpin(0), Scale(FRACUNIT), AngleOffset(ANGLE_90)
 	{}
 
 	int			DroppedSpin;
@@ -332,7 +332,7 @@ FVoxelDef *R_LoadVoxelDef(int lumpnum, int spin)
 		voxdef->Voxel = vox;
 		voxdef->Scale = FRACUNIT;
 		voxdef->DroppedSpin = voxdef->PlacedSpin = spin;
-		voxdef->AngleOffset = 0;
+		voxdef->AngleOffset = ANGLE_90;
 
 		Voxels.Push(vox);
 		VoxelDefs.Push(voxdef);
@@ -508,7 +508,7 @@ static void VOX_ReadOptions(FScanner &sc, VoxelOptions &opts)
 			{
 				sc.TokenMustBe(TK_FloatConst);
 			}
-			opts.AngleOffset = angle_t(sc.Float * ANGLE_180 / 180.0);
+			opts.AngleOffset = ANGLE_90 + angle_t(sc.Float * ANGLE_180 / 180.0);
 		}
 		else
 		{