mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
Wspólne zmiany (poza fortecą)
* bugfixes and improvements in pregame * added support for Stronghold * added support for Fortress * fixed memory leak in towns
This commit is contained in:
Michał W. Urbańczyk
parent
64b8bd8019
commit
fe9f3ba720
@ -210,6 +210,7 @@ CCastleInterface::CCastleInterface(const CGTownInstance * Town, bool Activate)
|
||||
{
|
||||
if(buildings[itpb]->str->ID == obecny->second)
|
||||
{
|
||||
delete buildings[itpb];
|
||||
buildings.erase(buildings.begin() + itpb);
|
||||
obecny->second = st->ID;
|
||||
buildings.push_back(new CBuildingRect(st));
|
||||
|
||||
2
CMT.cpp
2
CMT.cpp
@ -47,6 +47,7 @@
|
||||
#include "CLuaHandler.h"
|
||||
#include "CLua.h"
|
||||
#include "CAdvmapInterface.h"
|
||||
#include "CCastleInterface.h"
|
||||
#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
|
||||
# include <fcntl.h>
|
||||
# include <io.h>
|
||||
@ -333,6 +334,7 @@ int _tmain(int argc, _TCHAR* argv[])
|
||||
cgi->bitmaph->init(std::string("Data\\H3bitmap.lod"));
|
||||
THC std::cout<<"Loading .lod files: "<<tmh.getDif()<<std::endl;
|
||||
|
||||
|
||||
cgi->curh->initCursor();
|
||||
cgi->curh->showGraphicCursor();
|
||||
|
||||
|
||||
BIN
CPreGame.cpp
BIN
CPreGame.cpp
Binary file not shown.
@ -231,9 +231,9 @@ public:
|
||||
PreGameTab* currentTab;
|
||||
StartInfo ret;
|
||||
bool run;
|
||||
bool first; //hasn't we showed the scensel
|
||||
std::vector<Slider<> *> interested;
|
||||
CMusicHandler * mush;
|
||||
CSemiLodHandler * slh ;
|
||||
std::vector<HighButton *> btns;
|
||||
CPreGameTextHandler * preth ;
|
||||
SDL_Rect * currentMessage;
|
||||
@ -252,7 +252,6 @@ public:
|
||||
ScenSel * ourScenSel;
|
||||
Options * ourOptions;
|
||||
std::string map; //selected map
|
||||
std::vector<CSemiLodHandler *> handledLods;
|
||||
CPreGame(); //c-tor
|
||||
std::string buttonText(int which);
|
||||
menuItems * currentItems();
|
||||
|
||||
@ -230,4 +230,78 @@
|
||||
5 41 TBDNUP_4.def 519 172
|
||||
5 42 TBDNUP_5.def 270 253
|
||||
5 43 TBDNUP_6.def 550 0
|
||||
5 8 TBDNCAS2.def 363 87
|
||||
5 8 TBDNCAS2.def 363 87
|
||||
6 31 TBSTDW_1.def 266 246
|
||||
6 43 TBSTUP_6.def 604 0
|
||||
6 8 TBSTCAS2.def 402 114
|
||||
6 9 TBSTCAS3.def 402 114
|
||||
6 7 TBSTCSTL.def 402 148
|
||||
6 30 TBSTDW_0.def 373 239
|
||||
6 32 TBSTDW_2.def 566 232
|
||||
6 33 TBSTDW_3.def 197 204
|
||||
6 34 TBSTDW_4.def 137 30
|
||||
6 35 TBSTDW_5.def 622 160
|
||||
6 36 TBSTDW_6.def 604 0
|
||||
6 21 TBSTEXT0.def 473 282
|
||||
6 22 TBSTEXT1.def 617 286
|
||||
6 23 TBSTEXT2.def 313 13
|
||||
6 -1 TBSTEXT3.def 23 20
|
||||
6 11 TBSTHAL2.def 0 225
|
||||
6 12 TBSTHAL3.def 0 201
|
||||
6 13 TBSTHAL4.def 0 148
|
||||
6 10 TBSTHALL.def 0 259
|
||||
6 26 TBSTHOLY.def 321 105
|
||||
6 18 TBSTHRD1.def 373 239
|
||||
6 19 TBSTHRD2.def 373 220
|
||||
6 1 TBSTMAG2.def 473 37
|
||||
6 2 TBSTMAG3.def 473 1
|
||||
6 0 TBSTMAGE.def 473 67
|
||||
6 14 TBSTMARK.def 397 308
|
||||
6 15 TBSTSILO.def 458 248
|
||||
6 17 TBSTSPEC.def 550 229
|
||||
6 5 TBSTTVRN.def 170 280
|
||||
6 37 TBSTUP_0.def 373 220
|
||||
6 38 TBSTUP_1.def 266 225
|
||||
6 39 TBSTUP_2.def 566 158
|
||||
6 40 TBSTUP_3.def 197 137
|
||||
6 41 TBSTUP_4.def 129 15
|
||||
6 42 TBSTUP_5.def 616 93
|
||||
6 16 TBSTBLAK.def 660 286
|
||||
7 16 TBFRBLAK.def 360 160
|
||||
7 8 TBFRCAS2.def 368 98
|
||||
7 9 TBFRCAS3.def 368 55
|
||||
7 7 TBFRCSTL.def 368 118
|
||||
7 6 TBFRDOCK.def 197 294
|
||||
7 30 TBFRDW_0.def 641 168
|
||||
7 31 TBFRDW_1.def 141 178
|
||||
7 34 TBFRDW_2.def 15 127
|
||||
7 32 TBFRDW_3.def 192 85
|
||||
7 33 TBFRDW_4.def 0 292
|
||||
7 35 TBFRDW_5.def 0 4
|
||||
7 36 TBFRDW_6.def 612 291
|
||||
7 21 TBFREXT0.def 341 174
|
||||
7 22 TBFREXT1.def 349 79
|
||||
7 -1 TBFREXT2.def 372 227
|
||||
7 11 TBFRHAL2.def 166 97
|
||||
7 12 TBFRHAL3.def 166 51
|
||||
7 13 TBFRHAL4.def 166 2
|
||||
7 10 TBFRHALL.def 166 128
|
||||
7 26 TBFRHOLY.def 468 260
|
||||
7 18 TBFRHRD1.def 641 121
|
||||
7 19 TBFRHRD2.def 641 68
|
||||
7 1 TBFRMAG2.def 0 177
|
||||
7 2 TBFRMAG3.def 0 135
|
||||
7 0 TBFRMAGE.def 0 200
|
||||
7 14 TBFRMARK.def 382 219
|
||||
7 15 TBFRSILO.def 448 210
|
||||
7 17 TBFRSPEC.def 703 36
|
||||
7 5 TBFRTVRN.def 634 219
|
||||
7 37 TBFRUP_0.def 641 107
|
||||
7 38 TBFRUP_1.def 125 163
|
||||
7 41 TBFRUP_2.def 15 69
|
||||
7 39 TBFRUP_3.def 159 19
|
||||
7 40 TBFRUP_4.def 0 257
|
||||
7 42 TBFRUP_5.def 0 4
|
||||
7 43 TBFRUP_6.def 587 263
|
||||
7 29 TBFRWTRW.def 320 141
|
||||
7 20 TBFRBOAT.def 197 294
|
||||
@ -161,6 +161,53 @@ CASTLE 5
|
||||
9
|
||||
23
|
||||
END
|
||||
CASTLE 6
|
||||
33
|
||||
40
|
||||
30
|
||||
18
|
||||
37
|
||||
19
|
||||
31
|
||||
38
|
||||
23
|
||||
26
|
||||
5
|
||||
32
|
||||
39
|
||||
15
|
||||
14
|
||||
21
|
||||
16
|
||||
22
|
||||
END
|
||||
CASTLE 7
|
||||
16
|
||||
15
|
||||
14
|
||||
34
|
||||
41
|
||||
31
|
||||
38
|
||||
10
|
||||
11
|
||||
12
|
||||
13
|
||||
29
|
||||
0
|
||||
1
|
||||
2
|
||||
33
|
||||
40
|
||||
30
|
||||
18
|
||||
37
|
||||
19
|
||||
5
|
||||
36
|
||||
43
|
||||
26
|
||||
END
|
||||
EOD
|
||||
|
||||
------------------------------------------------------------------
|
||||
|
||||
@ -222,4 +222,75 @@
|
||||
5 40 TBDNUP_3.def TODMED2.bmp TZDMED2.bmp
|
||||
5 41 TBDNUP_4.def TODMIN2.bmp TZDMIN2.bmp
|
||||
5 42 TBDNUP_5.def TODMAN2.bmp TZDMAN2.bmp
|
||||
5 43 TBDNUP_6.def TODDRA2A.bmp TZDDRA2A.bmp
|
||||
5 43 TBDNUP_6.def TODDRA2A.bmp TZDDRA2A.bmp
|
||||
6 16 TBSTBLAK.def TOSBLK1.bmp TZSBLK1.bmp
|
||||
6 8 TBSTCAS2.def TOSCA2.bmp TZSCA2.bmp
|
||||
6 9 TBSTCAS3.def TOSCA3.bmp TZSCA3.bmp
|
||||
6 7 TBSTCSTL.def TOSCA1.bmp TZSCA1.bmp
|
||||
6 30 TBSTDW0_.def TOSGOB1.bmp TZSGOB1.bmp
|
||||
6 31 TBSTDW_1.def TOSWOL1.bmp TZSWOL1.bmp
|
||||
6 32 TBSTDW_2.def TOSORC1.bmp TZSORC1.bmp
|
||||
6 33 TBSTDW_3.def TOSOGR1.bmp TZSOGR1.bmp
|
||||
6 34 TBSTDW_4.def TOSROC1.bmp TZSROC1.bmp
|
||||
6 35 TBSTDW_5.def TOSCYC1.bmp TZSCYC1.bmp
|
||||
6 36 TBSTDW_6.def TOSBEH1A.bmp TZSBEH1A.bmp
|
||||
6 21 TBSTEXT0.def TOSMRK1C.bmp TZSMRK1C.bmp
|
||||
6 22 TBSTEXT1.def TOSBLK2.bmp TZSBLK2.bmp
|
||||
6 23 TBSTEXT2.def TOSVAH.bmp TZSVAH.bmp
|
||||
6 11 TBSTHAL2.def TOSHAL2A.bmp TZSHAL2A.bmp
|
||||
6 12 TBSTHAL3.def TOSHAL3A.bmp TZSHAL3A.bmp
|
||||
6 13 TBSTHAL4.def TOSHAL4A.bmp TZSHAL4A.bmp
|
||||
6 10 TBSTHALL.def TOSHAL1A.bmp TZSHAL1A.bmp
|
||||
6 26 TBSTHOLY.def TOSHOLYA.bmp TZSHOLYA.bmp
|
||||
6 18 TBSTHRD1.def TOSGOB1H.bmp TZSGOB1H.bmp
|
||||
6 19 TBSTHRD2.def TOSGOB2H.bmp TZSGOB2H.bmp
|
||||
6 1 TBSTMAG2.def TOSMAG2.bmp TZSMAG2.bmp
|
||||
6 2 TBSTMAG3.def TOSMAG3.bmp TZSMAG3.bmp
|
||||
6 0 TBSTMAGE.def TOSMAG1.bmp TZSMAG1.bmp
|
||||
6 14 TBSTMARK.def TOSMRK1.bmp TZSMRK1.bmp
|
||||
6 15 TBSTSILO.def TOSMRK2.bmp TZSMRK2.bmp
|
||||
6 17 TBSTSPEC.def TOSCA1EA.bmp TZSCA1EA.bmp
|
||||
6 5 TBSTTVRN.def TOSTAV.bmp TZSTAV.bmp
|
||||
6 37 TBSTUP0_.def TOSGOB2.bmp TZSGOB2.bmp
|
||||
6 38 TBSTUP_1.def TOSWOL2.bmp TZSWOL2.bmp
|
||||
6 39 TBSTUP_2.def TOSORC2.bmp TZSORC2.bmp
|
||||
6 40 TBSTUP_3.def TOSOGR2.bmp TZSOGR2.bmp
|
||||
6 41 TBSTUP_4.def TOSROC2.bmp TZSROC2.bmp
|
||||
6 42 TBSTUP_5.def TOSCYC2A.bmp TZSCYC2A.bmp
|
||||
6 43 TBSTUP_6.def TOSBEH2A.bmp TZSBEH2A.bmp
|
||||
7 16 TBFRBLAK.def TOFAIDA.bmp TZFAIDA.bmp
|
||||
7 8 TBFRCAS2.def TOFCAS2.bmp TZFCAS2.bmp
|
||||
7 9 TBFRCAS3.def TOFCAS3.bmp TZFCAS3.bmp
|
||||
7 7 TBFRCSTL.def TOFCAS1.bmp TZFCAS1.bmp
|
||||
7 6 TBFRDOCK.def TOFDCK2.bmp TZFDCK2.bmp
|
||||
7 30 TBFRDW0_.def TOFGNL1.bmp TZFGNL1.bmp
|
||||
7 31 TBFRDW_1.def TOFLIZ1.bmp TZFLIZ1.bmp
|
||||
7 34 TBFRDW_2.def TOFGOR1.bmp TZFGOR1.bmp
|
||||
7 32 TBFRDW_3.def TOFFLY1A.bmp TZFFLY1A.bmp
|
||||
7 33 TBFRDW_4.def TOFBAS1.bmp TZFBAS1.bmp
|
||||
7 35 TBFRDW_5.def TOFWYV1.bmp TZFWYV1.bmp
|
||||
7 36 TBFRDW_6.def TOFHYD1A.bmp TZFHYD1A.bmp
|
||||
7 21 TBFREXT0.def TOFCASD.bmp TZFCASD.bmp
|
||||
7 22 TBFREXT1.def TOFCASA.bmp TZFCASA.bmp
|
||||
7 11 TBFRHAL2.def TOFHAL2.bmp TZFHAL2.bmp
|
||||
7 12 TBFRHAL3.def TOFHAL3.bmp TZFHAL3.bmp
|
||||
7 13 TBFRHAL4.def TOFHAL4.bmp TZFHAL4.bmp
|
||||
7 10 TBFRHALL.def TOFHAL1.bmp TZFHAL1.bmp
|
||||
7 26 TBFRHOLY.def TOFHLYAA.bmp TZFHLYAA.bmp
|
||||
7 18 TBFRHRD1.def TOFGNL1H.bmp TZFGNL1H.bmp
|
||||
7 19 TBFRHRD2.def TOFGNL2H.bmp TZFGNL2H.bmp
|
||||
7 1 TBFRMAG2.def TOFMAG2A.bmp TZFMAG2A.bmp
|
||||
7 2 TBFRMAG3.def TOFMAG3A.bmp TZFMAG3A.bmp
|
||||
7 0 TBFRMAGE.def TOFMAG1A.bmp TZFMAG1A.bmp
|
||||
7 14 TBFRMARK.def TOFMRKAA.bmp TZFMRKAA.bmp
|
||||
7 15 TBFRSILO.def TOFMRK2A.bmp TZFMRK2A.bmp
|
||||
7 17 TBFRSPEC.def TOFCAGE.bmp TZFCAGE.bmp
|
||||
7 5 TBFRTVRN.def TOFTAVA.bmp TZFTAVA.bmp
|
||||
7 37 TBFRUP0_.def TOFGNL2.bmp TZFGNL2.bmp
|
||||
7 38 TBFRUP_1.def TOFLIZ2.bmp TZFLIZ2.bmp
|
||||
7 41 TBFRUP_2.def TOFGOR2.bmp TZFGOR2.bmp
|
||||
7 39 TBFRUP_3.def TOFFLY2A.bmp TZFFLY2A.bmp
|
||||
7 40 TBFRUP_4.def TOFBAS2.bmp TZFBAS2.bmp
|
||||
7 42 TBFRUP_5.def TOFWYV2.bmp TZFWYV2.bmp
|
||||
7 43 TBFRUP_6.def TOFHYD2A.bmp TZFHYD2A.bmp
|
||||
7 20 TBFRBOAT.def TOFDCK1.bmp TZFDCK1.bmp
|
||||
@ -77,4 +77,16 @@ GROUP
|
||||
37
|
||||
18
|
||||
19
|
||||
CASTLE 6
|
||||
GROUP
|
||||
30
|
||||
37
|
||||
18
|
||||
19
|
||||
CASTLE 7
|
||||
GROUP
|
||||
30
|
||||
37
|
||||
18
|
||||
19
|
||||
EOD
|
||||
@ -19,7 +19,7 @@
|
||||
18 17
|
||||
19 22
|
||||
20 21
|
||||
21 -50
|
||||
21 23
|
||||
22 30
|
||||
23 37
|
||||
24 -1
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user