diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-27 18:32:26 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-27 18:32:26 +0000 |
| commit | 306819ac6682ae2a814531c6990193bdfd120c23 (patch) | |
| tree | e2b07f6d8768dd5f6dfdee4283573f34758098db /src/common | |
| parent | 65544f2659ecec6d399f23037347e19571da24ab (diff) | |
| download | hercules-306819ac6682ae2a814531c6990193bdfd120c23.tar.gz hercules-306819ac6682ae2a814531c6990193bdfd120c23.tar.bz2 hercules-306819ac6682ae2a814531c6990193bdfd120c23.tar.xz hercules-306819ac6682ae2a814531c6990193bdfd120c23.zip | |
* Merged changes up to eAthena 15050.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15287 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/grfio.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/common/grfio.c b/src/common/grfio.c index 57e942892..88642cfe5 100644 --- a/src/common/grfio.c +++ b/src/common/grfio.c @@ -825,11 +825,15 @@ void grfio_init(const char* fname) continue; // skip unrecognized lines // Entry table reading - if( strcmp(w1, "grf") == 0 ) { // GRF file + if( strcmp(w1, "grf") == 0 ) // GRF file + { if( grfio_add(w2) == 0 ) ++grf_num; - } else if( strcmp(w1,"data_dir") == 0 ) // Data directory + } + else if( strcmp(w1,"data_dir") == 0 ) // Data directory + { safestrncpy(data_dir, w2, sizeof(data_dir)); + } } fclose(data_conf); |