Changeset 462

Timestamp:

08/07/07 16:52:21 (1 year ago)

Author:

takkaria

Message:

Try that last commit again, having tried to compile it.

Files:

• trunk/src/externs.h (modified) (1 diff)
• trunk/src/util.c (modified) (5 diffs)

trunk/src/externs.h

@@ -665 +665 @@
-extern bool get_string(cptr prompt, char *buf, size_t len);
-extern s16b get_quantity(cptr prompt, int max);
-extern int get_check_other(cptr prompt, char other);
-extern bool get_check(cptr prompt);
-extern bool get_com(cptr prompt, char *command);

trunk/src/util.c

@@ -130 +130 @@
-                        /* Modifier key character */
-                        case '&':
+                        {
-                                size_t j;
-                                for (j = 0; macro_modifier_chr[j]; j++)
@@ -137 +138 @@
-                                }
-                                break;
+                        }
-
-                        /* Key code */
-                        case '#':
+                        {
-                                strnfcat(buf, max, &current_len, "%s", key_code);
-                                break;
+                        }
-
-                        /* Fixed string */
-                        default:
+                        {
-                                strnfcat(buf, max, &current_len, "%c", ch);
-                                break;
+                        }
-                }
-        }
@@ -298 +304 @@
-                        /* Read modifier */
-                        case '&':
+                        {
-                                size_t j;
-                                while ((tmp = strchr(macro_modifier_chr, *str)))
@@ -306 +313 @@
-                                }
-                                break;
+                        }
-
-                        /* Read key code */
-                        case '#':
+                        {
-                                size_t j;
-                                for (j = 0; *str && (*str != '\r') && (j < sizeof(key_code) - 1); j++)
@@ -314 +323 @@
-                                key_code[j] = '\0';
-                                break;
+                        }
-
-                        /* Skip fixed strings */
-                        default:
+                        {
-                                if (ch != *str) return 0;
-                                str++;
+                        }
-                }
-        }