Mercurial > mm7
comparison mm7_data.cpp @ 350:77601b0fb14b
Merge
author | Nomad |
---|---|
date | Thu, 21 Feb 2013 02:13:46 +0200 |
parents | 051dd64c23c1 |
children | 5f36449527c6 |
comparison
equal
deleted
inserted
replaced
349:672b83584b0f | 350:77601b0fb14b |
---|---|
956 char aLoadprog[777]; // idb | 956 char aLoadprog[777]; // idb |
957 char aLoadingD_pcx[777]; // idb | 957 char aLoadingD_pcx[777]; // idb |
958 int pNPCPortraits_x = 521; // idb | 958 int pNPCPortraits_x = 521; // idb |
959 int dword_4E5EC8[777]; // weak | 959 int dword_4E5EC8[777]; // weak |
960 int pNPCPortraits_y = 38; // idb | 960 int pNPCPortraits_y = 38; // idb |
961 const char *pHouse_ExitPictures[11]; | 961 const char *pHouse_ExitPictures[11]= |
962 char *_4E6BDC_loc_names[11]; | 962 { |
963 char aOutside[777]; // idb | 963 "", |
964 "ticon01", | |
965 "ticon02", | |
966 "ticon03", | |
967 "ticon04", | |
968 "ticon05", | |
969 "istairup", | |
970 "itrap", | |
971 "outside", | |
972 "idoor", | |
973 "isecdoor" | |
974 }; | |
975 const char *_4E6BDC_loc_names[11]= | |
976 { | |
977 "mdt12.blv", | |
978 "d18.blv", | |
979 "mdt14.blv", | |
980 "d37.blv", | |
981 "mdk01.blv", | |
982 "mdt01.blv", | |
983 "mdr01.blv", | |
984 "mdt10.blv", | |
985 "mdt09.blv", | |
986 "mdt15.blv", | |
987 "mdt11.blv" | |
988 }; | |
964 char aMer[777]; // idb | 989 char aMer[777]; // idb |
965 char aMir[777]; // idb | 990 char aMir[777]; // idb |
966 char aSel[777]; // idb | 991 char aSel[777]; // idb |
967 char aEle[777]; // idb | 992 char aEle[777]; // idb |
968 char aDar[777]; // idb | 993 char aDar[777]; // idb |