Small fixes.

src/jj2level/jj2levelload.cpp

@@ -527,6 +527,8 @@ int JJ2Level::load (char *fileName, unsigned char diff, bool checkpoint) {
 		pitch = createInt(aBuffer + 8403 + 80 + (count << 2));
 		height = createInt(aBuffer + 8403 + 112 + (count << 2));
 
+		if (pitch & 3) pitch += 4;
+
 		if (aBuffer[8403 + 40 + count]) {
 
 			layers[count] = new JJ2Layer(width, height, flags);

src/main.cpp

@@ -68,7 +68,7 @@ int loadMain (int argc, char *argv[]) {
 
 	File* file;
 	unsigned char* pixels;
-	int count, x, y;
+	int count;
 	int screenW, screenH;
 	int scaleFactor;
 #ifndef FULLSCREEN_ONLY

src/player/jj2levelplayer.cpp

@@ -473,7 +473,7 @@ bool JJ2LevelPlayer::touchEvent (JJ2Event* touched, unsigned int ticks, int msps
 
 		case 85: // Red spring
 
-			throwY = y - TTOF(7);
+			throwY = y - TTOF(8);
 			dx = 0;
 			event = LPE_SPRING;
 

src/player/jj2levelplayerframe.cpp

@@ -405,7 +405,7 @@ void JJ2LevelPlayer::control (unsigned int ticks, int msps) {
 
 	// If there is an obstacle above and the player is not floating up, stop
 	// rising
-	if (jj2Level->checkMaskUp(x + PXO_MID, y + PYO_TOP - F4) && (throwY < y) && (event != LPE_FLOAT)) {
+	if (jj2Level->checkMaskUp(x + PXO_MID, y + PYO_TOP - F1) && (throwY < y) && (event != LPE_FLOAT)) {
 
 		throwY = TTOF(256);
 		if (dy < 0) dy = 0;