Various small changes.

src/level/event/eventframe.cpp

@@ -984,8 +984,6 @@ void Event::draw (unsigned int ticks, int change) {
 	// Decide on the frame to draw
 	anim->setFrame(frame + gridX + gridY, true);
 
-	if (ticks < flashTime) anim->flashPalette(0);
-
 
 	// Correct the position without altering the animation
 	if (noAnimOffset) {
@@ -1031,6 +1029,8 @@ void Event::draw (unsigned int ticks, int change) {
 
 		// In case an event can be drawn normally
 
+		if (ticks < flashTime) anim->flashPalette(0);
+
 		anim->draw(changeX, changeY);
 
 	}

src/menu/gamemenu.cpp

@@ -232,9 +232,10 @@ int GameMenu::newGameDifficulty (GameModeType mode, int levelNum, int worldNum)
 }
 
 
-int GameMenu::newGameLevel (GameModeType mode) {
+int GameMenu::loadGame () {
+
+	// TODO: Actual loading of saved games
 
-/*
 	int option, worldNum, levelNum;
 
 	worldNum = levelNum = option = 0;
@@ -286,8 +287,7 @@ int GameMenu::newGameLevel (GameModeType mode) {
 
 			playSound(S_ORB);
 
-			if (newGameDifficulty(mode, levelNum, worldNum) == E_QUIT)
-				return E_QUIT;
+			if (newGameDifficulty(M_SINGLE, levelNum, worldNum) == E_QUIT) return E_QUIT;
 
 			video.setPalette(menuPalette);
 
@@ -296,7 +296,11 @@ int GameMenu::newGameLevel (GameModeType mode) {
 	}
 
 	return E_NONE;
-*/
+
+}
+
+
+int GameMenu::newGameLevel (GameModeType mode) {
 
 	char* fileName;
 	int ret;
@@ -577,12 +581,3 @@ int GameMenu::newGame () {
 
 }
 
-
-int GameMenu::loadGame () {
-
-	// TODO: Actual loading of saved games
-
-	return newGameLevel(M_SINGLE);
-
-}
-

src/player/jj2levelplayer.cpp

@@ -130,6 +130,7 @@ void JJ2LevelPlayer::reset (unsigned char startX, unsigned char startY) {
 	energy = 5;
 	floating = false;
 	facing = true;
+	animType = PA_RSTAND;
 	reaction = JJ2PR_NONE;
 	reactionTime = 0;
 	jumpHeight = ITOF(92);

src/player/levelplayer.cpp

@@ -128,6 +128,7 @@ void LevelPlayer::reset (unsigned char startX, unsigned char startY) {
 	energy = 4;
 	floating = false;
 	facing = true;
+	animType = PA_RSTAND;
 	reaction = PR_NONE;
 	reactionTime = 0;
 	jumpHeight = ITOF(92);