fiddlerwoaroof/crawl - Change 5OVWAD2MGK2NT6Q546KW7HZHELVDBBRC2CQX6VZMZF2YVRC7CPVAC

Removed SHORT_FILE_NAMES for Windows builds.

Fixed poisoned needles not stacking correctly. Allow character names to end with digits on multiuser systems.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@628 c06c8d41-db1a-0410-9941-cceddc491573

Created by dshaligram on December 14, 2006

5OVWAD2MGK2NT6Q546KW7HZHELVDBBRC2CQX6VZMZF2YVRC7CPVAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/newgame.cc at line 96 [4.1132300]
B:BD[3.127] → [2.63:103]
```
static bool validate_player_name(void);
```
[3.127]
[3.163]
```
static bool validate_player_name(bool verbose);
```
Replacement in crawl-ref/source/newgame.cc at line 98 [4.1132300]
B:BD[3.196] → [3.196:239]
```
static void enterPlayerName(bool blankOK);
```
[3.196]
[3.239]
```
static void enter_player_name(bool blankOK);
```

Replacement in crawl-ref/source/newgame.cc at line 284 [4.1132300]

B:BD[4.1139134] → [5.381838:381911]

    std::string basename = get_savedir_filename( you.your_name, "", "");

[4.1139134]

[5.381911]

    std::string basename = get_savedir_filename( you.your_name, "", "" );

Replacement in crawl-ref/source/newgame.cc at line 292 [4.1132300]
B:BD[4.1139514] → [5.382082:382099]
```
	fclose(handle);
```
[4.1139514]
[4.1139514]
```
        fclose(handle);
```

Replacement in crawl-ref/source/newgame.cc at line 301 [4.1132300]

B:BD[5.382166] → [6.118:161]

		  basename.c_str(), directory.c_str() );

[5.382166]

[4.1139694]

                  basename.c_str(), directory.c_str() );

Replacement in crawl-ref/source/newgame.cc at line 376 [4.1132300]
B:BD[4.1141469] → [4.1141469:1141496]
```
    enterPlayerName(true);
```
[4.1141469]
[4.1141496]
```
    enter_player_name(true);
```
Replacement in crawl-ref/source/newgame.cc at line 420 [4.1132300]
B:BD[4.1142630] → [4.1142630:1142662]
```
        enterPlayerName(false);
```
[4.1142630]
[4.1142662]
```
        enter_player_name(false);
```
Replacement in crawl-ref/source/newgame.cc at line 2020 [4.1132300]
B:BD[5.387840] → [5.387840:387891]
```
static bool is_good_name(char *name, bool blankOK)
```
[5.387840]
[5.387891]
```
static bool is_good_name(char *name, bool blankOK, bool verbose)
```

Replacement in crawl-ref/source/newgame.cc at line 2030 [4.1132300]

B:BD[5.388065] → [5.388065:388114]

        cprintf(EOL "That's a silly name!" EOL);

[5.388065]

[5.388114]

        if (verbose)
            cprintf(EOL "That's a silly name!" EOL);

Replacement in crawl-ref/source/newgame.cc at line 2045 [4.1132300]

B:BD[5.388619] → [5.388619:388668]

        cprintf(EOL "That's a silly name!" EOL);

[5.388619]

[5.388668]

        if (verbose)
            cprintf(EOL "That's a silly name!" EOL);

Replacement in crawl-ref/source/newgame.cc at line 2050 [4.1132300]
B:BD[5.388705] → [2.104:141]
```
    return (validate_player_name());
```
[5.388705]
[5.388738]
```
    return (validate_player_name(verbose));
```
Replacement in crawl-ref/source/newgame.cc at line 2106 [4.1132300]
B:BD[4.1185181] → [3.1289:1331]
```
static void enterPlayerName(bool blankOK)
```
[4.1185181]
[5.390021]
```
static void enter_player_name(bool blankOK)
```
Replacement in crawl-ref/source/newgame.cc at line 2117 [4.1132300]
B:BD[5.390240] → [5.390240:390257]
```
    if (blankOK)
```
[5.390240]
[5.390257]
```
    if (blankOK && (ask_name || !is_good_name(you.your_name, false, false)))
```

Replacement in crawl-ref/source/newgame.cc at line 2155 [4.1132300]

B:BD[4.1186417] → [5.391282:391344]

∅:D[5.391344] → [4.1186447:1186504]

B:BD[4.1186447] → [4.1186447:1186504]

    while (ask_name = !is_good_name(you.your_name, blankOK));
}                               // end enterPlayerName()

[4.1186417]

[4.1186504]

    while (ask_name = !is_good_name(you.your_name, blankOK, true));
}                               // end enter_player_name()

Replacement in crawl-ref/source/newgame.cc at line 2158 [4.1132300]
B:BD[4.1186505] → [2.362:401]
```
static bool validate_player_name(void)
```
[4.1186505]
[4.1186533]
```
static bool validate_player_name(bool verbose)
```
Deletion in crawl-ref/source/newgame.cc at line 2161 [4.1132300]
B:BD[4.1186577] → [4.1186577:1186630]
```
    static int william_tanksley_asked_for_this = 2;
```

Replacement in crawl-ref/source/newgame.cc at line 2163 [4.1132300]

B:BD[2.445] → [2.445:492]

        || stricmp(you.your_name, "nul") == 0)

[2.445]

[4.1186741]

        || stricmp(you.your_name, "nul") == 0
        || stricmp(you.your_name, "prn") == 0
        || strnicmp(you.your_name, "LPT", 3) == 0)

Replacement in crawl-ref/source/newgame.cc at line 2167 [4.1132300]

B:BD[4.1186747] → [4.1186747:1186818]

        cprintf(EOL "Sorry, that name gives your OS a headache." EOL);

[4.1186747]

[4.1186818]

        if (verbose)
            cprintf(EOL "Sorry, that name gives your OS a headache." EOL);

Deletion in crawl-ref/source/newgame.cc at line 2171 [4.1132300]

B:BD[4.1186848] → [4.1186848:1186849]

B:BD[4.1186849] → [5.391345:391405]

∅:D[5.391405] → [4.1186912:1187388]

B:BD[4.1186912] → [4.1186912:1187388]

B:BD[4.1187388] → [5.391406:391449]

∅:D[5.391449] → [4.1187432:1187462]

B:BD[4.1187432] → [4.1187432:1187462]


    // quick check for LPTx -- thank you, Mr. Tanksley! ;-)
    if (strnicmp(you.your_name, "LPT", 3) == 0)
    {
        switch (william_tanksley_asked_for_this)
        {
            case 2:
                cprintf(EOL "Hello, William!  How is work on Omega going?" EOL);
                break;
            case 1:
                cprintf(EOL "Look, it's just not a legal name." EOL);
                break;
            case 0:
                strcpy(you.your_name, "William");
                return (true);
        } // end switch
        william_tanksley_asked_for_this--;
        return (false);
    }

Replacement in crawl-ref/source/newgame.cc at line 2183 [4.1132300]

B:BD[4.1188181] → [2.643:813]

            cprintf( EOL
                     "Alpha-numerics, spaces, dashes, periods and underscores "
                     "only, please."
                     EOL );

[4.1188181]

[4.1188260]

            if (verbose)
                cprintf( EOL
                         "Alpha-numerics, spaces, dashes, periods "
                         "and underscores only, please."
                         EOL );

Deletion in crawl-ref/source/newgame.cc at line 2192 [4.1132300]

B:BD[4.1188312] → [5.391450:391467]

∅:D[5.391467] → [4.1188333:1188485]

B:BD[4.1188333] → [4.1188333:1188485]

B:BD[4.1188485] → [2.814:862]

∅:D[2.862] → [4.1188485:1188646]

B:BD[4.1188485] → [4.1188485:1188646]

#ifdef MULTIUSER
    // Until we have a better way to handle the fact that this could lead 
    // to some confusion with where the name ends and the uid begins. -- bwr
    const size_t len = strlen( you.your_name );
    if (isdigit( you.your_name[ len - 1 ] ))
    {
        cprintf( EOL "Sorry, your name cannot end with a digit." EOL );
        return (false);
    }
#endif

Replacement in crawl-ref/source/newgame.cc at line 2193 [4.1132300]
B:BD[4.1188665] → [4.1188665:1188723]
```
}                               // end verifyPlayerName()
```
[4.1188665]
[4.1188723]
```
}                               // end validate_player_name()
```

Replacement in crawl-ref/source/files.cc at line 211 [4.3084589]

B:BD[5.857368] → [5.857368:857428]

    snprintf( struid, sizeof struid, "%d", (int)getuid() );

[5.857368]

[5.857428]

    snprintf( struid, sizeof struid, "-%d", (int)getuid() );

Replacement in crawl-ref/source/files.cc at line 232 [4.3084589]

B:BD[5.857993] → [5.857993:858139]

∅:D[5.858139] → [7.432991:432998]

B:BD[7.432991] → [7.432991:432998]

B:BD[7.432998] → [5.858140:858156]

            && suffix_pos != 0
#ifdef MULTIUSER
            // See verifyPlayerName() in newgame.cc
            && !isdigit(name[suffix_pos - 1])
#endif
            );

[5.857993]

[5.858156]

            && suffix_pos != 0);

Insertion in crawl-ref/source/files.cc at line 344 [4.3084589]

[5.860636]

        // Handle absolute paths correctly.
        if (i == 0 && dir.size() && dir[0] == FILE_SEPARATOR)
            path = FILE_SEPARATOR + path;

Replacement in crawl-ref/source/dungeon.cc at line 3277 [4.3429798]

B:BD[5.959545] → [5.959545:959632]

                            SPMSL_CURARE 
                          : SPMSL_POISONED);

[5.959545]

[4.3541775]

                            SPMSL_CURARE
                          : SPMSL_POISONED_II);

Deletion in crawl-ref/source/AppHdr.h at line 176 [4.4573713]
B:BD[4.4581421] → [4.4581421:4581450]
```
    #define SHORT_FILE_NAMES
```
Replacement in crawl-ref/source/AppHdr.h at line 190 [4.4573713]
B:BD[4.4581580] → [4.4581580:4581612]
```
    #error unsupported compiler
```
[4.4581580]
[4.4581612]
```
    #error Missing platform #define or unsupported compiler.
```

Removed SHORT_FILE_NAMES for Windows builds.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/newgame.cc at line 96 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 98 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 284 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 292 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 301 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 376 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 420 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2020 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2030 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2045 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2050 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2106 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2117 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2155 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2158 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 2161 [4.1132300]