Changeset 303

Timestamp:

07/08/07 11:51:57 (1 year ago)

Author:

takkaria

Message:

Add quickstart. (closes #28)

Files:

• trunk/src/birth.c (modified) (11 diffs)
• trunk/src/externs.h (modified) (1 diff)
• trunk/src/load.c (modified) (2 diffs)
• trunk/src/save.c (modified) (1 diff)
• trunk/src/types.h (modified) (1 diff)
• trunk/src/variable.c (modified) (1 diff)

trunk/src/birth.c

@@ -116 +116 @@
-        /* Load the data */
-        p_ptr->age = prev.age;
-
-
+_ptr->wt_birth = p
+_ptr->ht_birth = p
-        p_ptr->sc = prev.sc;
-
+_ptr->au_birth = p
-
-        /* Load the stats */
-        for (i = 0; i < A_MAX; i++)
-        {
-
-
+
-        }
-
@@ -270 +269 @@
-                        p_ptr->stat_cur[i] = p_ptr->stat_max[i] = stat_use[i];
-                }
+
+                p_ptr->stat_birth[i] = p_ptr->stat_max[i];
-        }
-}
@@ -390 +391 @@
-        if (p_ptr->psex == SEX_MALE)
-        {
-
-
+p_ptr->ht_birth = 
+p_ptr->wt_birth = 
-        }
-
@@ -397 +398 @@
-        else if (p_ptr->psex == SEX_FEMALE)
-        {
-
-
+p_ptr->ht_birth = 
+p_ptr->wt_birth = 
-        }
-}
@@ -431 +432 @@
-
-        /* Save the gold */
-
+p_ptr->au_birth = 
-}
-
@@ -439 +440 @@
- * Clear all the global "character" data
- */
-bool really_wipe
+void
-{
-        int i;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-        /* Wipe the player */
@@ -1088 +1078 @@
-                        {
-                                /* Reset stats */
-
-
+
-                        }
-
@@ -1121 +1110 @@
-
-                /* Gold is inversely proportional to cost */
-
+p_ptr->au_birth = 
-
-                /* Calculate the bonuses and hitpoints */
@@ -1680 +1669 @@
-                                        state = BIRTH_RESTART;
-
-
+ 
-                                        quit(NULL);
-
@@ -1705 +1694 @@
-
-/*
+ * Helper function for 'player_birth_quick()'.
+ *
+ * See "display_player" for screen layout code.
+ */
+static bool player_birth_quick(void)
+{
+    char ch;
+    int i;
+    birther old_char;
+    byte old_hitdie;
+    u16b old_expfact;
+    s16b old_hp[PY_MAX_LEVEL];
+
+    old_hitdie = p_ptr->hitdie;
+    old_expfact = p_ptr->expfact;
+
+    old_char.age = p_ptr->age;
+    old_char.au = p_ptr->au_birth;
+    old_char.ht = p_ptr->ht_birth;
+    old_char.wt = p_ptr->wt_birth;
+    old_char.sc = p_ptr->sc;
+
+    /* Save the stats */
+    for (i = 0; i < A_MAX; i++)
+    {
+        old_char.stat[i] = p_ptr->stat_birth[i];
+    }
+
+    /* Save the history */
+    my_strcpy(old_char.history, p_ptr->history, sizeof(old_char.history));
+
+    /* Save the hp */
+    for (i = 0; i < PY_MAX_LEVEL; i++)
+    {
+        old_hp[i] = p_ptr->player_hp[i];
+    }
+
+    /* Wipe the player */
+    player_wipe();
+
+    /* Level one */
+    p_ptr->max_lev = p_ptr->lev = 1;
+
+    p_ptr->hitdie = old_hitdie;
+    p_ptr->expfact = old_expfact;
+
+    p_ptr->age = old_char.age;
+    p_ptr->au_birth = p_ptr->au = old_char.au;
+    p_ptr->ht_birth = p_ptr->ht = old_char.ht;
+    p_ptr->wt_birth = p_ptr->wt = old_char.wt;
+    p_ptr->sc = old_char.sc;
+
+    /* Load the stats */
+    for (i = 0; i < A_MAX; i++)
+    {
+        p_ptr->stat_birth[i] = p_ptr->stat_cur[i] = p_ptr->stat_max[i] = old_char.stat[i];
+    }
+
+    /* Load the history */
+    my_strcpy(p_ptr->history, old_char.history, sizeof(p_ptr->history));
+
+    /* Load the hp */
+    for (i = 0; i < PY_MAX_LEVEL; i++)
+    {
+        p_ptr->player_hp[i] = old_hp[i];
+    }
+
+        /* Set adult options from birth options */
+        for (i = OPT_BIRTH; i < OPT_CHEAT; i++)
+        {
+                op_ptr->opt[OPT_ADULT + (i - OPT_BIRTH)] = op_ptr->opt[i];
+        }
+
+        /* Reset score options from cheat options */
+        for (i = OPT_CHEAT; i < OPT_ADULT; i++)
+        {
+                op_ptr->opt[OPT_SCORE + (i - OPT_CHEAT)] = op_ptr->opt[i];
+        }
+
+    /* Calculate the bonuses and hitpoints */
+    p_ptr->update |= (PU_BONUS | PU_HP);
+
+    /* Update stuff */
+    update_stuff();
+
+    /* Fully healed */
+    p_ptr->chp = p_ptr->mhp;
+
+    /* Fully rested */
+    p_ptr->csp = p_ptr->msp;
+
+    /* Display the player */
+    display_player(0);
+
+    /* Get a name, prepare savefile */
+    get_name(FALSE);
+
+    /* Prompt for it */
+    prt("['CTRL-X' to quit, 'ESC' to start over, or any other key to continue]", 23, 5);
+
+    /* Get a key */
+    ch = inkey();
+
+    /* Quit */
+    if (ch == KTRL('X')) quit(NULL);
+
+    /* Start over */
+    if (ch == ESCAPE) return (FALSE);
+
+    /* Accept */
+    return (TRUE);
+}
+
+
+
+/*
- * Create a new character.
- *
@@ -1712 +1817 @@
-void player_birth(void)
-{
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /* Note player birth in the message recall */

trunk/src/externs.h

@@ -99 +99 @@
-extern int arg_graphics;
-extern bool character_generated;
+extern bool character_existed;
-extern bool character_dungeon;
-extern bool character_saved;

trunk/src/load.c

@@ -1111 +1111 @@
-        for (i = 0; i < A_MAX; i++) rd_s16b(&p_ptr->stat_max[i]);
-        for (i = 0; i < A_MAX; i++) rd_s16b(&p_ptr->stat_cur[i]);
-
-
+
+
+
+
+
+
+
-
-        rd_s32b(&p_ptr->au);
@@ -2307 +2312 @@
-                        p_ptr->is_dead = FALSE;
-
+                        /* A character existed in this savefile. */
+                        character_existed = TRUE;
+
-                        /* Count lives */
-                        sf_lives++;

trunk/src/save.c

@@ -471 +471 @@
-        wr_s16b(p_ptr->wt);
-
-
+ and birth
-        for (i = 0; i < A_MAX; ++i) wr_s16b(p_ptr->stat_max[i]);
-        for (i = 0; i < A_MAX; ++i) wr_s16b(p_ptr->stat_cur[i]);
-
-
-
+
+
+
+
+
+
+
+
-
-        wr_u32b(p_ptr->au);
+
-
-        wr_u32b(p_ptr->max_exp);

trunk/src/types.h

@@ -1057 +1057 @@
-
-        s16b pspeed;            /* Current speed */
+
+    /* Generation fields (for quick start) */
+        s32b au_birth;          /* Birth gold */
+        s16b stat_birth[A_MAX]; /* Birth "natural" stat values */
+        s16b ht_birth;          /* Birth Height */
+        s16b wt_birth;          /* Birth Weight */
-};
-

trunk/src/variable.c

@@ -60 +60 @@
-
-bool character_generated;       /* The character exists */
+bool character_existed;         /* A character existed on the same savefile */
-bool character_dungeon;         /* The character has a dungeon */
-bool character_saved;           /* The character was just saved to a savefile */