*** empty log message ***
@@ -0,0 +1,100 @@ | ||
1 | +READ ME | |
2 | +You might need runtime. | |
3 | +http://www.microsoft.com/downloads/details.aspx?displaylang=ja&FamilyID=32bc1bee-a3f9-4c13-9c99-220b62a191ee | |
4 | + | |
5 | +<en> | |
6 | + | |
7 | +-------------------------- | |
8 | +Software name :Map Damager One | |
9 | +Author :HogePiyo | |
10 | +License :GPL | |
11 | + | |
12 | +Thank you for downloading this program! | |
13 | + | |
14 | +The purpose of this program is to split (unmerge) any maps. | |
15 | + | |
16 | +With this, you can get every levels of a map. | |
17 | + | |
18 | +-- | |
19 | +How to use. | |
20 | + | |
21 | +1.launch this program | |
22 | + | |
23 | +2.select map file you want to unmerge | |
24 | + | |
25 | +3.then, select directory for saving levels | |
26 | + | |
27 | +4.completion dialog shown and click ok. | |
28 | + | |
29 | +5.if warned error, click ok to skip it, or click cancel to quit program | |
30 | +-- | |
31 | +Not yet. | |
32 | + | |
33 | +-cannot save merged physics datas (but soon) | |
34 | +-cannot save merged terminal text (but soon,too) | |
35 | +-cannot save merged terminal pictures (need for method to load from resources) | |
36 | + | |
37 | +-- | |
38 | +Please report bugs and requests at MapEditorOne topics in Pfhorums | |
39 | +http://www.pfhorums.com/index.php?showtopic=860 | |
40 | +</en> | |
41 | + | |
42 | +<jp> | |
43 | + | |
44 | +Look this in Shift-JIS! | |
45 | +-------------------------------- | |
46 | +ソフト名 :Map Damager One | |
47 | +作者 :HogePiyo | |
48 | +ライセンス :GPL | |
49 | + | |
50 | +ダウンロードありがとうございます。 | |
51 | + | |
52 | +このソフトはマップを各レベルごとに分解する目的で作っています。 | |
53 | + | |
54 | +MapEditorOneの保存機能を調整して形にしました。 | |
55 | + | |
56 | +標準マップならば遊べる程度に保存できるはずです。 | |
57 | + | |
58 | +他のサードパーティ系は未確認です。 | |
59 | + | |
60 | +ちなみに、MapEditorOneとMapViewerOne、そしてこのMapDamagerOneで | |
61 | +ファイル保存機構のバージョンが若干違います。 | |
62 | + | |
63 | +2007/02/08 現時点ではMapDamagerOneが最新かつ確実にMapデータを保存できるはずです。 | |
64 | + | |
65 | +他二つについてはそれぞれの次回リリースまでお待ちください。 | |
66 | + | |
67 | +-- | |
68 | +使い方 | |
69 | + | |
70 | +1.起動するとファイル選択が出るので、マップファイルを選びます | |
71 | + | |
72 | +2.次にディレクトリ選択が出るので、出力先を指定します。 | |
73 | + | |
74 | +3.完了ダイアログが出れば終了です。 | |
75 | + | |
76 | +4.エラーメッセージが出たら、okかcancelを押します。 | |
77 | + -ok :スキップして続行します。 | |
78 | + -cancel:終了します。 | |
79 | + | |
80 | +-- | |
81 | +未実装 | |
82 | + | |
83 | +-マージされている物理ファイルの保存 | |
84 | +-マージされているターミナルテキスト(スクリプト)の保存 | |
85 | +-ターミナルピクチャの保存 | |
86 | + | |
87 | +ピクチャはリソースを除いたりする必要もあるので分かりませんが、 | |
88 | +物理ファイルとターミナルテキストは取得できているのですぐできると思います。 | |
89 | +-- | |
90 | +バグや要望があれば、 | |
91 | +PfhorumsのMapEditorOneスレか、 | |
92 | +http://www.pfhorums.com/index.php?showtopic=860 | |
93 | + | |
94 | +MarathonWikiのForums、 | |
95 | +http://mjolnir.logue.tk/ | |
96 | +http://forum.logue.tk/#6 | |
97 | + | |
98 | +あるいは2chのスレとかにでも書いてください。 | |
99 | +http://game12.2ch.net/test/read.cgi/gamef/1157461574/l50 | |
100 | +2chスレは古くなると見れなくなりますので、その場合はMarathonWikiから最新のスレに移ってください。 |
@@ -305,15 +305,23 @@ | ||
305 | 305 | sprintf(buf, "%sL%s%s.sceA", dir.c_str(), |
306 | 306 | numstr.c_str(), names[i].c_str()); |
307 | 307 | //保存 |
308 | - MapIndexList.clear(); | |
308 | +/* MapIndexList.clear(); | |
309 | 309 | MapIndexList.push_back(0); |
310 | - dynamic_world->map_index_count = 1; | |
310 | + dynamic_world->map_index_count = 1;*/ | |
311 | 311 | // dynamic_world->platform_count = PlatformList.size(); |
312 | 312 | if(!save_level(buf)){ |
313 | 313 | char cbuf[MAX_PATH+100]; |
314 | 314 | sprintf(cbuf, "save error with [%s]", buf); |
315 | 315 | charToWChar(cbuf, wbuf); |
316 | - MessageBox(hwnd, wbuf, TEXT("save error"), MB_OK); | |
316 | + int id = MessageBox(hwnd, wbuf, TEXT("save error"), MB_OKCANCEL); | |
317 | + if(id == IDOK){ | |
318 | + //skip | |
319 | + }else{ | |
320 | + //quit | |
321 | + MessageBox(hwnd, TEXT("process banned by user selection"), | |
322 | + TEXT("user assertion"), MB_OK); | |
323 | + break; | |
324 | + } | |
317 | 325 | } |
318 | 326 | } |
319 | 327 |
@@ -1,4 +1,7 @@ | ||
1 | 1 | READ ME |
2 | +You might need runtime. | |
3 | +http://www.microsoft.com/downloads/details.aspx?displaylang=ja&FamilyID=32bc1bee-a3f9-4c13-9c99-220b62a191ee | |
4 | + | |
2 | 5 | <en> |
3 | 6 | |
4 | 7 | ----------------------------- |
@@ -33,7 +36,7 @@ | ||
33 | 36 | </en> |
34 | 37 | |
35 | 38 | <jp> |
36 | -Look this in Shif-JIS! | |
39 | +Look this in Shift-JIS! | |
37 | 40 | |
38 | 41 | ----------------------------- |
39 | 42 | ソフト名 :Map Viewer One |
@@ -430,6 +430,7 @@ | ||
430 | 430 | MapAnnotationList.clear(); |
431 | 431 | |
432 | 432 | PlatformList.clear(); |
433 | + | |
433 | 434 | /* map_polygons= NULL; |
434 | 435 | map_sides= NULL; |
435 | 436 | map_lines= NULL; |
@@ -140,7 +140,9 @@ | ||
140 | 140 | /* -------- local globals */ |
141 | 141 | FileSpecifier MapFileSpec; |
142 | 142 | static bool file_is_set= false; |
143 | -static std::vector<static_platform_data> staticPlatforms; | |
143 | +static vector<static_platform_data> staticPlatforms; | |
144 | +static vector<side_data> oldSideList; | |
145 | +static vector<static_light_data> staticLightList; | |
144 | 146 | |
145 | 147 | // LP addition: was a physics model loaded from the previous level loaded? |
146 | 148 | static bool PhysicsModelLoadedEarlier = false; |
@@ -388,6 +390,18 @@ | ||
388 | 390 | return (!error_pending()); |
389 | 391 | } |
390 | 392 | |
393 | +static void exportTag(int tag, struct wad_data* wad) | |
394 | +{ | |
395 | + size_t size;//offset, alloc_size; | |
396 | + Uint8 *data; | |
397 | + data = tag_to_global_array_and_size(tag, &size); | |
398 | +// if(data){ | |
399 | + append_data_to_wad(wad, tag, data, size, 0); | |
400 | + //offset += alloc_size; | |
401 | + delete data; | |
402 | +// } | |
403 | +} | |
404 | + | |
391 | 405 | //HogePiyo added |
392 | 406 | /** |
393 | 407 | export level |
@@ -395,6 +409,8 @@ | ||
395 | 409 | */ |
396 | 410 | static struct wad_data* export_level_wad_data() |
397 | 411 | { |
412 | + recalculate_map_counts(); | |
413 | + | |
398 | 414 | //empty wad |
399 | 415 | struct wad_data* wad = create_empty_wad(); |
400 | 416 |
@@ -404,41 +420,49 @@ | ||
404 | 420 | |
405 | 421 | //offset = 0; |
406 | 422 | |
423 | + //sideをコピーする | |
424 | + /* | |
425 | + for(int i = 0; i < (int)SideList.size(); i ++){ | |
426 | + memcpy(&SideList[i],&oldSideList[i], sizeof(side_data)); | |
427 | + }*/ | |
407 | 428 | //one of lines/side/polygons must be first of all !!! |
408 | 429 | int tags[] ={ |
409 | - ENDPOINT_DATA_TAG, LINE_TAG, SIDE_TAG, POLYGON_TAG, | |
430 | + ENDPOINT_DATA_TAG, LINE_TAG, //SIDE_TAG, | |
431 | + }; | |
432 | + int tags2[]={ | |
433 | + POLYGON_TAG, | |
434 | + | |
435 | + //LIGHTSOURCE_TAG, | |
436 | + DYNAMIC_STRUCTURE_TAG, | |
410 | 437 | ANNOTATION_TAG, OBJECT_TAG, |
411 | 438 | MAP_INFO_TAG, ITEM_PLACEMENT_STRUCTURE_TAG, |
412 | 439 | TERMINAL_DATA_TAG, MEDIA_TAG, AMBIENT_SOUND_TAG, |
413 | - RANDOM_SOUND_TAG, //PLATFORM_STATIC_DATA_TAG, | |
414 | - PLATFORM_STRUCTURE_TAG, | |
440 | + RANDOM_SOUND_TAG, PLATFORM_STRUCTURE_TAG, | |
415 | 441 | MAP_INDEXES_TAG, |
416 | 442 | }; |
417 | 443 | for(int i = 0; i < sizeof(tags) / sizeof(int); i ++){ |
418 | - data = tag_to_global_array_and_size(tags[i], &size); | |
419 | - if(data){ | |
420 | - append_data_to_wad(wad, tags[i], data, size, 0); | |
421 | - //offset += alloc_size; | |
422 | - delete data; | |
423 | - } | |
444 | + exportTag(tags[i], wad); | |
424 | 445 | } |
425 | - | |
426 | - size_t count = 0; | |
427 | - | |
428 | - //platform | |
429 | - count = staticPlatforms.size(); | |
430 | - if(count > 0){ | |
431 | - size = SIZEOF_static_platform_data * count; | |
446 | + //side | |
447 | + size_t count = oldSideList.size(); | |
448 | + //if(count > 0) | |
449 | + { | |
450 | + size = SIZEOF_side_data * count; | |
432 | 451 | data = new Uint8[size]; |
433 | - pack_static_platform_data(data, &staticPlatforms[0], count); | |
434 | - append_data_to_wad(wad, PLATFORM_STATIC_DATA_TAG, data, size, 0); | |
452 | + pack_side_data(data, &oldSideList[0], count); | |
453 | + | |
454 | + append_data_to_wad(wad, SIDE_TAG, data, size, 0); | |
435 | 455 | delete data; |
436 | 456 | } |
437 | - | |
457 | + for(int i = 0; i < sizeof(tags2) / sizeof(int); i ++){ | |
458 | + exportTag(tags2[i], wad); | |
459 | + } | |
438 | 460 | //light |
439 | 461 | //light's data is illigal |
462 | + | |
440 | 463 | count = LightList.size(); |
441 | - if(count > 0){ | |
464 | + //if(count > 0) | |
465 | + { | |
442 | 466 | size = SIZEOF_static_light_data * count; |
443 | 467 | data = new Uint8[size]; |
444 | 468 | struct static_light_data* slights = new struct static_light_data[count]; |
@@ -445,11 +469,35 @@ | ||
445 | 469 | for(size_t i = 0; i < count; i ++){ |
446 | 470 | memcpy(&slights[i], &LightList[i].static_data, SIZEOF_static_light_data); |
447 | 471 | } |
448 | - pack_static_light_data(data, slights, count); | |
472 | + pack_static_light_data(data, &staticLightList[0], count); | |
449 | 473 | delete slights; |
450 | 474 | append_data_to_wad(wad, LIGHTSOURCE_TAG, data, size, 0); |
451 | 475 | delete data; |
476 | + }/* | |
477 | + for(int i = 0; i < sizeof(tags2) / sizeof(int); i ++){ | |
478 | + exportTag(tags2[i], wad); | |
479 | + }*/ | |
480 | + | |
481 | + //platform | |
482 | + /* | |
483 | + count = staticPlatforms.size(); | |
484 | + { | |
485 | + size = SIZEOF_static_platform_data * count; | |
486 | + data = new Uint8[size]; | |
487 | + pack_static_platform_data(data, &staticPlatforms[0], count); | |
488 | + append_data_to_wad(wad, PLATFORM_STATIC_DATA_TAG, data, size, 0); | |
489 | + delete data; | |
452 | 490 | } |
491 | +//*/ | |
492 | + //PLATFORM_STATIC_DATA_TAG, | |
493 | + // PLATFORM_STRUCTURE_TAG, | |
494 | +/* { | |
495 | + int tag = PLATFORM_STRUCTURE_TAG; | |
496 | + data = tag_to_global_array_and_size(tag, &size); | |
497 | + append_data_to_wad(wad, tag, data, size, 0); | |
498 | + //offset += alloc_size; | |
499 | + delete data; | |
500 | + }*/ | |
453 | 501 | //terminal |
454 | 502 | /*count = map_terminal_text.size(); |
455 | 503 | if(count > 0){ |
@@ -533,7 +581,7 @@ | ||
533 | 581 | |
534 | 582 | struct directory_entry entry = {0,1,0}; |
535 | 583 | |
536 | - static_world->physics_model = 0; | |
584 | + //static_world->physics_model = 0; | |
537 | 585 | |
538 | 586 | |
539 | 587 | wad = export_level_wad_data(); |
@@ -956,7 +1004,7 @@ | ||
956 | 1004 | MapIndexList.clear(); |
957 | 1005 | MapIndexList.reserve(map_index_count); |
958 | 1006 | dynamic_world->map_index_count= 0; |
959 | - | |
1007 | + | |
960 | 1008 | // Stuff that needs the max number of polygons |
961 | 1009 | //allocate_render_memory(); |
962 | 1010 | allocate_flood_map_memory(); |
@@ -1004,6 +1052,7 @@ | ||
1004 | 1052 | |
1005 | 1053 | for(loop=0; loop<count; ++loop) |
1006 | 1054 | { |
1055 | + //oldSideList.push_back(map_sides[loop]); | |
1007 | 1056 | if(version==MARATHON_ONE_DATA_VERSION) |
1008 | 1057 | { |
1009 | 1058 | map_sides[loop].transparent_texture.texture= UNONE; |
@@ -1072,7 +1121,7 @@ | ||
1072 | 1121 | { |
1073 | 1122 | case MARATHON_ONE_DATA_VERSION: { |
1074 | 1123 | |
1075 | - // Unpack the old lights into a temporary array | |
1124 | + // Unpack the old lights into a temporary arr | |
1076 | 1125 | OldLights = new old_light_data[count]; |
1077 | 1126 | unpack_old_light_data(_lights,OldLights,count); |
1078 | 1127 |
@@ -1092,6 +1141,9 @@ | ||
1092 | 1141 | case MARATHON_TWO_DATA_VERSION: |
1093 | 1142 | case MARATHON_INFINITY_DATA_VERSION: |
1094 | 1143 | // OK to modify the data pointer since it was passed by value |
1144 | + staticLightList.resize(count); | |
1145 | + unpack_static_light_data(_lights, &staticLightList[0], count); | |
1146 | + | |
1095 | 1147 | for(loop= 0; loop<count; ++loop) |
1096 | 1148 | { |
1097 | 1149 | static_light_data TempLight; |
@@ -1383,10 +1435,12 @@ | ||
1383 | 1435 | /* zero everything so no slots are used */ |
1384 | 1436 | initialize_map_for_new_level(); |
1385 | 1437 | staticPlatforms.clear(); |
1438 | + oldSideList.clear(); | |
1439 | + staticLightList.clear(); | |
1386 | 1440 | |
1387 | 1441 | /* Calculate the length (for reallocate map) */ |
1388 | 1442 | allocate_map_structure_for_map(wad); |
1389 | - | |
1443 | + | |
1390 | 1444 | /* Extract points */ |
1391 | 1445 | data= (uint8 *)extract_type_from_wad(wad, POINT_TAG, &data_length); |
1392 | 1446 | // if(data){ |
@@ -1429,6 +1483,8 @@ | ||
1429 | 1483 | count = data_length/SIZEOF_side_data; |
1430 | 1484 | assert(data_length == count*SIZEOF_side_data); |
1431 | 1485 | load_sides(data, count, version); |
1486 | + oldSideList.resize(count); | |
1487 | + unpack_side_data(data, &oldSideList[0],count); | |
1432 | 1488 | |
1433 | 1489 | /* Extract polygons */ |
1434 | 1490 | data= (uint8 *)extract_type_from_wad(wad, POLYGON_TAG, &data_length); |
@@ -1466,6 +1522,7 @@ | ||
1466 | 1522 | count= data_length/SIZEOF_static_light_data; |
1467 | 1523 | assert(count*SIZEOF_static_light_data==data_length); |
1468 | 1524 | load_lights(data, count, version); |
1525 | + | |
1469 | 1526 | } |
1470 | 1527 | // } |
1471 | 1528 |
@@ -1913,7 +1970,7 @@ | ||
1913 | 1970 | size_t *size |
1914 | 1971 | ) |
1915 | 1972 | { |
1916 | - uint8 *array= NULL; | |
1973 | + uint8 *arr= NULL; | |
1917 | 1974 | size_t unit_size = 0; |
1918 | 1975 | size_t count = 0; |
1919 | 1976 | unsigned index; |
@@ -2002,6 +2059,7 @@ | ||
2002 | 2059 | case TERMINAL_DATA_TAG: |
2003 | 2060 | count= calculate_packed_terminal_data_length(); |
2004 | 2061 | break; |
2062 | + | |
2005 | 2063 | case WEAPON_STATE_TAG: |
2006 | 2064 | count= dynamic_world->player_count; |
2007 | 2065 | break; |
@@ -2032,104 +2090,104 @@ | ||
2032 | 2090 | // indicate if there is nothing to be written |
2033 | 2091 | *size= count*unit_size; |
2034 | 2092 | if (*size > 0) |
2035 | - array = new byte[*size]; | |
2093 | + arr = new byte[*size]; | |
2036 | 2094 | else |
2037 | 2095 | return NULL; |
2038 | 2096 | |
2039 | - // An OK-to-alter version of that array pointer | |
2040 | - uint8 *temp_array = array; | |
2097 | + // An OK-to-alter version of that arr pointer | |
2098 | + uint8 *temp_array = arr; | |
2041 | 2099 | |
2042 | 2100 | switch (tag) |
2043 | 2101 | { |
2044 | 2102 | case ENDPOINT_DATA_TAG: |
2045 | - pack_endpoint_data(array,map_endpoints,count); | |
2103 | + pack_endpoint_data(arr,map_endpoints,count); | |
2046 | 2104 | break; |
2047 | 2105 | case LINE_TAG: |
2048 | - pack_line_data(array,map_lines,count); | |
2106 | + pack_line_data(arr,map_lines,count); | |
2049 | 2107 | break; |
2050 | 2108 | case SIDE_TAG: |
2051 | - pack_side_data(array,map_sides,count); | |
2109 | + pack_side_data(arr,map_sides,count); | |
2052 | 2110 | break; |
2053 | 2111 | case POLYGON_TAG: |
2054 | - pack_polygon_data(array,map_polygons,count); | |
2112 | + pack_polygon_data(arr,map_polygons,count); | |
2055 | 2113 | break; |
2056 | 2114 | case LIGHTSOURCE_TAG: |
2057 | - pack_light_data(array,lights,count); | |
2115 | + pack_light_data(arr,lights,count); | |
2058 | 2116 | break; |
2059 | 2117 | case ANNOTATION_TAG: |
2060 | - pack_map_annotation(array,map_annotations,count); | |
2118 | + pack_map_annotation(arr,map_annotations,count); | |
2061 | 2119 | break; |
2062 | 2120 | case OBJECT_TAG: |
2063 | - pack_map_object(array,saved_objects,count); | |
2121 | + pack_map_object(arr,saved_objects,count); | |
2064 | 2122 | break; |
2065 | 2123 | case MAP_INFO_TAG: |
2066 | - pack_static_data(array,static_world,count); | |
2124 | + pack_static_data(arr,static_world,count); | |
2067 | 2125 | break; |
2068 | 2126 | case PLAYER_STRUCTURE_TAG: |
2069 | - pack_player_data(array,players,count); | |
2127 | + pack_player_data(arr,players,count); | |
2070 | 2128 | break; |
2071 | 2129 | case DYNAMIC_STRUCTURE_TAG: |
2072 | - pack_dynamic_data(array,dynamic_world,count); | |
2130 | + pack_dynamic_data(arr,dynamic_world,count); | |
2073 | 2131 | break; |
2074 | 2132 | case OBJECT_STRUCTURE_TAG: |
2075 | - pack_object_data(array,objects,count); | |
2133 | + pack_object_data(arr,objects,count); | |
2076 | 2134 | break; |
2077 | 2135 | case MAP_INDEXES_TAG: |
2078 | 2136 | ListToStream(temp_array,map_indexes,count); // E-Z packing here... |
2079 | 2137 | break; |
2080 | 2138 | case AUTOMAP_LINES: |
2081 | - memcpy(array,automap_lines,*size); | |
2139 | + memcpy(arr,automap_lines,*size); | |
2082 | 2140 | break; |
2083 | 2141 | case AUTOMAP_POLYGONS: |
2084 | - memcpy(array,automap_polygons,*size); | |
2142 | + memcpy(arr,automap_polygons,*size); | |
2085 | 2143 | break; |
2086 | 2144 | case MONSTERS_STRUCTURE_TAG: |
2087 | - pack_monster_data(array,monsters,count); | |
2145 | + pack_monster_data(arr,monsters,count); | |
2088 | 2146 | break; |
2089 | 2147 | case EFFECTS_STRUCTURE_TAG: |
2090 | - pack_effect_data(array,effects,count); | |
2148 | + pack_effect_data(arr,effects,count); | |
2091 | 2149 | break; |
2092 | 2150 | case PROJECTILES_STRUCTURE_TAG: |
2093 | - pack_projectile_data(array,projectiles,count); | |
2151 | + pack_projectile_data(arr,projectiles,count); | |
2094 | 2152 | break; |
2095 | 2153 | case MEDIA_TAG: |
2096 | - pack_media_data(array,medias,count); | |
2154 | + pack_media_data(arr,medias,count); | |
2097 | 2155 | break; |
2098 | 2156 | case ITEM_PLACEMENT_STRUCTURE_TAG: |
2099 | - pack_object_frequency_definition(array,get_placement_info(),count); | |
2157 | + pack_object_frequency_definition(arr,get_placement_info(),count); | |
2100 | 2158 | break; |
2101 | 2159 | case PLATFORM_STRUCTURE_TAG: |
2102 | - pack_platform_data(array,platforms,count); | |
2160 | + pack_platform_data(arr,platforms,count); | |
2103 | 2161 | break; |
2104 | 2162 | case AMBIENT_SOUND_TAG: |
2105 | - pack_ambient_sound_image_data(array,ambient_sound_images,count); | |
2163 | + pack_ambient_sound_image_data(arr,ambient_sound_images,count); | |
2106 | 2164 | break; |
2107 | 2165 | case RANDOM_SOUND_TAG: |
2108 | - pack_random_sound_image_data(array,random_sound_images,count); | |
2166 | + pack_random_sound_image_data(arr,random_sound_images,count); | |
2109 | 2167 | break; |
2110 | 2168 | case TERMINAL_DATA_TAG: |
2111 | - pack_map_terminal_data(array,count); | |
2169 | + pack_map_terminal_data(arr,count); | |
2112 | 2170 | break; |
2113 | 2171 | case WEAPON_STATE_TAG: |
2114 | - pack_player_weapon_data(array,count); | |
2172 | + pack_player_weapon_data(arr,count); | |
2115 | 2173 | break; |
2116 | 2174 | case TERMINAL_STATE_TAG: |
2117 | - pack_player_terminal_data(array,count); | |
2175 | + pack_player_terminal_data(arr,count); | |
2118 | 2176 | break; |
2119 | 2177 | case MONSTER_PHYSICS_TAG: |
2120 | - pack_monster_definition(array,count); | |
2178 | + pack_monster_definition(arr,count); | |
2121 | 2179 | break; |
2122 | 2180 | case EFFECTS_PHYSICS_TAG: |
2123 | - pack_effect_definition(array,count); | |
2181 | + pack_effect_definition(arr,count); | |
2124 | 2182 | break; |
2125 | 2183 | case PROJECTILE_PHYSICS_TAG: |
2126 | - pack_projectile_definition(array,count); | |
2184 | + pack_projectile_definition(arr,count); | |
2127 | 2185 | break; |
2128 | 2186 | case PHYSICS_PHYSICS_TAG: |
2129 | - pack_physics_constants(array,count); | |
2187 | + pack_physics_constants(arr,count); | |
2130 | 2188 | break; |
2131 | 2189 | case WEAPONS_PHYSICS_TAG: |
2132 | - pack_weapon_definition(array,count); | |
2190 | + pack_weapon_definition(arr,count); | |
2133 | 2191 | break; |
2134 | 2192 | default: |
2135 | 2193 | assert(false); |
@@ -2136,7 +2194,7 @@ | ||
2136 | 2194 | break; |
2137 | 2195 | } |
2138 | 2196 | |
2139 | - return array; | |
2197 | + return arr; | |
2140 | 2198 | } |
2141 | 2199 | |
2142 | 2200 | /* Build the wad, with all the crap */ |