Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Merged changes up to eAthena 15050.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15287 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
eathenabot 2011-12-27 18:32:26 +00:00
parent 07e66c4055
commit 0d2589130a
2 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/grfio.c
View File

@ -825,11 +825,15 @@ void grfio_init(const char* fname)
continue; // skip unrecognized lines continue; // skip unrecognized lines
// Entry table reading // Entry table reading
if( strcmp(w1, "grf") == 0 ) { // GRF file if( strcmp(w1, "grf") == 0 ) // GRF file
{
if( grfio_add(w2) == 0 ) if( grfio_add(w2) == 0 )
++grf_num; ++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)); safestrncpy(data_dir, w2, sizeof(data_dir));
}
} }
fclose(data_conf); fclose(data_conf);

43
src/map/map.c
View File

@ -3644,36 +3644,59 @@ int do_init(int argc, char *argv[])
arg++; arg++;
if( strcmp(arg, "help") == 0 ) if( strcmp(arg, "help") == 0 )
{
map_helpscreen(true); map_helpscreen(true);
}
else if( strcmp(arg, "version") == 0 ) else if( strcmp(arg, "version") == 0 )
{
map_versionscreen(true); map_versionscreen(true);
else if( strcmp(arg, "map-config") == 0 ) { }
else if( strcmp(arg, "map-config") == 0 )
{
if( map_arg_next_value(arg, i, argc) ) if( map_arg_next_value(arg, i, argc) )
MAP_CONF_NAME = argv[++i]; MAP_CONF_NAME = argv[++i];
} else if( strcmp(arg, "battle-config") == 0 ) { }
else if( strcmp(arg, "battle-config") == 0 )
{
if( map_arg_next_value(arg, i, argc) ) if( map_arg_next_value(arg, i, argc) )
BATTLE_CONF_FILENAME = argv[++i]; BATTLE_CONF_FILENAME = argv[++i];
} else if( strcmp(arg, "atcommand-config") == 0 ) { }
else if( strcmp(arg, "atcommand-config") == 0 )
{
if( map_arg_next_value(arg, i, argc) ) if( map_arg_next_value(arg, i, argc) )
ATCOMMAND_CONF_FILENAME = argv[++i]; ATCOMMAND_CONF_FILENAME = argv[++i];
} else if( strcmp(arg, "script-config") == 0 ) { }
else if( strcmp(arg, "script-config") == 0 )
{
if( map_arg_next_value(arg, i, argc) ) if( map_arg_next_value(arg, i, argc) )
SCRIPT_CONF_NAME = argv[++i]; SCRIPT_CONF_NAME = argv[++i];
} else if( strcmp(arg, "msg-config") == 0 ) { }
else if( strcmp(arg, "msg-config") == 0 )
{
if( map_arg_next_value(arg, i, argc) ) if( map_arg_next_value(arg, i, argc) )
MSG_CONF_NAME = argv[++i]; MSG_CONF_NAME = argv[++i];
} else if( strcmp(arg, "grf-path-file") == 0 ) { }
else if( strcmp(arg, "grf-path-file") == 0 )
{
if( map_arg_next_value(arg, i, argc) ) if( map_arg_next_value(arg, i, argc) )
GRF_PATH_FILENAME = argv[++i]; GRF_PATH_FILENAME = argv[++i];
} else if( strcmp(arg, "inter-config") == 0 ) { }
else if( strcmp(arg, "inter-config") == 0 )
{
if( map_arg_next_value(arg, i, argc) ) if( map_arg_next_value(arg, i, argc) )
INTER_CONF_NAME = argv[++i]; INTER_CONF_NAME = argv[++i];
} else if( strcmp(arg, "log-config") == 0 ) { }
else if( strcmp(arg, "log-config") == 0 )
{
if( map_arg_next_value(arg, i, argc) ) if( map_arg_next_value(arg, i, argc) )
LOG_CONF_NAME = argv[++i]; LOG_CONF_NAME = argv[++i];
} else if( strcmp(arg, "run-once") == 0 ) // close the map-server as soon as its done.. for testing [Celest] }
else if( strcmp(arg, "run-once") == 0 ) // close the map-server as soon as its done.. for testing [Celest]
{
runflag = CORE_ST_STOP; runflag = CORE_ST_STOP;
else { }
else
{
ShowError("Unknown option '%s'.\n", argv[i]); ShowError("Unknown option '%s'.\n", argv[i]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }