projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20131113-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
system.c
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index c2e9a3008f982c79a6dafbd5ae62381e2ca51507..da3797358cb263e72ba21da1ac2205024c9d1988 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-46,6
+46,8
@@
LevelDirTree *leveldir_first = NULL;
LevelDirTree *leveldir_current = NULL;
int level_nr;
LevelDirTree *leveldir_current = NULL;
int level_nr;
+struct LevelStats level_stats[MAX_LEVELS];
+
Display *display = NULL;
Visual *visual = NULL;
int screen = 0;
Display *display = NULL;
Visual *visual = NULL;
int screen = 0;
@@
-127,9
+129,13
@@
void InitPlatformDependentStuff(void)
updateUserGameDataDir();
#endif
updateUserGameDataDir();
#endif
+#if 1
+ openErrorFile();
+#else
#if !defined(PLATFORM_UNIX) || defined(PLATFORM_MACOSX)
openErrorFile();
#endif
#if !defined(PLATFORM_UNIX) || defined(PLATFORM_MACOSX)
openErrorFile();
#endif
+#endif
#if defined(TARGET_SDL)
if (SDL_Init(SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE) < 0)
#if defined(TARGET_SDL)
if (SDL_Init(SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE) < 0)
@@
-736,6
+742,12
@@
void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
#endif
#endif
#endif
#endif
+#if 0
+ if (dst_x < gfx.sx + gfx.sxsize)
+ printf("::: %d: BlitBitmap(%d, %d, %d, %d)\n",
+ FrameCounter, dst_x, dst_y, width, height);
+#endif
+
sysCopyArea(src_bitmap, dst_bitmap,
src_x, src_y, width, height, dst_x, dst_y, BLIT_OPAQUE);
}
sysCopyArea(src_bitmap, dst_bitmap,
src_x, src_y, width, height, dst_x, dst_y, BLIT_OPAQUE);
}
@@
-1172,7
+1184,9
@@
static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
int width_4, height_4;
int width_8, height_8;
int width_16, height_16;
int width_4, height_4;
int width_8, height_8;
int width_16, height_16;
+#if 0
int width_32, height_32;
int width_32, height_32;
+#endif
int new_width, new_height;
/* calculate new image dimensions for normal sized image */
int new_width, new_height;
/* calculate new image dimensions for normal sized image */
@@
-1203,8
+1217,10
@@
static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
height_8 = height_1 / 8;
width_16 = width_1 / 16;
height_16 = height_1 / 16;
height_8 = height_1 / 8;
width_16 = width_1 / 16;
height_16 = height_1 / 16;
+#if 0
width_32 = width_1 / 32;
height_32 = height_1 / 32;
width_32 = width_1 / 32;
height_32 = height_1 / 32;
+#endif
UPDATE_BUSY_STATE();
UPDATE_BUSY_STATE();