walkero
/
blobwarsAttrition
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Move controls into doPlayer()

This commit is contained in:
Steve 2018-02-05 22:06:29 +00:00
parent 9c6ada01dc
commit 8c9ee4f553
4 changed files with 63 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/world/player.c
View File

@ -19,3 +19,55 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "player.h" #include "player.h"
static void doCheatControls(void);
void doPlayer(void)
{
game.config.control[CONTROL_LEFT] = app.keyboard[SDL_SCANCODE_A];
game.config.control[CONTROL_RIGHT] = app.keyboard[SDL_SCANCODE_D];
game.config.control[CONTROL_UP] = app.keyboard[SDL_SCANCODE_W];
game.config.control[CONTROL_DOWN] = app.keyboard[SDL_SCANCODE_S];
game.config.control[CONTROL_JUMP] = app.keyboard[SDL_SCANCODE_I];
game.config.control[CONTROL_FIRE] = app.keyboard[SDL_SCANCODE_J];
if (app.keyboard[SDL_SCANCODE_SPACE])
{
world.bob->activate(1);
app.keyboard[SDL_SCANCODE_SPACE] = 0;
}
if (dev.debug)
{
doCheatControls();
}
}
static void doCheatControls(void)
{
if (app.keyboard[SDL_SCANCODE_1])
{
world.bob->weaponType = WPN_PISTOL;
}
if (app.keyboard[SDL_SCANCODE_2])
{
world.bob->weaponType = WPN_PLASMA;
}
if (app.keyboard[SDL_SCANCODE_3])
{
world.bob->weaponType = WPN_SPREAD;
}
if (app.keyboard[SDL_SCANCODE_4])
{
world.bob->weaponType = WPN_LASER;
}
if (app.keyboard[SDL_SCANCODE_5])
{
world.bob->weaponType = WPN_GRENADES;
}
}

5
src/world/player.h
View File

@ -19,3 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "../common.h" #include "../common.h"
extern App app;
extern Dev dev;
extern Game game;
extern World world;

43
src/world/world.c
View File

@ -55,6 +55,8 @@ void initWorld(void)
initEffects(); initEffects();
initItems();
world.enemySpawnTimer = (FPS * rrnd(world.minEnemySpawnTime, world.maxEnemySpawnTime)); world.enemySpawnTimer = (FPS * rrnd(world.minEnemySpawnTime, world.maxEnemySpawnTime));
world.state = WS_START; world.state = WS_START;
@ -194,45 +196,8 @@ static void doWorldStart(void)
static void doWorldInProgress(void) static void doWorldInProgress(void)
{ {
cameraTrack(world.entityToTrack); cameraTrack(world.entityToTrack);
game.config.control[CONTROL_LEFT] = app.keyboard[SDL_SCANCODE_A]; doPlayer();
game.config.control[CONTROL_RIGHT] = app.keyboard[SDL_SCANCODE_D];
game.config.control[CONTROL_UP] = app.keyboard[SDL_SCANCODE_W];
game.config.control[CONTROL_DOWN] = app.keyboard[SDL_SCANCODE_S];
game.config.control[CONTROL_JUMP] = app.keyboard[SDL_SCANCODE_I];
game.config.control[CONTROL_FIRE] = app.keyboard[SDL_SCANCODE_J];
if (app.keyboard[SDL_SCANCODE_SPACE])
{
world.bob->activate(1);
app.keyboard[SDL_SCANCODE_SPACE] = 0;
}
if (app.keyboard[SDL_SCANCODE_1])
{
world.bob->weaponType = WPN_PISTOL;
}
if (app.keyboard[SDL_SCANCODE_2])
{
world.bob->weaponType = WPN_PLASMA;
}
if (app.keyboard[SDL_SCANCODE_3])
{
world.bob->weaponType = WPN_SPREAD;
}
if (app.keyboard[SDL_SCANCODE_4])
{
world.bob->weaponType = WPN_LASER;
}
if (app.keyboard[SDL_SCANCODE_5])
{
world.bob->weaponType = WPN_GRENADES;
}
if (!world.showingInfoMessage) if (!world.showingInfoMessage)
{ {

2
src/world/world.h
View File

@ -58,6 +58,8 @@ extern void initQuadtree(Quadtree *root);
extern void initParticles(void); extern void initParticles(void);
extern void initEffects(void); extern void initEffects(void);
extern void drawParticles(int plane); extern void drawParticles(int plane);
extern void initItems(void);
extern void doPlayer(void);
extern App app; extern App app;
extern Dev dev; extern Dev dev;