WIP two player

Author: cxong

camera.c

@@ -38,18 +38,18 @@ void CameraInit(Camera *c)
 	c->ScrollCounter = 0;
 }
 
-void CameraUpdate(Camera *c, const Player *p, const uint32_t ms)
+void CameraUpdate(Camera *c, const float playerY, const uint32_t ms)
 {
 	c->DY -= ms * c->ScrollRate / 1000;
-	if (c->DY < p->Y)
+	if (c->DY < playerY)
 	{
 		c->Y = c->DY;
 	}
 	else
 	{
-		c->Y = 0.8f * p->Y + 0.2f * c->DY;
+		c->Y = 0.8f * playerY + 0.2f * c->DY;
 	}
-	c->DY = MIN(c->DY, p->Y + FIELD_HEIGHT / 2);
+	c->DY = MIN(c->DY, playerY + FIELD_HEIGHT / 2);
 	c->ScrollCounter += ms;
 	if (c->ScrollCounter >= 1000)
 	{
@@ -60,5 +60,5 @@ void CameraUpdate(Camera *c, const Player *p, const uint32_t ms)
 	//printf("%f\n", c->ScrollRate);
 	// Disable scrolling
 	//printf("%f %f\n", c->DY, c->Y);
-	//c->Y = p->Y;
+	//c->Y =playerY;
 }

camera.h

@@ -27,8 +27,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include <stdint.h>
 
-#include "player.h"
-
 typedef struct
 {
 	float DY;
@@ -39,4 +37,4 @@ typedef struct
 extern Camera camera;
 
 void CameraInit(Camera *c);
-void CameraUpdate(Camera *c, const Player *p, const uint32_t ms);
+void CameraUpdate(Camera *c, const float playerY, const uint32_t ms);

data/graphics/penguin_black.png

@@ -29,6 +29,7 @@
 #include "camera.h"
 #include "main.h"
 #include "init.h"
+#include "input.h"
 #include "platform.h"
 #include "player.h"
 #include "sound.h"
@@ -45,6 +46,7 @@ static bool                   Boost;
 static bool                   Pause;
 
 static Player                 player;
+static Player                 player2;
 
 // What the player avoids.
 static struct Gap*            Gaps     = NULL;
@@ -70,7 +72,7 @@ void GameGatherInput(bool* Continue)
 
 	while (SDL_PollEvent(&ev))
 	{
-		player.AccelX = GetMovement(&ev);
+		InputOnEvent(&ev);
 		if (IsPauseEvent(&ev))
 			Pause = !Pause;
 		else if (IsExitGameEvent(&ev))
@@ -79,6 +81,8 @@ void GameGatherInput(bool* Continue)
 			return;
 		}
 	}
+	player.AccelX = GetMovement(0);
+	player2.AccelX = GetMovement(1);
 }
 
 static void AddEdgeShapes(const float y);
@@ -115,16 +119,17 @@ void GameDoLogic(bool* Continue, bool* Error, Uint32 Milliseconds)
 	}
 
 	PlayerUpdate(&player);
-	CameraUpdate(&camera, &player, Milliseconds);
-	if (player.Y < edgeBodiesBottom)
+	PlayerUpdate(&player2);
+	CameraUpdate(&camera, (player.Y + player2.Y) / 2, Milliseconds);
+	if (min(player.Y, player2.Y) < edgeBodiesBottom)
 	{
 		cpBodyEachShape(edgeBodies, RemoveEdgeShape, NULL);
-		AddEdgeShapes(player.Y);
+		AddEdgeShapes(min(player.Y, player2.Y));
 	}
 
 	// If the ball has collided with the top of the field,
 	// the player's game is over.
-	if (player.Y + PLAYER_RADIUS >= camera.Y + FIELD_HEIGHT / 2)
+	if (max(player.Y, player2.Y) + PLAYER_RADIUS >= camera.Y + FIELD_HEIGHT / 2)
 	{
 		ToScore(Score);
 	}
@@ -145,7 +150,7 @@ static void ScoreGaps()
 		}
 		// Arbitrary limit to eliminate off screen gaps
 		// If a gap is past the top side, remove it.
-		if (GapBottom(&Gaps[i]) > player.Y + FIELD_HEIGHT * 2)
+		if (GapBottom(&Gaps[i]) > max(player.Y, player2.Y) + FIELD_HEIGHT * 2)
 		{
 			GapRemove(&Gaps[i]);
 			memmove(&Gaps[i], &Gaps[i + 1], (GapCount - i) * sizeof(struct Gap));
@@ -176,6 +181,7 @@ void GameOutputFrame(void)
 	}
 
 	PlayerDraw(&player, screenYOff);
+	PlayerDraw(&player2, screenYOff);
 
 	// Draw the player's current score.
 	char ScoreString[17];
@@ -206,7 +212,8 @@ void ToGame(void)
 	edgeBodies = cpSpaceGetStaticBody(Space);
 	AddEdgeShapes(0);
 
-	PlayerInit(&player);
+	PlayerInit(&player, 0);
+	PlayerInit(&player2, 1);
 	if (Gaps != NULL)
 	{
 		free(Gaps);

game.c

@@ -100,7 +100,8 @@ void Initialize(bool* Continue, bool* Error)
 	LOAD_IMG(icon, "icon.png");
 	SDL_WM_SetIcon(icon, NULL);
 
-	LOAD_IMG(PlayerSpritesheet, "penguin_ball.png");
+	LOAD_IMG(PlayerSpritesheets[0], "penguin_ball.png");
+	LOAD_IMG(PlayerSpritesheets[1], "penguin_black.png");
 	LOAD_IMG(GameOverImages[0], "gameover_01.png");
 	LOAD_IMG(GameOverImages[1], "gameover_02.png");
 
@@ -170,7 +171,10 @@ void Initialize(bool* Continue, bool* Error)
 void Finalize()
 {
 	cpSpaceFree(Space);
-	SDL_FreeSurface(PlayerSpritesheet);
+	for (int i = 0; i < MAX_PLAYERS; i++)
+	{
+		SDL_FreeSurface(PlayerSpritesheets[i]);
+	}
 	SDL_FreeSurface(GameOverImages[0]);
 	SDL_FreeSurface(GameOverImages[1]);
 	SDL_FreeSurface(icon);

init.c

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2014 Nebuleon Fumika <[email protected]>
+ * 2015 Cong Xu <[email protected]>
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+#include "input.h"
+
+#include <stdbool.h>
+
+#define P1_LEFT SDLK_LEFT
+#define P1_RIGHT SDLK_RIGHT
+#define P2_LEFT SDLK_a
+#define P2_RIGHT SDLK_d
+
+static bool pressed[SDLK_LAST];
+
+void InputOnEvent(const SDL_Event* event)
+{
+	if (event->type == SDL_KEYUP || event->type == SDL_KEYDOWN)
+	{
+		pressed[event->key.keysym.sym] = event->type == SDL_KEYDOWN;
+	}
+}
+
+int16_t GetMovement(const int player)
+{
+	return pressed[player == 0 ? P1_LEFT : P2_LEFT]
+		? (pressed[player == 0 ? P1_RIGHT : P2_RIGHT] ? 0 : -32768)
+		: (pressed[player == 0 ? P1_RIGHT : P2_RIGHT] ? 32767 : 0);
+}
+
+void ResetMovement(void)
+{
+	memset(pressed, 0, sizeof pressed);
+}

input.c

@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2014 Nebuleon Fumika <[email protected]>
+ * 2015 Cong Xu <[email protected]>
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+#pragma once
+
+#include <SDL.h>
+
+void InputOnEvent(const SDL_Event* event);
+
+// GetMovement returns, after updating the platform-specific input status, a
+//   value between -32768 and +32767 to indicate how far the ball needs to go.
+//   Negative values go to the left; positive values go to the right.
+int16_t GetMovement(const int player);
+void ResetMovement(void);

input.h

@@ -36,10 +36,6 @@ extern Uint32 ToNextFrame(void);
 //   ExitGame: true if the event can be used to exit the entire application.
 //   Pause: true if the event can be used to pause a game in progress.
 
-// GetMovement returns, after updating the platform-specific input status, a
-//   value between -32768 and +32767 to indicate how far the ball needs to go.
-//   Negative values go to the left; positive values go to the right.
-
 // Get???Prompt returns the text that can be used to describe the actions that
 // can trigger a feature on the platform.
 
@@ -50,10 +46,7 @@ extern const char* GetEnterGamePrompt(void);
 extern bool IsExitGameEvent(const SDL_Event* event);
 extern const char* GetExitGamePrompt(void);
 
-extern int16_t GetMovement(const SDL_Event* event);
 extern const char* GetMovementPrompt(void);
 
 extern bool IsPauseEvent(const SDL_Event* event);
 extern const char* GetPausePrompt(void);
-
-extern void ResetMovement(void);

platform.h

@@ -25,8 +25,6 @@
 #include "platform.h"
 
 static Uint32 LastTicks = 0;
-static bool   LeftPressed;
-static bool   RightPressed;
 
 void InitializePlatform(void)
 {
@@ -73,21 +71,6 @@ const char* GetExitGamePrompt(void)
 	return "Esc";
 }
 
-int16_t GetMovement(const SDL_Event* event)
-{
-	if (event->type == SDL_KEYUP
-	 || event->type == SDL_KEYDOWN)
-	{
-		if (event->key.keysym.sym == SDLK_LEFT)
-			LeftPressed = event->type == SDL_KEYDOWN;
-		else if (event->key.keysym.sym == SDLK_RIGHT)
-			RightPressed = event->type == SDL_KEYDOWN;
-	}
-	return (LeftPressed)
-		? ((RightPressed) ?     0 : -32768)
-		: ((RightPressed) ? 32767 :      0);
-}
-
 const char* GetMovementPrompt(void)
 {
 	return "Left/Right";
@@ -103,8 +86,3 @@ const char* GetPausePrompt(void)
 {
 	return "P";
 }
-
-void ResetMovement(void)
-{
-	LeftPressed = RightPressed = false;
-}

platform/general.c

@@ -24,9 +24,6 @@
 
 #include "platform.h"
 
-static bool    LeftPressed;
-static bool    RightPressed;
-
 void InitializePlatform(void)
 {
 }
@@ -69,21 +66,6 @@ const char* GetExitGamePrompt(void)
 	return "B/Select";
 }
 
-int16_t GetMovement(const SDL_Event* event)
-{
-	if (event->type == SDL_KEYUP
-	 || event->type == SDL_KEYDOWN)
-	{
-		if (event->key.keysym.sym == SDLK_LEFT)
-			LeftPressed = event->type == SDL_KEYDOWN;
-		else if (event->key.keysym.sym == SDLK_RIGHT)
-			RightPressed = event->type == SDL_KEYDOWN;
-	}
-	return (LeftPressed)
-		? ((RightPressed) ?     0 : -32768)
-		: ((RightPressed) ? 32767 :      0);
-}
-
 const char* GetMovementPrompt(void)
 {
 	return "D-pad Left/Right";
@@ -99,8 +81,3 @@ const char* GetPausePrompt(void)
 {
 	return "Start";
 }
-
-void ResetMovement(void)
-{
-	LeftPressed = RightPressed = false;
-}

platform/opendingux.c

@@ -20,7 +20,7 @@
 #define PLAYER_BLINK_INTERVAL_FRAMES ((rand() % 500) + 500)
 #define PLAYER_BLINK_CHANCE 50
 
-SDL_Surface* PlayerSpritesheet = NULL;
+SDL_Surface* PlayerSpritesheets[MAX_PLAYERS];
 Mix_Chunk* SoundPlayerBounce = NULL;
 Mix_Chunk* SoundPlayerRoll = NULL;
 
@@ -40,7 +40,7 @@ void PlayerUpdate(Player *player)
 	// - when the player is above max speed
 	float accel = ACCELERATION;
 	const cpVect vel = cpBodyGetVelocity(player->Body);
-	const float relVelX = fabs(vel.x) * SIGN(vel.x * player->AccelX);
+	const float relVelX = (float)fabs(vel.x) * SIGN(vel.x * player->AccelX);
 	if (relVelX > MAX_SPEED) accel = ACCELERATION_MAX_SPEED;
 	if (relVelX < MIN_SPEED) accel += MIN_SPEED_ACCEL_BONUS;
 	if (player->WasOnSurface) accel += ROLL_ACCEL_BONUS;
@@ -115,10 +115,10 @@ void PlayerDraw(const Player *player, const float y)
 		0,
 		0
 	};
-	SDL_BlitSurface(PlayerSpritesheet, &src, Screen, &dest);
+	SDL_BlitSurface(player->Sprites, &src, Screen, &dest);
 }
 
-void PlayerInit(Player *player)
+void PlayerInit(Player *player, const int i)
 {
 	player->Body = cpSpaceAddBody(
 		Space,
@@ -138,4 +138,5 @@ void PlayerInit(Player *player)
 	player->Roll = 0;
 	player->BlinkCounter = 0;
 	player->NextBlinkCounter = 1;
+	player->Sprites = PlayerSpritesheets[i];
 }

player.c

@@ -27,13 +27,17 @@ typedef struct
 	int BlinkCounter;
 	// Blink when counter reaches zero
 	int NextBlinkCounter;
+
+	SDL_Surface *Sprites;
 } Player;
 
-extern SDL_Surface* PlayerSpritesheet;
+#define MAX_PLAYERS 2
+
+extern SDL_Surface* PlayerSpritesheets[MAX_PLAYERS];
 extern Mix_Chunk* SoundPlayerBounce;
 extern Mix_Chunk* SoundPlayerRoll;
 extern int SoundPlayerRollChannel;
 
 void PlayerUpdate(Player *player);
 void PlayerDraw(const Player *player, const float y);
-void PlayerInit(Player *player);
+void PlayerInit(Player *player, const int i);