ctdo
/
borgware-2d
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed initialization problem

This commit is contained in:
Christian Kroll 2010-04-01 22:59:56 +00:00
parent 3f2d878b7d
commit 911bc9bb28
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
games/tetris/input.c
View File

@ -5,12 +5,13 @@
#include "../../config.h" #include "../../config.h"
#include "../../joystick/joystick.h" #include "../../joystick/joystick.h"
#include "../../util.h" #include "../../util.h"
#include "../../scrolltext/scrolltext.h"
#include "input.h" #include "input.h"
#include "orientation.h" #include "orientation.h"
#include "../../compat/pgmspace.h" #include "../../compat/pgmspace.h"
#define WAIT(ms) wait(ms) #define WAIT(ms) wait(ms)
#define PM(value) pgm_read_word(&value) #define PM(value) pgm_read_byte(&value)
/** /**
* \defgroup TetrisInputDefinesPrivate Input: Internal constants * \defgroup TetrisInputDefinesPrivate Input: Internal constants
@ -243,7 +244,7 @@ tetris_input_t *tetris_input_construct(void)
pIn->cmdRawLast = pIn->cmdLast = TETRIS_INCMD_NONE; pIn->cmdRawLast = pIn->cmdLast = TETRIS_INCMD_NONE;
pIn->nOrientation = TETRIS_ORIENTATION_0; pIn->nOrientation = TETRIS_ORIENTATION_0;
// pIn->nLevel = 0xFF; pIn->nLevel = 0xFF;
tetris_input_setLevel(pIn, 0); tetris_input_setLevel(pIn, 0);
pIn->nLoopCycles = 0; pIn->nLoopCycles = 0;
pIn->nRepeatCount = -TETRIS_INPUT_REPEAT_INITIALDELAY; pIn->nRepeatCount = -TETRIS_INPUT_REPEAT_INITIALDELAY;
@ -419,12 +420,12 @@ void tetris_input_setLevel(tetris_input_t *pIn,
assert(pIn != NULL); assert(pIn != NULL);
assert(nLvl <= TETRIS_INPUT_LEVELS - 1); assert(nLvl <= TETRIS_INPUT_LEVELS - 1);
static const uint8_t nCycles[] = {TETRIS_INPUT_LVL_CYCLES}; static const uint8_t nCycles[] PROGMEM = {TETRIS_INPUT_LVL_CYCLES};
if (pIn->nLevel != nLvl) if (pIn->nLevel != nLvl)
{ {
pIn->nLevel = nLvl; pIn->nLevel = nLvl;
pIn->nMaxCycles = nCycles[nLvl]; pIn->nMaxCycles = PM(nCycles[nLvl]);
} }
} }