rnd-19981202-1

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index a5aeb218940df516e836c1f544abbd022d3d0d39..1d1c4ddab74dac7b8b66da271fc30c613a60ee7c 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -11,7 +11,6 @@
 *  tools.c                                                 *
 ***********************************************************/
 
-#include <math.h>
 #include <stdarg.h>
 
 #ifdef __FreeBSD__
@@ -90,11 +89,13 @@ void BackToFront()
      this could mean that we have to wait for the graphics to complete,
      although we could go on doing calculations for the next frame */
 
-  XSync(display,FALSE);
+  XSync(display, FALSE);
 
+  /*
 #ifdef MSDOS
   wait_for_vsync = TRUE;
 #endif
+  */
 
   if (redraw_mask & REDRAW_ALL)
   {
@@ -282,7 +283,7 @@ void ClearWindow()
   redraw_mask |= REDRAW_FIELD;
 }
 
-void DrawTextCentered(int y, int font_type, char *format, ...)
+void DrawTextFCentered(int y, int font_type, char *format, ...)
 {
   char buffer[FULL_SXSIZE / FONT3_XSIZE + 10];
   int font_xsize;
@@ -299,6 +300,18 @@ void DrawTextCentered(int y, int font_type, char *format, ...)
           buffer, FS_SMALL, font_type);
 }
 
+void DrawTextF(int x, int y, int font_type, char *format, ...)
+{
+  char buffer[FULL_SXSIZE / FONT3_XSIZE + 10];
+  va_list ap;
+
+  va_start(ap, format);
+  vsprintf(buffer, format, ap);
+  va_end(ap);
+
+  DrawText(SX + x, SY + y, buffer, FS_SMALL, font_type);
+}
+
 void DrawText(int x, int y, char *text, int font_size, int font_type)
 {
   DrawTextExt(drawto, gc, x, y, text, font_size, font_type);
@@ -1327,11 +1340,13 @@ boolean Request(char *text, unsigned int req_state)
   int mx, my, ty, result = -1;
   unsigned int old_door_state;
 
+#ifndef MSDOS
   /* pause network game while waiting for request to answer */
   if (options.network &&
       game_status == PLAYING &&
       req_state & REQUEST_WAIT_FOR)
     SendToServer_PausePlaying();
+#endif
 
   old_door_state = GetDoorState();
 
@@ -1533,11 +1548,13 @@ boolean Request(char *text, unsigned int req_state)
     }
   }
 
+#ifndef MSDOS
   /* continue network game after request */
   if (options.network &&
       game_status == PLAYING &&
       req_state & REQUEST_WAIT_FOR)
     SendToServer_ContinuePlaying();
+#endif
 
   return(result);
 }