projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20001127-1-src
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 89ad7c741bdd1103a25f181a5111eef4390a6182..423ce49dbfc0ddefca9bb6ab7ef03bf447c1c678 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-27,7
+27,7
@@
#include "cartoons.h"
#include "network.h"
#include "cartoons.h"
#include "network.h"
-#if
def MSDOS
+#if
defined(PLATFORM_MSDOS)
extern boolean wait_for_vsync;
#endif
extern boolean wait_for_vsync;
#endif
@@
-927,7
+927,7
@@
void DrawGraphicThruMaskExt(DrawBuffer d, int dest_x, int dest_y, int graphic)
else
{
#if DEBUG
else
{
#if DEBUG
-#ifndef
USE_SDL_LIBRARY
+#ifndef
TARGET_SDL
printf("DrawGraphicThruMask(): tile '%d' needs clipping!\n", tile);
#endif
#endif
printf("DrawGraphicThruMask(): tile '%d' needs clipping!\n", tile);
#endif
#endif
@@
-1110,7
+1110,7
@@
void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic,
else
{
#if DEBUG
else
{
#if DEBUG
-#ifndef
USE_SDL_LIBRARY
+#ifndef
TARGET_SDL
printf("DrawGraphicShifted(): tile '%d' needs clipping!\n", tile);
#endif
#endif
printf("DrawGraphicShifted(): tile '%d' needs clipping!\n", tile);
#endif
#endif
@@
-1827,7
+1827,7
@@
boolean Request(char *text, unsigned int req_state)
int mx, my, ty, result = -1;
unsigned int old_door_state;
int mx, my, ty, result = -1;
unsigned int old_door_state;
-#if
!defined(MSDOS) && !defined(WIN32
)
+#if
defined(PLATFORM_UNIX
)
/* pause network game while waiting for request to answer */
if (options.network &&
game_status == PLAYING &&
/* pause network game while waiting for request to answer */
if (options.network &&
game_status == PLAYING &&
@@
-1991,11
+1991,11
@@
boolean Request(char *text, unsigned int req_state)
case EVENT_KEYPRESS:
switch(GetEventKey((KeyEvent *)&event, TRUE))
{
case EVENT_KEYPRESS:
switch(GetEventKey((KeyEvent *)&event, TRUE))
{
- case K
EY
_Return:
+ case K
SYM
_Return:
result = 1;
break;
result = 1;
break;
- case K
EY
_Escape:
+ case K
SYM
_Escape:
result = 0;
break;
result = 0;
break;
@@
-2051,7
+2051,7
@@
boolean Request(char *text, unsigned int req_state)
RemapAllGadgets();
RemapAllGadgets();
-#if
!defined(MSDOS) && !defined(WIN32
)
+#if
defined(PLATFORM_UNIX
)
/* continue network game after request */
if (options.network &&
game_status == PLAYING &&
/* continue network game after request */
if (options.network &&
game_status == PLAYING &&
@@
-2249,7
+2249,7
@@
void UndrawSpecialEditorDoor()
redraw_mask |= REDRAW_ALL;
}
redraw_mask |= REDRAW_ALL;
}
-#ifndef
USE_SDL_LIBRARY
+#ifndef
TARGET_SDL
int ReadPixel(DrawBuffer d, int x, int y)
{
XImage *pixel_image;
int ReadPixel(DrawBuffer d, int x, int y)
{
XImage *pixel_image;