ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/random_maps/style.c
(Generate patch)

Comparing deliantra/server/random_maps/style.c (file contents):
Revision 1.1.1.2 by elmex, Wed Feb 22 18:03:16 2006 UTC vs.
Revision 1.2 by elmex, Sun Aug 13 17:16:03 2006 UTC

1/* 1/*
2 * static char *rcsid_style_c = 2 * static char *rcsid_style_c =
3 * "$Id: style.c,v 1.1.1.2 2006/02/22 18:03:16 elmex Exp $"; 3 * "$Id: style.c,v 1.2 2006/08/13 17:16:03 elmex dead $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
137 styles = style_map; 137 styles = style_map;
138 } 138 }
139 return style_map; 139 return style_map;
140} 140}
141 141
142mapstruct *find_style(const char *dirname,const char *stylename,int difficulty) { 142mapstruct *find_style(char *dirname,char *stylename,int difficulty) {
143 char style_file_path[256]; 143 char style_file_path[256];
144 char style_file_full_path[256]; 144 char style_file_full_path[256];
145 mapstruct *style_map = NULL; 145 mapstruct *style_map = NULL;
146 struct stat file_stat; 146 struct stat file_stat;
147 int i, only_subdirs=0; 147 int i, only_subdirs=0;
152 else /* otherwise, just use the dirname. We'll pick a random stylefile.*/ 152 else /* otherwise, just use the dirname. We'll pick a random stylefile.*/
153 sprintf(style_file_path,"%s",dirname); 153 sprintf(style_file_path,"%s",dirname);
154 154
155 /* is what we were given a directory, or a file? */ 155 /* is what we were given a directory, or a file? */
156 sprintf(style_file_full_path,"%s/maps%s",settings.datadir,style_file_path); 156 sprintf(style_file_full_path,"%s/maps%s",settings.datadir,style_file_path);
157 if (stat(style_file_full_path, &file_stat) == 0 157 stat(style_file_full_path,&file_stat);
158
158 && !S_ISDIR(file_stat.st_mode)) { 159 if(! (S_ISDIR(file_stat.st_mode))) {
159 style_map=load_style_map(style_file_path); 160 style_map=load_style_map(style_file_path);
160 } 161 }
161 if(style_map == NULL) /* maybe we were given a directory! */ 162 if(style_map == NULL) /* maybe we were given a directory! */
162 { 163 {
163 char **namelist; 164 char **namelist;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines