--- deliantra/server/plugins/common/plugin_common.C 2006/09/16 22:24:12 1.3 +++ deliantra/server/plugins/common/plugin_common.C 2006/12/25 11:25:49 1.7 @@ -37,7 +37,6 @@ static f_plug_api cfapiSystem_register_global_event = NULL; static f_plug_api cfapiSystem_unregister_global_event = NULL; -static f_plug_api cfapiSystem_strdup_local = NULL; static f_plug_api cfapiSystem_find_animation = NULL; static f_plug_api cfapiMap_create_path = NULL; @@ -63,7 +62,7 @@ static f_plug_api cfapiObject_update = NULL; static f_plug_api cfapiObject_clear = NULL; static f_plug_api cfapiObject_reset = NULL; -static f_plug_api cfapiCheck_inventory = NULL; +/* static f_plug_api cfapiCheck_inventory = NULL; */ static f_plug_api cfapiObject_activate_rune = NULL; static f_plug_api cfapiObject_check_trigger = NULL; static f_plug_api cfapiObject_query_money = NULL; @@ -112,7 +111,6 @@ int cf_init_plugin( f_plug_api getHooks ) { int z; - GET_HOOK( cfapiSystem_strdup_local, "cfapi_system_strdup_local", z ); GET_HOOK( cfapiSystem_register_global_event, "cfapi_system_register_global_event", z ); GET_HOOK( cfapiSystem_unregister_global_event, "cfapi_system_unregister_global_event", z ); GET_HOOK( cfapiSystem_find_animation, "cfapi_system_find_animation", z ); @@ -396,8 +394,7 @@ } int cf_object_out_of_map( object* op, int x, int y) { - int val; - return *(int*)cfapiObject_out_of_map(&val,op->map,x,y); + abort (); } void cf_object_drop( object* op, object* author) { @@ -693,10 +690,10 @@ int val; cfapiObject_pickup(&val, op, what); } -char* cf_strdup_local(char* txt) +char* cf_strdup(char* txt) { int val; - return (char*)cfapiSystem_strdup_local(&val, txt); + return (char*)strdup(txt); } int cf_map_get_flags( maptile* map, maptile** nmap, sint16 x, sint16 y, sint16* nx, sint16* ny ) { @@ -828,22 +825,3 @@ int val; return (const char*) cfapiRegion_get_property(&val, reg, CFAPI_REGION_PROP_MESSAGE); } - -#ifdef WIN32 -int gettimeofday(struct timeval *time_Info, struct timezone *timezone_Info) -{ - /* Get the time, if they want it */ - if (time_Info != NULL) { - time_Info->tv_sec = time(NULL); - time_Info->tv_usec = timeGetTime()*1000; - } - /* Get the timezone, if they want it */ - if (timezone_Info != NULL) { - _tzset(); - timezone_Info->tz_minuteswest = _timezone; - timezone_Info->tz_dsttime = _daylight; - } - /* And return */ - return 0; -} -#endif