map init code

sys/sdl/gm2/item.c

@@ -91,6 +91,8 @@ void moveAllItems(void)
 
 /*===============================================*/
 
+
+
 /*
 void item_SetDefaultTile(uint8_t idx)
 {

sys/sdl/gm2/main.c

@@ -289,6 +289,7 @@ void setWindowPosByItem(uint8_t item_index)
     window_upper_left_pos.x -= MAP_DISPLAY_WIDTH/2;
     window_upper_left_pos.y = item->pos.y;
     window_upper_left_pos.y -= MAP_DISPLAY_HEIGHT/2;  
+    window_dir = item->dir;
   }
   else
   {
@@ -312,8 +313,9 @@ void setWindowPosByItem(uint8_t item_index)
       if ( item->pos.y == window_upper_left_pos.y+1 )
 	window_dir = item->dir;
     }
-    posStep(&window_upper_left_pos, window_dir);
   }
+  
+  posStep(&window_upper_left_pos, window_dir);
 }
 
 

sys/tga/mapgen/gm.map

@@ -46,6 +46,9 @@
 #		executed every step
 #		- moving items can move towards hero or others
 #	endproc
+#	mapinit
+#		executed during map init
+#	endproc
 #
 #
 #	map <name> <width> <height>
@@ -167,6 +170,9 @@ endproc
 
 
 map test 20 9
+mapinit
+  
+endproc
 
 :   K         H
 :   .         .

sys/tga/mapgen/map.h

@@ -20,6 +20,7 @@ struct _map_struct
 {
   unsigned char *data;
   item_onmap_t *onmap_list;
+  uint16_t init_proc;
   uint8_t onmap_cnt;
   uint8_t width;
   uint8_t height;

sys/tga/mapgen/mapgen.c

@@ -289,6 +289,7 @@ int map_curr_line = 0;
 char map_name[MAP_LINE_MAX];
 long map_width = 0;
 long map_height = 0;
+uint16_t map_init_code_pos;
 
 
 FILE *map_fp;
@@ -600,6 +601,7 @@ void write_map_struct(void)
       fprintf(out_fp, "  { ");
       fprintf(out_fp, "map_%s, ", map_name);
       fprintf(out_fp, "item_onmap_%s, ", map_name);
+      fprintf(out_fp, "/* map init code */ %u, ", map_init_code_pos);
       fprintf(out_fp, "ITEM_ONMAP_%s_CNT, ", map_name);      
       fprintf(out_fp, "/* width= */ %ld, ", map_width);
       fprintf(out_fp, "/* height= */ %ld ", map_height);
@@ -798,6 +800,8 @@ int map_read_map_cmd(const char **s)
   map_height = get_num(s);
 
   printf("map '%s' (%ld x %ld)\n", map_name, map_width, map_height);
+  
+  map_init_code_pos = 0;
   clear_map();
   return 1;
 }
@@ -816,8 +820,6 @@ int map_read_line(const char **s)
       is_inside_proc = 0;
     return 1;
   }
-  
-  
   skip_space(s);
   
   if ( **s == '#' )		/* comment (hmm handled by skip_space) */
@@ -882,6 +884,12 @@ int map_read_line(const char **s)
     
     return 1;
   }
+  else if ( strcmp(id, "mapinit") == 0 )
+  {
+    map_init_code_pos = uglStartNamelessProc(0);
+    is_inside_proc = 1;
+    return 1;
+  }  
   else if ( strcmp(id, "iteminit") == 0 )
   {
     const char *id;
@@ -1083,8 +1091,6 @@ int main(int argc, char **argv)
       fprintf(out_fp, "\n");
       
     }
-    
-      
     if ( out_fp != NULL )
       fclose(out_fp);
   }