projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved game element tables to game logic source file
[rocksndiamonds.git]
/
src
/
game_em
/
init.c
diff --git
a/src/game_em/init.c
b/src/game_em/init.c
index fc84fbf31aa282933a00f7b524198378d01d1ae6..c99cb8e746384745e54f5f3c15ad22d4d29f03bf 100644
(file)
--- a/
src/game_em/init.c
+++ b/
src/game_em/init.c
@@
-5,25
+5,12
@@
#include "main_em.h"
#include "main_em.h"
-#include <signal.h>
-
-
-Bitmap *objBitmap;
-Bitmap *sprBitmap;
Bitmap *screenBitmap;
struct GlobalInfo_EM global_em_info;
struct GameInfo_EM game_em;
Bitmap *screenBitmap;
struct GlobalInfo_EM global_em_info;
struct GameInfo_EM game_em;
-int open_all(void)
-{
- objBitmap = NULL;
- sprBitmap = NULL;
-
- return 0;
-}
-
void InitGfxBuffers_EM(void)
{
ReCreateBitmap(&screenBitmap, MAX_BUF_XSIZE * TILEX, MAX_BUF_YSIZE * TILEY);
void InitGfxBuffers_EM(void)
{
ReCreateBitmap(&screenBitmap, MAX_BUF_XSIZE * TILEX, MAX_BUF_YSIZE * TILEY);
@@
-33,14
+20,7
@@
void InitGfxBuffers_EM(void)
void em_open_all(void)
{
void em_open_all(void)
{
- /* pre-calculate some data */
- tab_generate();
-
- if (open_all() != 0)
- Error(ERR_EXIT, "em_open_all(): open_all() failed");
-
- /* after "open_all()", because we need the graphic bitmaps to be defined */
- tab_generate_graphics_info_em();
+ InitGraphicInfo_EM();
game_init_random();
game_init_cave_buffers();
game_init_random();
game_init_cave_buffers();
@@
-52,9
+32,6
@@
void em_close_all(void)
/* ---------------------------------------------------------------------- */
/* ---------------------------------------------------------------------- */
-extern int screen_x;
-extern int screen_y;
-
void play_element_sound(int x, int y, int sample, int element)
{
PlayLevelSound_EM(x, y, element, sample);
void play_element_sound(int x, int y, int sample, int element)
{
PlayLevelSound_EM(x, y, element, sample);