games/xmille/files/patch-move.c



300d2b52671d


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72


--- move.c.orig Thu Mar 28 15:13:44 1996
+++ move.c  Fri Jun 15 02:33:02 2007
@@ -9,15 +9,16 @@
 #endif
 #define    CTRL(c)     (c - 'A' + 1)
 
-#define ANIMATE 1
-
 /*extern FILE *outf;*/
 
 char   *Movenames[] = {
        "M_DISCARD", "M_DRAW", "M_PLAY", "M_ORDER"
    };
 
-char   *playcard (), *sprint ();
+char   *playcard (), 
+        *sprintDecimal( char* format, int arg ),
+        *sprintString( char* format, char* arg );
+
 
 domove()
 {
@@ -203,7 +204,7 @@
            return ("limit of 50");
      case C_50:
        if (pp->mileage + Value[card] > End)
-           return sprint ("puts you over %d", End);
+           return sprintDecimal ("puts you over %d", End);
      case C_25:
        if (!pp->can_go)
            return ("cannot move now");
@@ -220,7 +221,7 @@
 
      case C_GAS:   case C_SPARE:   case C_REPAIRS:
        if (pp->battle != opposite(card))
-           return sprint ("can't play \"%s\"", C_name[card]);
+           return sprintString ("can't play \"%s\"", C_name[card]);
 #ifdef ANIMATE
        animate_move (Play, ANIMATE_HAND, Card_no, ANIMATE_BATTLE, card);
 #endif
@@ -232,7 +233,7 @@
      case C_GO:
        if (pp->battle != C_INIT && pp->battle != C_STOP
            && !isrepair(pp->battle))
-           return sprint ("cannot play \"Go\"on a \"%s\"",
+           return sprintString ("cannot play \"Go\"on a \"%s\"",
                C_name[pp->battle]);
 #ifdef ANIMATE
        animate_move (Play, ANIMATE_HAND, Card_no, ANIMATE_BATTLE, card);
@@ -339,12 +340,19 @@
    return 0;
 }
 
-char *
-sprint (string, arg)
+char* sprintDecimal( char* format, int arg )
+{
+   static char buf[512];
+
+   sprintf (buf, format, arg);
+   return buf;
+}
+
+char* sprintString( char* format, char* arg )
 {
    static char buf[512];
 
-   sprintf (buf, string, arg);
+   sprintf (buf, format, arg);
    return buf;
 }