--- deliantra/server/plugins/common/include/plugin_common.h	2006/02/24 13:06:40	1.4
+++ deliantra/server/plugins/common/include/plugin_common.h	2006/09/16 22:24:12	1.7
@@ -24,7 +24,8 @@
 /*  You should have received a copy of the GNU General Public License        */
 /*  along with this program; if not, write to the Free Software              */
 /*  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
-/*                                                                           */ /*****************************************************************************/
+/*                                                                           */
+/*****************************************************************************/
 #ifndef PLUGIN_COMMON_H
 #define PLUGIN_COMMON_H
 
@@ -94,8 +95,8 @@
 extern void         cf_object_free(object* op);
 extern object*      cf_create_object(void);
 extern object*      cf_create_object_by_name( const char* name );
-extern int          cf_object_change_map(object* op, int x, int y, mapstruct* map);
-extern int          cf_object_teleport( object* ob, mapstruct* map, int x, int y );
+extern int          cf_object_change_map(object* op, int x, int y, maptile* map);
+extern int          cf_object_teleport( object* ob, maptile* map, int x, int y );
 extern void         cf_object_update( object* op, int flags);
 extern void         cf_object_pickup( object* op, object* what);
 extern char*        cf_object_get_key(object* op, char* keyname);
@@ -106,33 +107,33 @@
 extern object*      cf_object_clone(object* op, int clonetype);
 
 /* Maps */
-extern void*        cf_map_get_property(mapstruct* map, int propcode);
-extern void*        cf_map_set_int_property(mapstruct* map, int propcode, int value);
-extern mapstruct*   cf_map_get_map( char* name );
-extern mapstruct*   cf_map_get_first(void);
-extern void         cf_map_message(mapstruct* m, char* msg, int color);
-extern object*      cf_map_get_object_at(mapstruct* m, int x, int y);
-extern object*      cf_map_insert_object(mapstruct* where, object* op, int x, int y);
-extern object*      cf_map_present_arch_by_name(const char* str, mapstruct* map, int nx, int ny);
-extern int          cf_map_get_flags( mapstruct* map, mapstruct** nmap, sint16 x, sint16 y, sint16* nx, sint16* ny );
-extern object*      cf_map_insert_object_there(mapstruct* where, object* op, object* originator, int flags);
-extern int          cf_map_get_difficulty(mapstruct* map);
-extern int          cf_map_get_reset_time(mapstruct* map);
-extern int          cf_map_get_reset_timeout(mapstruct* map);
-extern int          cf_map_get_players(mapstruct* map);
-extern int          cf_map_get_darkness(mapstruct* map);
-extern int          cf_map_get_width(mapstruct* map);
-extern int          cf_map_get_height(mapstruct* map);
-extern int          cf_map_get_enter_x(mapstruct* map);
-extern int          cf_map_get_enter_y(mapstruct* map);
-extern int          cf_map_get_temperature(mapstruct* map);
-extern int          cf_map_get_pressure(mapstruct* map);
-extern int          cf_map_get_humidity(mapstruct* map);
-extern int          cf_map_get_windspeed(mapstruct* map);
-extern int          cf_map_get_winddir(mapstruct* map);
-extern int          cf_map_get_sky(mapstruct* map);
-extern int          cf_map_get_wpartx(mapstruct* map);
-extern int          cf_map_get_wparty(mapstruct* map);
+extern void*        cf_map_get_property(maptile* map, int propcode);
+extern void*        cf_map_set_int_property(maptile* map, int propcode, int value);
+extern maptile*   cf_map_get_map( char* name );
+extern maptile*   cf_map_get_first(void);
+extern void         cf_map_message(maptile* m, char* msg, int color);
+extern object*      cf_map_get_object_at(maptile* m, int x, int y);
+extern object*      cf_map_insert_object(maptile* where, object* op, int x, int y);
+extern object*      cf_map_present_arch_by_name(const char* str, maptile* map, int nx, int ny);
+extern int          cf_map_get_flags( maptile* map, maptile** nmap, sint16 x, sint16 y, sint16* nx, sint16* ny );
+extern object*      cf_map_insert_object_there(maptile* where, object* op, object* originator, int flags);
+extern int          cf_map_get_difficulty(maptile* map);
+extern int          cf_map_get_reset_time(maptile* map);
+extern int          cf_map_get_reset_timeout(maptile* map);
+extern int          cf_map_get_players(maptile* map);
+extern int          cf_map_get_darkness(maptile* map);
+extern int          cf_map_get_width(maptile* map);
+extern int          cf_map_get_height(maptile* map);
+extern int          cf_map_get_enter_x(maptile* map);
+extern int          cf_map_get_enter_y(maptile* map);
+extern int          cf_map_get_temperature(maptile* map);
+extern int          cf_map_get_pressure(maptile* map);
+extern int          cf_map_get_humidity(maptile* map);
+extern int          cf_map_get_windspeed(maptile* map);
+extern int          cf_map_get_winddir(maptile* map);
+extern int          cf_map_get_sky(maptile* map);
+extern int          cf_map_get_wpartx(maptile* map);
+extern int          cf_map_get_wparty(maptile* map);
 
 /* Players */
 extern char*        cf_player_get_ip(object* op);
@@ -170,10 +171,10 @@
 extern const char*  cf_region_get_message(region* reg);
 
 /* temp */
-extern f_plug_api cfapi_object_get_property;
-extern f_plug_api cfapi_object_set_property;
-extern f_plug_api cfapi_object_apply;
-extern f_plug_api cfapi_object_remove;
+//extern f_plug_api cfapi_object_get_property;
+//extern f_plug_api cfapi_object_set_property;
+//extern f_plug_api cfapi_object_apply;
+//extern f_plug_api cfapi_object_remove;
 
 #ifdef WIN32