projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020825-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
msdos.h
diff --git
a/src/libgame/msdos.h
b/src/libgame/msdos.h
index 6e16b214baf12d3c627fc02178def2e1c4d7654f..5ddb3eef42aea353ed8e7ab3eeafd492d01143f3 100644
(file)
--- a/
src/libgame/msdos.h
+++ b/
src/libgame/msdos.h
@@
-1,7
+1,7
@@
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-200
1
Artsoft Entertainment *
+* (c) 1994-200
2
Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
@@
-19,10
+19,10
@@
/* symbol 'window' is defined in DJGPP cross-compiler in libc.a(conio.o) */
/* symbol 'window' is defined in DJGPP cross-compiler in libc.a(conio.o) */
-#define window window_
djgpp
+#define window window_
internal
/* symbol 'font' is defined in "allegro.h" */
/* symbol 'font' is defined in "allegro.h" */
-#define font font_
allegro
+#define font font_
internal
/* system dependent definitions */
/* system dependent definitions */
@@
-40,6
+40,18
@@
#define XRES 800
#define YRES 600
#define XRES 800
#define YRES 600
+/* allegro defines some macros that bother the rest of the program */
+#ifdef joy_x
+#undef joy_x
+#undef joy_y
+#undef joy_left
+#undef joy_right
+#undef joy_up
+#undef joy_down
+#undef joy_b1
+#undef joy_b2
+#endif
+
/* additional Allegro keyboard mapping */
/* The following are all undefined in Allegro */
/* additional Allegro keyboard mapping */
/* The following are all undefined in Allegro */
@@
-450,7
+462,6
@@
/* end of X11 keyboard mapping */
/* end of X11 keyboard mapping */
-#define JOYSTICK_FILENAME "joystick.cnf"
#define screen myscreen
#define screen myscreen
@@
-741,4
+752,7
@@
void MSDOSCloseAudio(void);
void NetworkServer(int, int);
void NetworkServer(int, int);
+void MSDOSInitJoysticks();
+boolean MSDOSReadJoystick(int, int *, int *, boolean *, boolean *);
+
#endif /* MSDOS_H */
#endif /* MSDOS_H */