projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20060407-2-src
[rocksndiamonds.git]
/
src
/
libgame
/
system.c
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index cd24b1340b005722068bd252a58e64c381c46b22..94bcccdc9262eca5b8886676be68cd2228578346 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-41,6
+41,7
@@
struct ArtworkInfo artwork;
struct JoystickInfo joystick;
struct SetupInfo setup;
struct JoystickInfo joystick;
struct SetupInfo setup;
+LevelDirTree *leveldir_first_all = NULL;
LevelDirTree *leveldir_first = NULL;
LevelDirTree *leveldir_current = NULL;
int level_nr;
LevelDirTree *leveldir_first = NULL;
LevelDirTree *leveldir_current = NULL;
int level_nr;
@@
-752,7
+753,7
@@
void ReloadCustomImage(Bitmap *bitmap, char *basename)
return;
}
return;
}
- if (str
cmp(filename, bitmap->source_filename) == 0
)
+ if (str
Equal(filename, bitmap->source_filename)
)
{
/* The old and new image are the same (have the same filename and path).
This usually means that this image does not exist in this graphic set
{
/* The old and new image are the same (have the same filename and path).
This usually means that this image does not exist in this graphic set
@@
-1250,6
+1251,11
@@
inline void InitJoysticks()
#elif defined(PLATFORM_MSDOS)
MSDOSInitJoysticks();
#endif
#elif defined(PLATFORM_MSDOS)
MSDOSInitJoysticks();
#endif
+
+#if 0
+ for (i = 0; i < MAX_PLAYERS; i++)
+ printf("::: Joystick for player %d: %d\n", i, joystick.fd[i]);
+#endif
}
inline boolean ReadJoystick(int nr, int *x, int *y, boolean *b1, boolean *b2)
}
inline boolean ReadJoystick(int nr, int *x, int *y, boolean *b1, boolean *b2)