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

Comparing deliantra/server/random_maps/standalone.C (file contents):
Revision 1.5 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.15 by root, Sun Jul 1 05:00:19 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#define LO_NEWFILE 2 24#define LO_NEWFILE 2
25 25
26/* the main routine for making a standalone version. */ 26/* the main routine for making a standalone version. */
27 27
… …
36int 36int
37main (int argc, char *argv[]) 37main (int argc, char *argv[])
38{ 38{
39 char InFileName[1024], OutFileName[1024]; 39 char InFileName[1024], OutFileName[1024];
40 maptile *newMap; 40 maptile *newMap;
41 RMParms rp; 41 random_map_params rp;
42 FILE *fp; 42 FILE *fp;
43 43
44 if (argc < 3) 44 if (argc < 3)
45 { 45 {
46 printf ("\nUsage: %s inputfile outputfile\n", argv[0]); 46 printf ("\nUsage: %s inputfile outputfile\n", argv[0]);
… …
55 init_artifacts (); 55 init_artifacts ();
56 init_formulae (); 56 init_formulae ();
57 init_readable (); 57 init_readable ();
58 58
59 init_gods (); 59 init_gods ();
60 memset (&rp, 0, sizeof (RMParms)); 60 memset (&rp, 0, sizeof (random_map_params));
61 rp.Xsize = -1; 61 rp.Xsize = -1;
62 rp.Ysize = -1; 62 rp.Ysize = -1;
63 if ((fp = fopen (InFileName, "r")) == NULL) 63 if ((fp = fopen (InFileName, "r")) == NULL)
64 { 64 {
65 fprintf (stderr, "\nError: can not open %s\n", InFileName); 65 fprintf (stderr, "\nError: can not open %s\n", InFileName);
… …
88 object *tmp = NULL; 88 object *tmp = NULL;
89 int i; 89 int i;
90 90
91 switch (op->type) 91 switch (op->type)
92 { 92 {
93 case SHOP_FLOOR: 93 case SHOP_FLOOR:
94 if (!HAS_RANDOM_ITEMS (op)) 94 if (!op->has_random_items ())
95 return 0; 95 return 0;
96 do 96 do
97 { 97 {
98 i = 10; /* let's give it 10 tries */ 98 i = 10; /* let's give it 10 tries */
99 while ((tmp = generate_treasure (op->randomitems, op->stats.exp ? op->stats.exp : 5)) == NULL && --i); 99 while ((tmp = generate_treasure (op->randomitems, op->stats.exp ? op->stats.exp : 5)) == NULL && --i);
100 if (tmp == NULL) 100 if (tmp == NULL)
101 return 0; 101 return 0;
102 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 102 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
103 { 103 {
104 free_object (tmp); 104 tmp->destroy ();
105 tmp = NULL; 105 tmp = NULL;
106 } 106 }
107 } 107 }
108 while (!tmp); 108 while (!tmp);
109 109
110 tmp->x = op->x, tmp->y = op->y; 110 tmp->x = op->x, tmp->y = op->y;
111 SET_FLAG (tmp, FLAG_UNPAID); 111 SET_FLAG (tmp, FLAG_UNPAID);
112 insert_ob_in_map (tmp, op->map, NULL, 0); 112 insert_ob_in_map (tmp, op->map, NULL, 0);
113 CLEAR_FLAG (op, FLAG_AUTO_APPLY); 113 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
114 identify (tmp); 114 identify (tmp);
115 break; 115 break;
116 116
117 case TREASURE: 117 case TREASURE:
118 if (HAS_RANDOM_ITEMS (op)) 118 if (op->has_random_items ())
119 while ((op->stats.hp--) > 0) 119 while ((op->stats.hp--) > 0)
120 create_treasure (op->randomitems, op, GT_ENVIRONMENT, 120 create_treasure (op->randomitems, op, GT_ENVIRONMENT,
121 op->stats.exp ? op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0); 121 op->stats.exp ? op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
122 remove_ob (op); 122 op->remove ();
123 free_object (op); 123 op->destroy ();
124 break; 124 break;
125 } 125 }
126 126
127 return tmp ? 1 : 0; 127 return tmp ? 1 : 0;
128} 128}
129 129
… …
137fix_auto_apply (maptile *m) 137fix_auto_apply (maptile *m)
138{ 138{
139 object *tmp, *above = NULL; 139 object *tmp, *above = NULL;
140 int x, y; 140 int x, y;
141 141
142 for (x = 0; x < MAP_WIDTH (m); x++) 142 for (x = 0; x < m->width; x++)
143 for (y = 0; y < MAP_HEIGHT (m); y++) 143 for (y = 0; y < m->height; y++)
144 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above) 144 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
145 { 145 {
146 above = tmp->above; 146 above = tmp->above;
147 147
148 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY)) 148 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
149 auto_apply (tmp); 149 auto_apply (tmp);
150 else if (tmp->type == TREASURE) 150 else if (tmp->type == TREASURE)
151 { 151 {
152 if (HAS_RANDOM_ITEMS (tmp)) 152 if (tmp->has_random_items ())
153 while ((tmp->stats.hp--) > 0) 153 while ((tmp->stats.hp--) > 0)
154 create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0); 154 create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
155 } 155 }
156 if (tmp && tmp->arch && tmp->type != PLAYER && tmp->type != TREASURE && tmp->randomitems) 156 if (tmp && tmp->arch && tmp->type != PLAYER && tmp->type != TREASURE && tmp->randomitems)
157 { 157 {
158 if (tmp->type == CONTAINER) 158 if (tmp->type == CONTAINER)
159 { 159 {
160 if (HAS_RANDOM_ITEMS (tmp)) 160 if (tmp->has_random_items ())
161 while ((tmp->stats.hp--) > 0) 161 while ((tmp->stats.hp--) > 0)
162 create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0); 162 create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
163 } 163 }
164 else if (HAS_RANDOM_ITEMS (tmp)) 164 else if (tmp->has_random_items ())
165 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0); 165 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0);
166 } 166 }
167 } 167 }
168 for (x = 0; x < MAP_WIDTH (m); x++) 168 for (x = 0; x < m->width; x++)
169 for (y = 0; y < MAP_HEIGHT (m); y++) 169 for (y = 0; y < m->height; y++)
170 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 170 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
171 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 171 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
172 check_trigger (tmp, tmp->above); 172 check_trigger (tmp, tmp->above);
173} 173}
174 174
175/** 175/**

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines