projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into releases
[rocksndiamonds.git]
/
src
/
screens.h
diff --git
a/src/screens.h
b/src/screens.h
index 1e29566aa86327cfb6865c4c0c42c1b48ec1bd62..39e301538a40d1e97bad2979932d154f29bf8266 100644
(file)
--- a/
src/screens.h
+++ b/
src/screens.h
@@
-16,11
+16,6
@@
#include "main.h"
#include "main.h"
-/* for DrawSetupScreen(), HandleSetupScreen() */
-#define SETUP_SCREEN_POS_START 2
-#define SETUP_SCREEN_POS_END 16
-#define SETUP_SCREEN_POS_EMPTY (SETUP_SCREEN_POS_END - 2)
-
void DrawHeadline(void);
void DrawMainMenu(void);
void HandleMainMenu(int, int, int, int, int);
void DrawHeadline(void);
void DrawMainMenu(void);
void HandleMainMenu(int, int, int, int, int);
@@
-37,10
+32,13
@@
void DrawHallOfFame(int);
void HandleHallOfFame(int);
void DrawSetupScreen(void);
void HandleSetupScreen(int, int, int, int, int);
void HandleHallOfFame(int);
void DrawSetupScreen(void);
void HandleSetupScreen(int, int, int, int, int);
-void CalibrateJoystick(void);
-void HandleGameActions(byte);
+void DrawSetupInputScreen(void);
+void HandleSetupInputScreen(int, int, int, int, int);
+void CustomizeKeyboard(int);
+void CalibrateJoystick(int);
+void HandleGameActions(void);
void HandleVideoButtons(int, int, int);
void HandleSoundButtons(int, int, int);
void HandleGameButtons(int, int, int);
void HandleVideoButtons(int, int, int);
void HandleSoundButtons(int, int, int);
void HandleGameButtons(int, int, int);
-#endif
+#endif
/* SCREENS_H */